Show More
@@ -1,5932 +1,5935 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from node import hex, bin, nullid, nullrev, short |
|
8 | from node import hex, bin, nullid, nullrev, short | |
9 | from lock import release |
|
9 | from lock import release | |
10 | from i18n import _ |
|
10 | from i18n import _ | |
11 | import os, re, difflib, time, tempfile, errno |
|
11 | import os, re, difflib, time, tempfile, errno | |
12 | import hg, scmutil, util, revlog, copies, error, bookmarks |
|
12 | import hg, scmutil, util, revlog, copies, error, bookmarks | |
13 | import patch, help, encoding, templatekw, discovery |
|
13 | import patch, help, encoding, templatekw, discovery | |
14 | import archival, changegroup, cmdutil, hbisect |
|
14 | import archival, changegroup, cmdutil, hbisect | |
15 | import sshserver, hgweb, commandserver |
|
15 | import sshserver, hgweb, commandserver | |
16 | from hgweb import server as hgweb_server |
|
16 | from hgweb import server as hgweb_server | |
17 | import merge as mergemod |
|
17 | import merge as mergemod | |
18 | import minirst, revset, fileset |
|
18 | import minirst, revset, fileset | |
19 | import dagparser, context, simplemerge, graphmod |
|
19 | import dagparser, context, simplemerge, graphmod | |
20 | import random |
|
20 | import random | |
21 | import setdiscovery, treediscovery, dagutil, pvec, localrepo |
|
21 | import setdiscovery, treediscovery, dagutil, pvec, localrepo | |
22 | import phases, obsolete |
|
22 | import phases, obsolete | |
23 |
|
23 | |||
24 | table = {} |
|
24 | table = {} | |
25 |
|
25 | |||
26 | command = cmdutil.command(table) |
|
26 | command = cmdutil.command(table) | |
27 |
|
27 | |||
28 | # common command options |
|
28 | # common command options | |
29 |
|
29 | |||
30 | globalopts = [ |
|
30 | globalopts = [ | |
31 | ('R', 'repository', '', |
|
31 | ('R', 'repository', '', | |
32 | _('repository root directory or name of overlay bundle file'), |
|
32 | _('repository root directory or name of overlay bundle file'), | |
33 | _('REPO')), |
|
33 | _('REPO')), | |
34 | ('', 'cwd', '', |
|
34 | ('', 'cwd', '', | |
35 | _('change working directory'), _('DIR')), |
|
35 | _('change working directory'), _('DIR')), | |
36 | ('y', 'noninteractive', None, |
|
36 | ('y', 'noninteractive', None, | |
37 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
37 | _('do not prompt, automatically pick the first choice for all prompts')), | |
38 | ('q', 'quiet', None, _('suppress output')), |
|
38 | ('q', 'quiet', None, _('suppress output')), | |
39 | ('v', 'verbose', None, _('enable additional output')), |
|
39 | ('v', 'verbose', None, _('enable additional output')), | |
40 | ('', 'config', [], |
|
40 | ('', 'config', [], | |
41 | _('set/override config option (use \'section.name=value\')'), |
|
41 | _('set/override config option (use \'section.name=value\')'), | |
42 | _('CONFIG')), |
|
42 | _('CONFIG')), | |
43 | ('', 'debug', None, _('enable debugging output')), |
|
43 | ('', 'debug', None, _('enable debugging output')), | |
44 | ('', 'debugger', None, _('start debugger')), |
|
44 | ('', 'debugger', None, _('start debugger')), | |
45 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
45 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
46 | _('ENCODE')), |
|
46 | _('ENCODE')), | |
47 | ('', 'encodingmode', encoding.encodingmode, |
|
47 | ('', 'encodingmode', encoding.encodingmode, | |
48 | _('set the charset encoding mode'), _('MODE')), |
|
48 | _('set the charset encoding mode'), _('MODE')), | |
49 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
49 | ('', 'traceback', None, _('always print a traceback on exception')), | |
50 | ('', 'time', None, _('time how long the command takes')), |
|
50 | ('', 'time', None, _('time how long the command takes')), | |
51 | ('', 'profile', None, _('print command execution profile')), |
|
51 | ('', 'profile', None, _('print command execution profile')), | |
52 | ('', 'version', None, _('output version information and exit')), |
|
52 | ('', 'version', None, _('output version information and exit')), | |
53 | ('h', 'help', None, _('display help and exit')), |
|
53 | ('h', 'help', None, _('display help and exit')), | |
54 | ('', 'hidden', False, _('consider hidden changesets')), |
|
54 | ('', 'hidden', False, _('consider hidden changesets')), | |
55 | ] |
|
55 | ] | |
56 |
|
56 | |||
57 | dryrunopts = [('n', 'dry-run', None, |
|
57 | dryrunopts = [('n', 'dry-run', None, | |
58 | _('do not perform actions, just print output'))] |
|
58 | _('do not perform actions, just print output'))] | |
59 |
|
59 | |||
60 | remoteopts = [ |
|
60 | remoteopts = [ | |
61 | ('e', 'ssh', '', |
|
61 | ('e', 'ssh', '', | |
62 | _('specify ssh command to use'), _('CMD')), |
|
62 | _('specify ssh command to use'), _('CMD')), | |
63 | ('', 'remotecmd', '', |
|
63 | ('', 'remotecmd', '', | |
64 | _('specify hg command to run on the remote side'), _('CMD')), |
|
64 | _('specify hg command to run on the remote side'), _('CMD')), | |
65 | ('', 'insecure', None, |
|
65 | ('', 'insecure', None, | |
66 | _('do not verify server certificate (ignoring web.cacerts config)')), |
|
66 | _('do not verify server certificate (ignoring web.cacerts config)')), | |
67 | ] |
|
67 | ] | |
68 |
|
68 | |||
69 | walkopts = [ |
|
69 | walkopts = [ | |
70 | ('I', 'include', [], |
|
70 | ('I', 'include', [], | |
71 | _('include names matching the given patterns'), _('PATTERN')), |
|
71 | _('include names matching the given patterns'), _('PATTERN')), | |
72 | ('X', 'exclude', [], |
|
72 | ('X', 'exclude', [], | |
73 | _('exclude names matching the given patterns'), _('PATTERN')), |
|
73 | _('exclude names matching the given patterns'), _('PATTERN')), | |
74 | ] |
|
74 | ] | |
75 |
|
75 | |||
76 | commitopts = [ |
|
76 | commitopts = [ | |
77 | ('m', 'message', '', |
|
77 | ('m', 'message', '', | |
78 | _('use text as commit message'), _('TEXT')), |
|
78 | _('use text as commit message'), _('TEXT')), | |
79 | ('l', 'logfile', '', |
|
79 | ('l', 'logfile', '', | |
80 | _('read commit message from file'), _('FILE')), |
|
80 | _('read commit message from file'), _('FILE')), | |
81 | ] |
|
81 | ] | |
82 |
|
82 | |||
83 | commitopts2 = [ |
|
83 | commitopts2 = [ | |
84 | ('d', 'date', '', |
|
84 | ('d', 'date', '', | |
85 | _('record the specified date as commit date'), _('DATE')), |
|
85 | _('record the specified date as commit date'), _('DATE')), | |
86 | ('u', 'user', '', |
|
86 | ('u', 'user', '', | |
87 | _('record the specified user as committer'), _('USER')), |
|
87 | _('record the specified user as committer'), _('USER')), | |
88 | ] |
|
88 | ] | |
89 |
|
89 | |||
90 | templateopts = [ |
|
90 | templateopts = [ | |
91 | ('', 'style', '', |
|
91 | ('', 'style', '', | |
92 | _('display using template map file'), _('STYLE')), |
|
92 | _('display using template map file'), _('STYLE')), | |
93 | ('', 'template', '', |
|
93 | ('', 'template', '', | |
94 | _('display with template'), _('TEMPLATE')), |
|
94 | _('display with template'), _('TEMPLATE')), | |
95 | ] |
|
95 | ] | |
96 |
|
96 | |||
97 | logopts = [ |
|
97 | logopts = [ | |
98 | ('p', 'patch', None, _('show patch')), |
|
98 | ('p', 'patch', None, _('show patch')), | |
99 | ('g', 'git', None, _('use git extended diff format')), |
|
99 | ('g', 'git', None, _('use git extended diff format')), | |
100 | ('l', 'limit', '', |
|
100 | ('l', 'limit', '', | |
101 | _('limit number of changes displayed'), _('NUM')), |
|
101 | _('limit number of changes displayed'), _('NUM')), | |
102 | ('M', 'no-merges', None, _('do not show merges')), |
|
102 | ('M', 'no-merges', None, _('do not show merges')), | |
103 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
103 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
104 | ('G', 'graph', None, _("show the revision DAG")), |
|
104 | ('G', 'graph', None, _("show the revision DAG")), | |
105 | ] + templateopts |
|
105 | ] + templateopts | |
106 |
|
106 | |||
107 | diffopts = [ |
|
107 | diffopts = [ | |
108 | ('a', 'text', None, _('treat all files as text')), |
|
108 | ('a', 'text', None, _('treat all files as text')), | |
109 | ('g', 'git', None, _('use git extended diff format')), |
|
109 | ('g', 'git', None, _('use git extended diff format')), | |
110 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
110 | ('', 'nodates', None, _('omit dates from diff headers')) | |
111 | ] |
|
111 | ] | |
112 |
|
112 | |||
113 | diffwsopts = [ |
|
113 | diffwsopts = [ | |
114 | ('w', 'ignore-all-space', None, |
|
114 | ('w', 'ignore-all-space', None, | |
115 | _('ignore white space when comparing lines')), |
|
115 | _('ignore white space when comparing lines')), | |
116 | ('b', 'ignore-space-change', None, |
|
116 | ('b', 'ignore-space-change', None, | |
117 | _('ignore changes in the amount of white space')), |
|
117 | _('ignore changes in the amount of white space')), | |
118 | ('B', 'ignore-blank-lines', None, |
|
118 | ('B', 'ignore-blank-lines', None, | |
119 | _('ignore changes whose lines are all blank')), |
|
119 | _('ignore changes whose lines are all blank')), | |
120 | ] |
|
120 | ] | |
121 |
|
121 | |||
122 | diffopts2 = [ |
|
122 | diffopts2 = [ | |
123 | ('p', 'show-function', None, _('show which function each change is in')), |
|
123 | ('p', 'show-function', None, _('show which function each change is in')), | |
124 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
124 | ('', 'reverse', None, _('produce a diff that undoes the changes')), | |
125 | ] + diffwsopts + [ |
|
125 | ] + diffwsopts + [ | |
126 | ('U', 'unified', '', |
|
126 | ('U', 'unified', '', | |
127 | _('number of lines of context to show'), _('NUM')), |
|
127 | _('number of lines of context to show'), _('NUM')), | |
128 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
128 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
129 | ] |
|
129 | ] | |
130 |
|
130 | |||
131 | mergetoolopts = [ |
|
131 | mergetoolopts = [ | |
132 | ('t', 'tool', '', _('specify merge tool')), |
|
132 | ('t', 'tool', '', _('specify merge tool')), | |
133 | ] |
|
133 | ] | |
134 |
|
134 | |||
135 | similarityopts = [ |
|
135 | similarityopts = [ | |
136 | ('s', 'similarity', '', |
|
136 | ('s', 'similarity', '', | |
137 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
|
137 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) | |
138 | ] |
|
138 | ] | |
139 |
|
139 | |||
140 | subrepoopts = [ |
|
140 | subrepoopts = [ | |
141 | ('S', 'subrepos', None, |
|
141 | ('S', 'subrepos', None, | |
142 | _('recurse into subrepositories')) |
|
142 | _('recurse into subrepositories')) | |
143 | ] |
|
143 | ] | |
144 |
|
144 | |||
145 | # Commands start here, listed alphabetically |
|
145 | # Commands start here, listed alphabetically | |
146 |
|
146 | |||
147 | @command('^add', |
|
147 | @command('^add', | |
148 | walkopts + subrepoopts + dryrunopts, |
|
148 | walkopts + subrepoopts + dryrunopts, | |
149 | _('[OPTION]... [FILE]...')) |
|
149 | _('[OPTION]... [FILE]...')) | |
150 | def add(ui, repo, *pats, **opts): |
|
150 | def add(ui, repo, *pats, **opts): | |
151 | """add the specified files on the next commit |
|
151 | """add the specified files on the next commit | |
152 |
|
152 | |||
153 | Schedule files to be version controlled and added to the |
|
153 | Schedule files to be version controlled and added to the | |
154 | repository. |
|
154 | repository. | |
155 |
|
155 | |||
156 | The files will be added to the repository at the next commit. To |
|
156 | The files will be added to the repository at the next commit. To | |
157 | undo an add before that, see :hg:`forget`. |
|
157 | undo an add before that, see :hg:`forget`. | |
158 |
|
158 | |||
159 | If no names are given, add all files to the repository. |
|
159 | If no names are given, add all files to the repository. | |
160 |
|
160 | |||
161 | .. container:: verbose |
|
161 | .. container:: verbose | |
162 |
|
162 | |||
163 | An example showing how new (unknown) files are added |
|
163 | An example showing how new (unknown) files are added | |
164 | automatically by :hg:`add`:: |
|
164 | automatically by :hg:`add`:: | |
165 |
|
165 | |||
166 | $ ls |
|
166 | $ ls | |
167 | foo.c |
|
167 | foo.c | |
168 | $ hg status |
|
168 | $ hg status | |
169 | ? foo.c |
|
169 | ? foo.c | |
170 | $ hg add |
|
170 | $ hg add | |
171 | adding foo.c |
|
171 | adding foo.c | |
172 | $ hg status |
|
172 | $ hg status | |
173 | A foo.c |
|
173 | A foo.c | |
174 |
|
174 | |||
175 | Returns 0 if all files are successfully added. |
|
175 | Returns 0 if all files are successfully added. | |
176 | """ |
|
176 | """ | |
177 |
|
177 | |||
178 | m = scmutil.match(repo[None], pats, opts) |
|
178 | m = scmutil.match(repo[None], pats, opts) | |
179 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), |
|
179 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), | |
180 | opts.get('subrepos'), prefix="", explicitonly=False) |
|
180 | opts.get('subrepos'), prefix="", explicitonly=False) | |
181 | return rejected and 1 or 0 |
|
181 | return rejected and 1 or 0 | |
182 |
|
182 | |||
183 | @command('addremove', |
|
183 | @command('addremove', | |
184 | similarityopts + walkopts + dryrunopts, |
|
184 | similarityopts + walkopts + dryrunopts, | |
185 | _('[OPTION]... [FILE]...')) |
|
185 | _('[OPTION]... [FILE]...')) | |
186 | def addremove(ui, repo, *pats, **opts): |
|
186 | def addremove(ui, repo, *pats, **opts): | |
187 | """add all new files, delete all missing files |
|
187 | """add all new files, delete all missing files | |
188 |
|
188 | |||
189 | Add all new files and remove all missing files from the |
|
189 | Add all new files and remove all missing files from the | |
190 | repository. |
|
190 | repository. | |
191 |
|
191 | |||
192 | New files are ignored if they match any of the patterns in |
|
192 | New files are ignored if they match any of the patterns in | |
193 | ``.hgignore``. As with add, these changes take effect at the next |
|
193 | ``.hgignore``. As with add, these changes take effect at the next | |
194 | commit. |
|
194 | commit. | |
195 |
|
195 | |||
196 | Use the -s/--similarity option to detect renamed files. This |
|
196 | Use the -s/--similarity option to detect renamed files. This | |
197 | option takes a percentage between 0 (disabled) and 100 (files must |
|
197 | option takes a percentage between 0 (disabled) and 100 (files must | |
198 | be identical) as its parameter. With a parameter greater than 0, |
|
198 | be identical) as its parameter. With a parameter greater than 0, | |
199 | this compares every removed file with every added file and records |
|
199 | this compares every removed file with every added file and records | |
200 | those similar enough as renames. Detecting renamed files this way |
|
200 | those similar enough as renames. Detecting renamed files this way | |
201 | can be expensive. After using this option, :hg:`status -C` can be |
|
201 | can be expensive. After using this option, :hg:`status -C` can be | |
202 | used to check which files were identified as moved or renamed. If |
|
202 | used to check which files were identified as moved or renamed. If | |
203 | not specified, -s/--similarity defaults to 100 and only renames of |
|
203 | not specified, -s/--similarity defaults to 100 and only renames of | |
204 | identical files are detected. |
|
204 | identical files are detected. | |
205 |
|
205 | |||
206 | Returns 0 if all files are successfully added. |
|
206 | Returns 0 if all files are successfully added. | |
207 | """ |
|
207 | """ | |
208 | try: |
|
208 | try: | |
209 | sim = float(opts.get('similarity') or 100) |
|
209 | sim = float(opts.get('similarity') or 100) | |
210 | except ValueError: |
|
210 | except ValueError: | |
211 | raise util.Abort(_('similarity must be a number')) |
|
211 | raise util.Abort(_('similarity must be a number')) | |
212 | if sim < 0 or sim > 100: |
|
212 | if sim < 0 or sim > 100: | |
213 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
213 | raise util.Abort(_('similarity must be between 0 and 100')) | |
214 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) |
|
214 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) | |
215 |
|
215 | |||
216 | @command('^annotate|blame', |
|
216 | @command('^annotate|blame', | |
217 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
217 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
218 | ('', 'follow', None, |
|
218 | ('', 'follow', None, | |
219 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
219 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
220 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
220 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
221 | ('a', 'text', None, _('treat all files as text')), |
|
221 | ('a', 'text', None, _('treat all files as text')), | |
222 | ('u', 'user', None, _('list the author (long with -v)')), |
|
222 | ('u', 'user', None, _('list the author (long with -v)')), | |
223 | ('f', 'file', None, _('list the filename')), |
|
223 | ('f', 'file', None, _('list the filename')), | |
224 | ('d', 'date', None, _('list the date (short with -q)')), |
|
224 | ('d', 'date', None, _('list the date (short with -q)')), | |
225 | ('n', 'number', None, _('list the revision number (default)')), |
|
225 | ('n', 'number', None, _('list the revision number (default)')), | |
226 | ('c', 'changeset', None, _('list the changeset')), |
|
226 | ('c', 'changeset', None, _('list the changeset')), | |
227 | ('l', 'line-number', None, _('show line number at the first appearance')) |
|
227 | ('l', 'line-number', None, _('show line number at the first appearance')) | |
228 | ] + diffwsopts + walkopts, |
|
228 | ] + diffwsopts + walkopts, | |
229 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) |
|
229 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) | |
230 | def annotate(ui, repo, *pats, **opts): |
|
230 | def annotate(ui, repo, *pats, **opts): | |
231 | """show changeset information by line for each file |
|
231 | """show changeset information by line for each file | |
232 |
|
232 | |||
233 | List changes in files, showing the revision id responsible for |
|
233 | List changes in files, showing the revision id responsible for | |
234 | each line |
|
234 | each line | |
235 |
|
235 | |||
236 | This command is useful for discovering when a change was made and |
|
236 | This command is useful for discovering when a change was made and | |
237 | by whom. |
|
237 | by whom. | |
238 |
|
238 | |||
239 | Without the -a/--text option, annotate will avoid processing files |
|
239 | Without the -a/--text option, annotate will avoid processing files | |
240 | it detects as binary. With -a, annotate will annotate the file |
|
240 | it detects as binary. With -a, annotate will annotate the file | |
241 | anyway, although the results will probably be neither useful |
|
241 | anyway, although the results will probably be neither useful | |
242 | nor desirable. |
|
242 | nor desirable. | |
243 |
|
243 | |||
244 | Returns 0 on success. |
|
244 | Returns 0 on success. | |
245 | """ |
|
245 | """ | |
246 | if opts.get('follow'): |
|
246 | if opts.get('follow'): | |
247 | # --follow is deprecated and now just an alias for -f/--file |
|
247 | # --follow is deprecated and now just an alias for -f/--file | |
248 | # to mimic the behavior of Mercurial before version 1.5 |
|
248 | # to mimic the behavior of Mercurial before version 1.5 | |
249 | opts['file'] = True |
|
249 | opts['file'] = True | |
250 |
|
250 | |||
251 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
251 | datefunc = ui.quiet and util.shortdate or util.datestr | |
252 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
|
252 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) | |
253 |
|
253 | |||
254 | if not pats: |
|
254 | if not pats: | |
255 | raise util.Abort(_('at least one filename or pattern is required')) |
|
255 | raise util.Abort(_('at least one filename or pattern is required')) | |
256 |
|
256 | |||
257 | hexfn = ui.debugflag and hex or short |
|
257 | hexfn = ui.debugflag and hex or short | |
258 |
|
258 | |||
259 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), |
|
259 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), | |
260 | ('number', ' ', lambda x: str(x[0].rev())), |
|
260 | ('number', ' ', lambda x: str(x[0].rev())), | |
261 | ('changeset', ' ', lambda x: hexfn(x[0].node())), |
|
261 | ('changeset', ' ', lambda x: hexfn(x[0].node())), | |
262 | ('date', ' ', getdate), |
|
262 | ('date', ' ', getdate), | |
263 | ('file', ' ', lambda x: x[0].path()), |
|
263 | ('file', ' ', lambda x: x[0].path()), | |
264 | ('line_number', ':', lambda x: str(x[1])), |
|
264 | ('line_number', ':', lambda x: str(x[1])), | |
265 | ] |
|
265 | ] | |
266 |
|
266 | |||
267 | if (not opts.get('user') and not opts.get('changeset') |
|
267 | if (not opts.get('user') and not opts.get('changeset') | |
268 | and not opts.get('date') and not opts.get('file')): |
|
268 | and not opts.get('date') and not opts.get('file')): | |
269 | opts['number'] = True |
|
269 | opts['number'] = True | |
270 |
|
270 | |||
271 | linenumber = opts.get('line_number') is not None |
|
271 | linenumber = opts.get('line_number') is not None | |
272 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
272 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
273 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
273 | raise util.Abort(_('at least one of -n/-c is required for -l')) | |
274 |
|
274 | |||
275 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] |
|
275 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] | |
276 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
276 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
277 |
|
277 | |||
278 | def bad(x, y): |
|
278 | def bad(x, y): | |
279 | raise util.Abort("%s: %s" % (x, y)) |
|
279 | raise util.Abort("%s: %s" % (x, y)) | |
280 |
|
280 | |||
281 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
281 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
282 | m = scmutil.match(ctx, pats, opts) |
|
282 | m = scmutil.match(ctx, pats, opts) | |
283 | m.bad = bad |
|
283 | m.bad = bad | |
284 | follow = not opts.get('no_follow') |
|
284 | follow = not opts.get('no_follow') | |
285 | diffopts = patch.diffopts(ui, opts, section='annotate') |
|
285 | diffopts = patch.diffopts(ui, opts, section='annotate') | |
286 | for abs in ctx.walk(m): |
|
286 | for abs in ctx.walk(m): | |
287 | fctx = ctx[abs] |
|
287 | fctx = ctx[abs] | |
288 | if not opts.get('text') and util.binary(fctx.data()): |
|
288 | if not opts.get('text') and util.binary(fctx.data()): | |
289 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
289 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) | |
290 | continue |
|
290 | continue | |
291 |
|
291 | |||
292 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
292 | lines = fctx.annotate(follow=follow, linenumber=linenumber, | |
293 | diffopts=diffopts) |
|
293 | diffopts=diffopts) | |
294 | pieces = [] |
|
294 | pieces = [] | |
295 |
|
295 | |||
296 | for f, sep in funcmap: |
|
296 | for f, sep in funcmap: | |
297 | l = [f(n) for n, dummy in lines] |
|
297 | l = [f(n) for n, dummy in lines] | |
298 | if l: |
|
298 | if l: | |
299 | sized = [(x, encoding.colwidth(x)) for x in l] |
|
299 | sized = [(x, encoding.colwidth(x)) for x in l] | |
300 | ml = max([w for x, w in sized]) |
|
300 | ml = max([w for x, w in sized]) | |
301 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) |
|
301 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) | |
302 | for x, w in sized]) |
|
302 | for x, w in sized]) | |
303 |
|
303 | |||
304 | if pieces: |
|
304 | if pieces: | |
305 | for p, l in zip(zip(*pieces), lines): |
|
305 | for p, l in zip(zip(*pieces), lines): | |
306 | ui.write("%s: %s" % ("".join(p), l[1])) |
|
306 | ui.write("%s: %s" % ("".join(p), l[1])) | |
307 |
|
307 | |||
308 | if lines and not lines[-1][1].endswith('\n'): |
|
308 | if lines and not lines[-1][1].endswith('\n'): | |
309 | ui.write('\n') |
|
309 | ui.write('\n') | |
310 |
|
310 | |||
311 | @command('archive', |
|
311 | @command('archive', | |
312 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
312 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
313 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
313 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
314 | _('PREFIX')), |
|
314 | _('PREFIX')), | |
315 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
315 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
316 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
316 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
317 | ] + subrepoopts + walkopts, |
|
317 | ] + subrepoopts + walkopts, | |
318 | _('[OPTION]... DEST')) |
|
318 | _('[OPTION]... DEST')) | |
319 | def archive(ui, repo, dest, **opts): |
|
319 | def archive(ui, repo, dest, **opts): | |
320 | '''create an unversioned archive of a repository revision |
|
320 | '''create an unversioned archive of a repository revision | |
321 |
|
321 | |||
322 | By default, the revision used is the parent of the working |
|
322 | By default, the revision used is the parent of the working | |
323 | directory; use -r/--rev to specify a different revision. |
|
323 | directory; use -r/--rev to specify a different revision. | |
324 |
|
324 | |||
325 | The archive type is automatically detected based on file |
|
325 | The archive type is automatically detected based on file | |
326 | extension (or override using -t/--type). |
|
326 | extension (or override using -t/--type). | |
327 |
|
327 | |||
328 | .. container:: verbose |
|
328 | .. container:: verbose | |
329 |
|
329 | |||
330 | Examples: |
|
330 | Examples: | |
331 |
|
331 | |||
332 | - create a zip file containing the 1.0 release:: |
|
332 | - create a zip file containing the 1.0 release:: | |
333 |
|
333 | |||
334 | hg archive -r 1.0 project-1.0.zip |
|
334 | hg archive -r 1.0 project-1.0.zip | |
335 |
|
335 | |||
336 | - create a tarball excluding .hg files:: |
|
336 | - create a tarball excluding .hg files:: | |
337 |
|
337 | |||
338 | hg archive project.tar.gz -X ".hg*" |
|
338 | hg archive project.tar.gz -X ".hg*" | |
339 |
|
339 | |||
340 | Valid types are: |
|
340 | Valid types are: | |
341 |
|
341 | |||
342 | :``files``: a directory full of files (default) |
|
342 | :``files``: a directory full of files (default) | |
343 | :``tar``: tar archive, uncompressed |
|
343 | :``tar``: tar archive, uncompressed | |
344 | :``tbz2``: tar archive, compressed using bzip2 |
|
344 | :``tbz2``: tar archive, compressed using bzip2 | |
345 | :``tgz``: tar archive, compressed using gzip |
|
345 | :``tgz``: tar archive, compressed using gzip | |
346 | :``uzip``: zip archive, uncompressed |
|
346 | :``uzip``: zip archive, uncompressed | |
347 | :``zip``: zip archive, compressed using deflate |
|
347 | :``zip``: zip archive, compressed using deflate | |
348 |
|
348 | |||
349 | The exact name of the destination archive or directory is given |
|
349 | The exact name of the destination archive or directory is given | |
350 | using a format string; see :hg:`help export` for details. |
|
350 | using a format string; see :hg:`help export` for details. | |
351 |
|
351 | |||
352 | Each member added to an archive file has a directory prefix |
|
352 | Each member added to an archive file has a directory prefix | |
353 | prepended. Use -p/--prefix to specify a format string for the |
|
353 | prepended. Use -p/--prefix to specify a format string for the | |
354 | prefix. The default is the basename of the archive, with suffixes |
|
354 | prefix. The default is the basename of the archive, with suffixes | |
355 | removed. |
|
355 | removed. | |
356 |
|
356 | |||
357 | Returns 0 on success. |
|
357 | Returns 0 on success. | |
358 | ''' |
|
358 | ''' | |
359 |
|
359 | |||
360 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
360 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
361 | if not ctx: |
|
361 | if not ctx: | |
362 | raise util.Abort(_('no working directory: please specify a revision')) |
|
362 | raise util.Abort(_('no working directory: please specify a revision')) | |
363 | node = ctx.node() |
|
363 | node = ctx.node() | |
364 | dest = cmdutil.makefilename(repo, dest, node) |
|
364 | dest = cmdutil.makefilename(repo, dest, node) | |
365 | if os.path.realpath(dest) == repo.root: |
|
365 | if os.path.realpath(dest) == repo.root: | |
366 | raise util.Abort(_('repository root cannot be destination')) |
|
366 | raise util.Abort(_('repository root cannot be destination')) | |
367 |
|
367 | |||
368 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
368 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
369 | prefix = opts.get('prefix') |
|
369 | prefix = opts.get('prefix') | |
370 |
|
370 | |||
371 | if dest == '-': |
|
371 | if dest == '-': | |
372 | if kind == 'files': |
|
372 | if kind == 'files': | |
373 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
373 | raise util.Abort(_('cannot archive plain files to stdout')) | |
374 | dest = cmdutil.makefileobj(repo, dest) |
|
374 | dest = cmdutil.makefileobj(repo, dest) | |
375 | if not prefix: |
|
375 | if not prefix: | |
376 | prefix = os.path.basename(repo.root) + '-%h' |
|
376 | prefix = os.path.basename(repo.root) + '-%h' | |
377 |
|
377 | |||
378 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
378 | prefix = cmdutil.makefilename(repo, prefix, node) | |
379 | matchfn = scmutil.match(ctx, [], opts) |
|
379 | matchfn = scmutil.match(ctx, [], opts) | |
380 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
380 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
381 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
381 | matchfn, prefix, subrepos=opts.get('subrepos')) | |
382 |
|
382 | |||
383 | @command('backout', |
|
383 | @command('backout', | |
384 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
384 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
385 | ('', 'parent', '', |
|
385 | ('', 'parent', '', | |
386 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
386 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
387 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
387 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
388 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
388 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
389 | _('[OPTION]... [-r] REV')) |
|
389 | _('[OPTION]... [-r] REV')) | |
390 | def backout(ui, repo, node=None, rev=None, **opts): |
|
390 | def backout(ui, repo, node=None, rev=None, **opts): | |
391 | '''reverse effect of earlier changeset |
|
391 | '''reverse effect of earlier changeset | |
392 |
|
392 | |||
393 | Prepare a new changeset with the effect of REV undone in the |
|
393 | Prepare a new changeset with the effect of REV undone in the | |
394 | current working directory. |
|
394 | current working directory. | |
395 |
|
395 | |||
396 | If REV is the parent of the working directory, then this new changeset |
|
396 | If REV is the parent of the working directory, then this new changeset | |
397 | is committed automatically. Otherwise, hg needs to merge the |
|
397 | is committed automatically. Otherwise, hg needs to merge the | |
398 | changes and the merged result is left uncommitted. |
|
398 | changes and the merged result is left uncommitted. | |
399 |
|
399 | |||
400 | .. note:: |
|
400 | .. note:: | |
401 |
|
401 | |||
402 | backout cannot be used to fix either an unwanted or |
|
402 | backout cannot be used to fix either an unwanted or | |
403 | incorrect merge. |
|
403 | incorrect merge. | |
404 |
|
404 | |||
405 | .. container:: verbose |
|
405 | .. container:: verbose | |
406 |
|
406 | |||
407 | By default, the pending changeset will have one parent, |
|
407 | By default, the pending changeset will have one parent, | |
408 | maintaining a linear history. With --merge, the pending |
|
408 | maintaining a linear history. With --merge, the pending | |
409 | changeset will instead have two parents: the old parent of the |
|
409 | changeset will instead have two parents: the old parent of the | |
410 | working directory and a new child of REV that simply undoes REV. |
|
410 | working directory and a new child of REV that simply undoes REV. | |
411 |
|
411 | |||
412 | Before version 1.7, the behavior without --merge was equivalent |
|
412 | Before version 1.7, the behavior without --merge was equivalent | |
413 | to specifying --merge followed by :hg:`update --clean .` to |
|
413 | to specifying --merge followed by :hg:`update --clean .` to | |
414 | cancel the merge and leave the child of REV as a head to be |
|
414 | cancel the merge and leave the child of REV as a head to be | |
415 | merged separately. |
|
415 | merged separately. | |
416 |
|
416 | |||
417 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
417 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
418 |
|
418 | |||
419 | Returns 0 on success. |
|
419 | Returns 0 on success. | |
420 | ''' |
|
420 | ''' | |
421 | if rev and node: |
|
421 | if rev and node: | |
422 | raise util.Abort(_("please specify just one revision")) |
|
422 | raise util.Abort(_("please specify just one revision")) | |
423 |
|
423 | |||
424 | if not rev: |
|
424 | if not rev: | |
425 | rev = node |
|
425 | rev = node | |
426 |
|
426 | |||
427 | if not rev: |
|
427 | if not rev: | |
428 | raise util.Abort(_("please specify a revision to backout")) |
|
428 | raise util.Abort(_("please specify a revision to backout")) | |
429 |
|
429 | |||
430 | date = opts.get('date') |
|
430 | date = opts.get('date') | |
431 | if date: |
|
431 | if date: | |
432 | opts['date'] = util.parsedate(date) |
|
432 | opts['date'] = util.parsedate(date) | |
433 |
|
433 | |||
434 | cmdutil.checkunfinished(repo) |
|
434 | cmdutil.checkunfinished(repo) | |
435 | cmdutil.bailifchanged(repo) |
|
435 | cmdutil.bailifchanged(repo) | |
436 | node = scmutil.revsingle(repo, rev).node() |
|
436 | node = scmutil.revsingle(repo, rev).node() | |
437 |
|
437 | |||
438 | op1, op2 = repo.dirstate.parents() |
|
438 | op1, op2 = repo.dirstate.parents() | |
439 | a = repo.changelog.ancestor(op1, node) |
|
439 | a = repo.changelog.ancestor(op1, node) | |
440 | if a != node: |
|
440 | if a != node: | |
441 | raise util.Abort(_('cannot backout change on a different branch')) |
|
441 | raise util.Abort(_('cannot backout change on a different branch')) | |
442 |
|
442 | |||
443 | p1, p2 = repo.changelog.parents(node) |
|
443 | p1, p2 = repo.changelog.parents(node) | |
444 | if p1 == nullid: |
|
444 | if p1 == nullid: | |
445 | raise util.Abort(_('cannot backout a change with no parents')) |
|
445 | raise util.Abort(_('cannot backout a change with no parents')) | |
446 | if p2 != nullid: |
|
446 | if p2 != nullid: | |
447 | if not opts.get('parent'): |
|
447 | if not opts.get('parent'): | |
448 | raise util.Abort(_('cannot backout a merge changeset')) |
|
448 | raise util.Abort(_('cannot backout a merge changeset')) | |
449 | p = repo.lookup(opts['parent']) |
|
449 | p = repo.lookup(opts['parent']) | |
450 | if p not in (p1, p2): |
|
450 | if p not in (p1, p2): | |
451 | raise util.Abort(_('%s is not a parent of %s') % |
|
451 | raise util.Abort(_('%s is not a parent of %s') % | |
452 | (short(p), short(node))) |
|
452 | (short(p), short(node))) | |
453 | parent = p |
|
453 | parent = p | |
454 | else: |
|
454 | else: | |
455 | if opts.get('parent'): |
|
455 | if opts.get('parent'): | |
456 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
456 | raise util.Abort(_('cannot use --parent on non-merge changeset')) | |
457 | parent = p1 |
|
457 | parent = p1 | |
458 |
|
458 | |||
459 | # the backout should appear on the same branch |
|
459 | # the backout should appear on the same branch | |
460 | wlock = repo.wlock() |
|
460 | wlock = repo.wlock() | |
461 | try: |
|
461 | try: | |
462 | branch = repo.dirstate.branch() |
|
462 | branch = repo.dirstate.branch() | |
463 | bheads = repo.branchheads(branch) |
|
463 | bheads = repo.branchheads(branch) | |
464 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
464 | rctx = scmutil.revsingle(repo, hex(parent)) | |
465 | if not opts.get('merge') and op1 != node: |
|
465 | if not opts.get('merge') and op1 != node: | |
466 | try: |
|
466 | try: | |
467 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
467 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
468 | stats = mergemod.update(repo, parent, True, True, False, |
|
468 | stats = mergemod.update(repo, parent, True, True, False, | |
469 | node, False) |
|
469 | node, False) | |
470 | repo.setparents(op1, op2) |
|
470 | repo.setparents(op1, op2) | |
471 | hg._showstats(repo, stats) |
|
471 | hg._showstats(repo, stats) | |
472 | if stats[3]: |
|
472 | if stats[3]: | |
473 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
473 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
474 | "file merges\n")) |
|
474 | "file merges\n")) | |
475 | else: |
|
475 | else: | |
476 | msg = _("changeset %s backed out, " |
|
476 | msg = _("changeset %s backed out, " | |
477 | "don't forget to commit.\n") |
|
477 | "don't forget to commit.\n") | |
478 | ui.status(msg % short(node)) |
|
478 | ui.status(msg % short(node)) | |
479 | return stats[3] > 0 |
|
479 | return stats[3] > 0 | |
480 | finally: |
|
480 | finally: | |
481 | ui.setconfig('ui', 'forcemerge', '') |
|
481 | ui.setconfig('ui', 'forcemerge', '') | |
482 | else: |
|
482 | else: | |
483 | hg.clean(repo, node, show_stats=False) |
|
483 | hg.clean(repo, node, show_stats=False) | |
484 | repo.dirstate.setbranch(branch) |
|
484 | repo.dirstate.setbranch(branch) | |
485 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
485 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
486 |
|
486 | |||
487 |
|
487 | |||
488 | e = cmdutil.commiteditor |
|
488 | e = cmdutil.commiteditor | |
489 | if not opts['message'] and not opts['logfile']: |
|
489 | if not opts['message'] and not opts['logfile']: | |
490 | # we don't translate commit messages |
|
490 | # we don't translate commit messages | |
491 | opts['message'] = "Backed out changeset %s" % short(node) |
|
491 | opts['message'] = "Backed out changeset %s" % short(node) | |
492 | e = cmdutil.commitforceeditor |
|
492 | e = cmdutil.commitforceeditor | |
493 |
|
493 | |||
494 | def commitfunc(ui, repo, message, match, opts): |
|
494 | def commitfunc(ui, repo, message, match, opts): | |
495 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
495 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
496 | match, editor=e) |
|
496 | match, editor=e) | |
497 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
497 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
498 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
498 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
499 |
|
499 | |||
500 | def nice(node): |
|
500 | def nice(node): | |
501 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
501 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
502 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
502 | ui.status(_('changeset %s backs out changeset %s\n') % | |
503 | (nice(repo.changelog.tip()), nice(node))) |
|
503 | (nice(repo.changelog.tip()), nice(node))) | |
504 | if opts.get('merge') and op1 != node: |
|
504 | if opts.get('merge') and op1 != node: | |
505 | hg.clean(repo, op1, show_stats=False) |
|
505 | hg.clean(repo, op1, show_stats=False) | |
506 | ui.status(_('merging with changeset %s\n') |
|
506 | ui.status(_('merging with changeset %s\n') | |
507 | % nice(repo.changelog.tip())) |
|
507 | % nice(repo.changelog.tip())) | |
508 | try: |
|
508 | try: | |
509 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
509 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
510 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
510 | return hg.merge(repo, hex(repo.changelog.tip())) | |
511 | finally: |
|
511 | finally: | |
512 | ui.setconfig('ui', 'forcemerge', '') |
|
512 | ui.setconfig('ui', 'forcemerge', '') | |
513 | finally: |
|
513 | finally: | |
514 | wlock.release() |
|
514 | wlock.release() | |
515 | return 0 |
|
515 | return 0 | |
516 |
|
516 | |||
517 | @command('bisect', |
|
517 | @command('bisect', | |
518 | [('r', 'reset', False, _('reset bisect state')), |
|
518 | [('r', 'reset', False, _('reset bisect state')), | |
519 | ('g', 'good', False, _('mark changeset good')), |
|
519 | ('g', 'good', False, _('mark changeset good')), | |
520 | ('b', 'bad', False, _('mark changeset bad')), |
|
520 | ('b', 'bad', False, _('mark changeset bad')), | |
521 | ('s', 'skip', False, _('skip testing changeset')), |
|
521 | ('s', 'skip', False, _('skip testing changeset')), | |
522 | ('e', 'extend', False, _('extend the bisect range')), |
|
522 | ('e', 'extend', False, _('extend the bisect range')), | |
523 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
523 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
524 | ('U', 'noupdate', False, _('do not update to target'))], |
|
524 | ('U', 'noupdate', False, _('do not update to target'))], | |
525 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
525 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
526 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
526 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
527 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
527 | reset=None, good=None, bad=None, skip=None, extend=None, | |
528 | noupdate=None): |
|
528 | noupdate=None): | |
529 | """subdivision search of changesets |
|
529 | """subdivision search of changesets | |
530 |
|
530 | |||
531 | This command helps to find changesets which introduce problems. To |
|
531 | This command helps to find changesets which introduce problems. To | |
532 | use, mark the earliest changeset you know exhibits the problem as |
|
532 | use, mark the earliest changeset you know exhibits the problem as | |
533 | bad, then mark the latest changeset which is free from the problem |
|
533 | bad, then mark the latest changeset which is free from the problem | |
534 | as good. Bisect will update your working directory to a revision |
|
534 | as good. Bisect will update your working directory to a revision | |
535 | for testing (unless the -U/--noupdate option is specified). Once |
|
535 | for testing (unless the -U/--noupdate option is specified). Once | |
536 | you have performed tests, mark the working directory as good or |
|
536 | you have performed tests, mark the working directory as good or | |
537 | bad, and bisect will either update to another candidate changeset |
|
537 | bad, and bisect will either update to another candidate changeset | |
538 | or announce that it has found the bad revision. |
|
538 | or announce that it has found the bad revision. | |
539 |
|
539 | |||
540 | As a shortcut, you can also use the revision argument to mark a |
|
540 | As a shortcut, you can also use the revision argument to mark a | |
541 | revision as good or bad without checking it out first. |
|
541 | revision as good or bad without checking it out first. | |
542 |
|
542 | |||
543 | If you supply a command, it will be used for automatic bisection. |
|
543 | If you supply a command, it will be used for automatic bisection. | |
544 | The environment variable HG_NODE will contain the ID of the |
|
544 | The environment variable HG_NODE will contain the ID of the | |
545 | changeset being tested. The exit status of the command will be |
|
545 | changeset being tested. The exit status of the command will be | |
546 | used to mark revisions as good or bad: status 0 means good, 125 |
|
546 | used to mark revisions as good or bad: status 0 means good, 125 | |
547 | means to skip the revision, 127 (command not found) will abort the |
|
547 | means to skip the revision, 127 (command not found) will abort the | |
548 | bisection, and any other non-zero exit status means the revision |
|
548 | bisection, and any other non-zero exit status means the revision | |
549 | is bad. |
|
549 | is bad. | |
550 |
|
550 | |||
551 | .. container:: verbose |
|
551 | .. container:: verbose | |
552 |
|
552 | |||
553 | Some examples: |
|
553 | Some examples: | |
554 |
|
554 | |||
555 | - start a bisection with known bad revision 34, and good revision 12:: |
|
555 | - start a bisection with known bad revision 34, and good revision 12:: | |
556 |
|
556 | |||
557 | hg bisect --bad 34 |
|
557 | hg bisect --bad 34 | |
558 | hg bisect --good 12 |
|
558 | hg bisect --good 12 | |
559 |
|
559 | |||
560 | - advance the current bisection by marking current revision as good or |
|
560 | - advance the current bisection by marking current revision as good or | |
561 | bad:: |
|
561 | bad:: | |
562 |
|
562 | |||
563 | hg bisect --good |
|
563 | hg bisect --good | |
564 | hg bisect --bad |
|
564 | hg bisect --bad | |
565 |
|
565 | |||
566 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
566 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
567 | that revision is not usable because of another issue):: |
|
567 | that revision is not usable because of another issue):: | |
568 |
|
568 | |||
569 | hg bisect --skip |
|
569 | hg bisect --skip | |
570 | hg bisect --skip 23 |
|
570 | hg bisect --skip 23 | |
571 |
|
571 | |||
572 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
572 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
573 |
|
573 | |||
574 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
574 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
575 |
|
575 | |||
576 | - forget the current bisection:: |
|
576 | - forget the current bisection:: | |
577 |
|
577 | |||
578 | hg bisect --reset |
|
578 | hg bisect --reset | |
579 |
|
579 | |||
580 | - use 'make && make tests' to automatically find the first broken |
|
580 | - use 'make && make tests' to automatically find the first broken | |
581 | revision:: |
|
581 | revision:: | |
582 |
|
582 | |||
583 | hg bisect --reset |
|
583 | hg bisect --reset | |
584 | hg bisect --bad 34 |
|
584 | hg bisect --bad 34 | |
585 | hg bisect --good 12 |
|
585 | hg bisect --good 12 | |
586 | hg bisect --command "make && make tests" |
|
586 | hg bisect --command "make && make tests" | |
587 |
|
587 | |||
588 | - see all changesets whose states are already known in the current |
|
588 | - see all changesets whose states are already known in the current | |
589 | bisection:: |
|
589 | bisection:: | |
590 |
|
590 | |||
591 | hg log -r "bisect(pruned)" |
|
591 | hg log -r "bisect(pruned)" | |
592 |
|
592 | |||
593 | - see the changeset currently being bisected (especially useful |
|
593 | - see the changeset currently being bisected (especially useful | |
594 | if running with -U/--noupdate):: |
|
594 | if running with -U/--noupdate):: | |
595 |
|
595 | |||
596 | hg log -r "bisect(current)" |
|
596 | hg log -r "bisect(current)" | |
597 |
|
597 | |||
598 | - see all changesets that took part in the current bisection:: |
|
598 | - see all changesets that took part in the current bisection:: | |
599 |
|
599 | |||
600 | hg log -r "bisect(range)" |
|
600 | hg log -r "bisect(range)" | |
601 |
|
601 | |||
602 | - you can even get a nice graph:: |
|
602 | - you can even get a nice graph:: | |
603 |
|
603 | |||
604 | hg log --graph -r "bisect(range)" |
|
604 | hg log --graph -r "bisect(range)" | |
605 |
|
605 | |||
606 | See :hg:`help revsets` for more about the `bisect()` keyword. |
|
606 | See :hg:`help revsets` for more about the `bisect()` keyword. | |
607 |
|
607 | |||
608 | Returns 0 on success. |
|
608 | Returns 0 on success. | |
609 | """ |
|
609 | """ | |
610 | def extendbisectrange(nodes, good): |
|
610 | def extendbisectrange(nodes, good): | |
611 | # bisect is incomplete when it ends on a merge node and |
|
611 | # bisect is incomplete when it ends on a merge node and | |
612 | # one of the parent was not checked. |
|
612 | # one of the parent was not checked. | |
613 | parents = repo[nodes[0]].parents() |
|
613 | parents = repo[nodes[0]].parents() | |
614 | if len(parents) > 1: |
|
614 | if len(parents) > 1: | |
615 | side = good and state['bad'] or state['good'] |
|
615 | side = good and state['bad'] or state['good'] | |
616 | num = len(set(i.node() for i in parents) & set(side)) |
|
616 | num = len(set(i.node() for i in parents) & set(side)) | |
617 | if num == 1: |
|
617 | if num == 1: | |
618 | return parents[0].ancestor(parents[1]) |
|
618 | return parents[0].ancestor(parents[1]) | |
619 | return None |
|
619 | return None | |
620 |
|
620 | |||
621 | def print_result(nodes, good): |
|
621 | def print_result(nodes, good): | |
622 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
622 | displayer = cmdutil.show_changeset(ui, repo, {}) | |
623 | if len(nodes) == 1: |
|
623 | if len(nodes) == 1: | |
624 | # narrowed it down to a single revision |
|
624 | # narrowed it down to a single revision | |
625 | if good: |
|
625 | if good: | |
626 | ui.write(_("The first good revision is:\n")) |
|
626 | ui.write(_("The first good revision is:\n")) | |
627 | else: |
|
627 | else: | |
628 | ui.write(_("The first bad revision is:\n")) |
|
628 | ui.write(_("The first bad revision is:\n")) | |
629 | displayer.show(repo[nodes[0]]) |
|
629 | displayer.show(repo[nodes[0]]) | |
630 | extendnode = extendbisectrange(nodes, good) |
|
630 | extendnode = extendbisectrange(nodes, good) | |
631 | if extendnode is not None: |
|
631 | if extendnode is not None: | |
632 | ui.write(_('Not all ancestors of this changeset have been' |
|
632 | ui.write(_('Not all ancestors of this changeset have been' | |
633 | ' checked.\nUse bisect --extend to continue the ' |
|
633 | ' checked.\nUse bisect --extend to continue the ' | |
634 | 'bisection from\nthe common ancestor, %s.\n') |
|
634 | 'bisection from\nthe common ancestor, %s.\n') | |
635 | % extendnode) |
|
635 | % extendnode) | |
636 | else: |
|
636 | else: | |
637 | # multiple possible revisions |
|
637 | # multiple possible revisions | |
638 | if good: |
|
638 | if good: | |
639 | ui.write(_("Due to skipped revisions, the first " |
|
639 | ui.write(_("Due to skipped revisions, the first " | |
640 | "good revision could be any of:\n")) |
|
640 | "good revision could be any of:\n")) | |
641 | else: |
|
641 | else: | |
642 | ui.write(_("Due to skipped revisions, the first " |
|
642 | ui.write(_("Due to skipped revisions, the first " | |
643 | "bad revision could be any of:\n")) |
|
643 | "bad revision could be any of:\n")) | |
644 | for n in nodes: |
|
644 | for n in nodes: | |
645 | displayer.show(repo[n]) |
|
645 | displayer.show(repo[n]) | |
646 | displayer.close() |
|
646 | displayer.close() | |
647 |
|
647 | |||
648 | def check_state(state, interactive=True): |
|
648 | def check_state(state, interactive=True): | |
649 | if not state['good'] or not state['bad']: |
|
649 | if not state['good'] or not state['bad']: | |
650 | if (good or bad or skip or reset) and interactive: |
|
650 | if (good or bad or skip or reset) and interactive: | |
651 | return |
|
651 | return | |
652 | if not state['good']: |
|
652 | if not state['good']: | |
653 | raise util.Abort(_('cannot bisect (no known good revisions)')) |
|
653 | raise util.Abort(_('cannot bisect (no known good revisions)')) | |
654 | else: |
|
654 | else: | |
655 | raise util.Abort(_('cannot bisect (no known bad revisions)')) |
|
655 | raise util.Abort(_('cannot bisect (no known bad revisions)')) | |
656 | return True |
|
656 | return True | |
657 |
|
657 | |||
658 | # backward compatibility |
|
658 | # backward compatibility | |
659 | if rev in "good bad reset init".split(): |
|
659 | if rev in "good bad reset init".split(): | |
660 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
660 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
661 | cmd, rev, extra = rev, extra, None |
|
661 | cmd, rev, extra = rev, extra, None | |
662 | if cmd == "good": |
|
662 | if cmd == "good": | |
663 | good = True |
|
663 | good = True | |
664 | elif cmd == "bad": |
|
664 | elif cmd == "bad": | |
665 | bad = True |
|
665 | bad = True | |
666 | else: |
|
666 | else: | |
667 | reset = True |
|
667 | reset = True | |
668 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: |
|
668 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: | |
669 | raise util.Abort(_('incompatible arguments')) |
|
669 | raise util.Abort(_('incompatible arguments')) | |
670 |
|
670 | |||
671 | cmdutil.checkunfinished(repo) |
|
671 | cmdutil.checkunfinished(repo) | |
672 |
|
672 | |||
673 | if reset: |
|
673 | if reset: | |
674 | p = repo.join("bisect.state") |
|
674 | p = repo.join("bisect.state") | |
675 | if os.path.exists(p): |
|
675 | if os.path.exists(p): | |
676 | os.unlink(p) |
|
676 | os.unlink(p) | |
677 | return |
|
677 | return | |
678 |
|
678 | |||
679 | state = hbisect.load_state(repo) |
|
679 | state = hbisect.load_state(repo) | |
680 |
|
680 | |||
681 | if command: |
|
681 | if command: | |
682 | changesets = 1 |
|
682 | changesets = 1 | |
683 | if noupdate: |
|
683 | if noupdate: | |
684 | try: |
|
684 | try: | |
685 | node = state['current'][0] |
|
685 | node = state['current'][0] | |
686 | except LookupError: |
|
686 | except LookupError: | |
687 | raise util.Abort(_('current bisect revision is unknown - ' |
|
687 | raise util.Abort(_('current bisect revision is unknown - ' | |
688 | 'start a new bisect to fix')) |
|
688 | 'start a new bisect to fix')) | |
689 | else: |
|
689 | else: | |
690 | node, p2 = repo.dirstate.parents() |
|
690 | node, p2 = repo.dirstate.parents() | |
691 | if p2 != nullid: |
|
691 | if p2 != nullid: | |
692 | raise util.Abort(_('current bisect revision is a merge')) |
|
692 | raise util.Abort(_('current bisect revision is a merge')) | |
693 | try: |
|
693 | try: | |
694 | while changesets: |
|
694 | while changesets: | |
695 | # update state |
|
695 | # update state | |
696 | state['current'] = [node] |
|
696 | state['current'] = [node] | |
697 | hbisect.save_state(repo, state) |
|
697 | hbisect.save_state(repo, state) | |
698 | status = util.system(command, |
|
698 | status = util.system(command, | |
699 | environ={'HG_NODE': hex(node)}, |
|
699 | environ={'HG_NODE': hex(node)}, | |
700 | out=ui.fout) |
|
700 | out=ui.fout) | |
701 | if status == 125: |
|
701 | if status == 125: | |
702 | transition = "skip" |
|
702 | transition = "skip" | |
703 | elif status == 0: |
|
703 | elif status == 0: | |
704 | transition = "good" |
|
704 | transition = "good" | |
705 | # status < 0 means process was killed |
|
705 | # status < 0 means process was killed | |
706 | elif status == 127: |
|
706 | elif status == 127: | |
707 | raise util.Abort(_("failed to execute %s") % command) |
|
707 | raise util.Abort(_("failed to execute %s") % command) | |
708 | elif status < 0: |
|
708 | elif status < 0: | |
709 | raise util.Abort(_("%s killed") % command) |
|
709 | raise util.Abort(_("%s killed") % command) | |
710 | else: |
|
710 | else: | |
711 | transition = "bad" |
|
711 | transition = "bad" | |
712 | ctx = scmutil.revsingle(repo, rev, node) |
|
712 | ctx = scmutil.revsingle(repo, rev, node) | |
713 | rev = None # clear for future iterations |
|
713 | rev = None # clear for future iterations | |
714 | state[transition].append(ctx.node()) |
|
714 | state[transition].append(ctx.node()) | |
715 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
715 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
716 | check_state(state, interactive=False) |
|
716 | check_state(state, interactive=False) | |
717 | # bisect |
|
717 | # bisect | |
718 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) |
|
718 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) | |
719 | # update to next check |
|
719 | # update to next check | |
720 | node = nodes[0] |
|
720 | node = nodes[0] | |
721 | if not noupdate: |
|
721 | if not noupdate: | |
722 | cmdutil.bailifchanged(repo) |
|
722 | cmdutil.bailifchanged(repo) | |
723 | hg.clean(repo, node, show_stats=False) |
|
723 | hg.clean(repo, node, show_stats=False) | |
724 | finally: |
|
724 | finally: | |
725 | state['current'] = [node] |
|
725 | state['current'] = [node] | |
726 | hbisect.save_state(repo, state) |
|
726 | hbisect.save_state(repo, state) | |
727 | print_result(nodes, bgood) |
|
727 | print_result(nodes, bgood) | |
728 | return |
|
728 | return | |
729 |
|
729 | |||
730 | # update state |
|
730 | # update state | |
731 |
|
731 | |||
732 | if rev: |
|
732 | if rev: | |
733 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
733 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
734 | else: |
|
734 | else: | |
735 | nodes = [repo.lookup('.')] |
|
735 | nodes = [repo.lookup('.')] | |
736 |
|
736 | |||
737 | if good or bad or skip: |
|
737 | if good or bad or skip: | |
738 | if good: |
|
738 | if good: | |
739 | state['good'] += nodes |
|
739 | state['good'] += nodes | |
740 | elif bad: |
|
740 | elif bad: | |
741 | state['bad'] += nodes |
|
741 | state['bad'] += nodes | |
742 | elif skip: |
|
742 | elif skip: | |
743 | state['skip'] += nodes |
|
743 | state['skip'] += nodes | |
744 | hbisect.save_state(repo, state) |
|
744 | hbisect.save_state(repo, state) | |
745 |
|
745 | |||
746 | if not check_state(state): |
|
746 | if not check_state(state): | |
747 | return |
|
747 | return | |
748 |
|
748 | |||
749 | # actually bisect |
|
749 | # actually bisect | |
750 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
750 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) | |
751 | if extend: |
|
751 | if extend: | |
752 | if not changesets: |
|
752 | if not changesets: | |
753 | extendnode = extendbisectrange(nodes, good) |
|
753 | extendnode = extendbisectrange(nodes, good) | |
754 | if extendnode is not None: |
|
754 | if extendnode is not None: | |
755 | ui.write(_("Extending search to changeset %d:%s\n" |
|
755 | ui.write(_("Extending search to changeset %d:%s\n" | |
756 | % (extendnode.rev(), extendnode))) |
|
756 | % (extendnode.rev(), extendnode))) | |
757 | state['current'] = [extendnode.node()] |
|
757 | state['current'] = [extendnode.node()] | |
758 | hbisect.save_state(repo, state) |
|
758 | hbisect.save_state(repo, state) | |
759 | if noupdate: |
|
759 | if noupdate: | |
760 | return |
|
760 | return | |
761 | cmdutil.bailifchanged(repo) |
|
761 | cmdutil.bailifchanged(repo) | |
762 | return hg.clean(repo, extendnode.node()) |
|
762 | return hg.clean(repo, extendnode.node()) | |
763 | raise util.Abort(_("nothing to extend")) |
|
763 | raise util.Abort(_("nothing to extend")) | |
764 |
|
764 | |||
765 | if changesets == 0: |
|
765 | if changesets == 0: | |
766 | print_result(nodes, good) |
|
766 | print_result(nodes, good) | |
767 | else: |
|
767 | else: | |
768 | assert len(nodes) == 1 # only a single node can be tested next |
|
768 | assert len(nodes) == 1 # only a single node can be tested next | |
769 | node = nodes[0] |
|
769 | node = nodes[0] | |
770 | # compute the approximate number of remaining tests |
|
770 | # compute the approximate number of remaining tests | |
771 | tests, size = 0, 2 |
|
771 | tests, size = 0, 2 | |
772 | while size <= changesets: |
|
772 | while size <= changesets: | |
773 | tests, size = tests + 1, size * 2 |
|
773 | tests, size = tests + 1, size * 2 | |
774 | rev = repo.changelog.rev(node) |
|
774 | rev = repo.changelog.rev(node) | |
775 | ui.write(_("Testing changeset %d:%s " |
|
775 | ui.write(_("Testing changeset %d:%s " | |
776 | "(%d changesets remaining, ~%d tests)\n") |
|
776 | "(%d changesets remaining, ~%d tests)\n") | |
777 | % (rev, short(node), changesets, tests)) |
|
777 | % (rev, short(node), changesets, tests)) | |
778 | state['current'] = [node] |
|
778 | state['current'] = [node] | |
779 | hbisect.save_state(repo, state) |
|
779 | hbisect.save_state(repo, state) | |
780 | if not noupdate: |
|
780 | if not noupdate: | |
781 | cmdutil.bailifchanged(repo) |
|
781 | cmdutil.bailifchanged(repo) | |
782 | return hg.clean(repo, node) |
|
782 | return hg.clean(repo, node) | |
783 |
|
783 | |||
784 | @command('bookmarks|bookmark', |
|
784 | @command('bookmarks|bookmark', | |
785 | [('f', 'force', False, _('force')), |
|
785 | [('f', 'force', False, _('force')), | |
786 | ('r', 'rev', '', _('revision'), _('REV')), |
|
786 | ('r', 'rev', '', _('revision'), _('REV')), | |
787 | ('d', 'delete', False, _('delete a given bookmark')), |
|
787 | ('d', 'delete', False, _('delete a given bookmark')), | |
788 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), |
|
788 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), | |
789 | ('i', 'inactive', False, _('mark a bookmark inactive'))], |
|
789 | ('i', 'inactive', False, _('mark a bookmark inactive'))], | |
790 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
790 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
791 | def bookmark(ui, repo, *names, **opts): |
|
791 | def bookmark(ui, repo, *names, **opts): | |
792 | '''track a line of development with movable markers |
|
792 | '''track a line of development with movable markers | |
793 |
|
793 | |||
794 | Bookmarks are pointers to certain commits that move when committing. |
|
794 | Bookmarks are pointers to certain commits that move when committing. | |
795 | Bookmarks are local. They can be renamed, copied and deleted. It is |
|
795 | Bookmarks are local. They can be renamed, copied and deleted. It is | |
796 | possible to use :hg:`merge NAME` to merge from a given bookmark, and |
|
796 | possible to use :hg:`merge NAME` to merge from a given bookmark, and | |
797 | :hg:`update NAME` to update to a given bookmark. |
|
797 | :hg:`update NAME` to update to a given bookmark. | |
798 |
|
798 | |||
799 | You can use :hg:`bookmark NAME` to set a bookmark on the working |
|
799 | You can use :hg:`bookmark NAME` to set a bookmark on the working | |
800 | directory's parent revision with the given name. If you specify |
|
800 | directory's parent revision with the given name. If you specify | |
801 | a revision using -r REV (where REV may be an existing bookmark), |
|
801 | a revision using -r REV (where REV may be an existing bookmark), | |
802 | the bookmark is assigned to that revision. |
|
802 | the bookmark is assigned to that revision. | |
803 |
|
803 | |||
804 | Bookmarks can be pushed and pulled between repositories (see :hg:`help |
|
804 | Bookmarks can be pushed and pulled between repositories (see :hg:`help | |
805 | push` and :hg:`help pull`). This requires both the local and remote |
|
805 | push` and :hg:`help pull`). This requires both the local and remote | |
806 | repositories to support bookmarks. For versions prior to 1.8, this means |
|
806 | repositories to support bookmarks. For versions prior to 1.8, this means | |
807 | the bookmarks extension must be enabled. |
|
807 | the bookmarks extension must be enabled. | |
808 |
|
808 | |||
809 | If you set a bookmark called '@', new clones of the repository will |
|
809 | If you set a bookmark called '@', new clones of the repository will | |
810 | have that revision checked out (and the bookmark made active) by |
|
810 | have that revision checked out (and the bookmark made active) by | |
811 | default. |
|
811 | default. | |
812 |
|
812 | |||
813 | With -i/--inactive, the new bookmark will not be made the active |
|
813 | With -i/--inactive, the new bookmark will not be made the active | |
814 | bookmark. If -r/--rev is given, the new bookmark will not be made |
|
814 | bookmark. If -r/--rev is given, the new bookmark will not be made | |
815 | active even if -i/--inactive is not given. If no NAME is given, the |
|
815 | active even if -i/--inactive is not given. If no NAME is given, the | |
816 | current active bookmark will be marked inactive. |
|
816 | current active bookmark will be marked inactive. | |
817 | ''' |
|
817 | ''' | |
818 | force = opts.get('force') |
|
818 | force = opts.get('force') | |
819 | rev = opts.get('rev') |
|
819 | rev = opts.get('rev') | |
820 | delete = opts.get('delete') |
|
820 | delete = opts.get('delete') | |
821 | rename = opts.get('rename') |
|
821 | rename = opts.get('rename') | |
822 | inactive = opts.get('inactive') |
|
822 | inactive = opts.get('inactive') | |
823 |
|
823 | |||
824 | def checkformat(mark): |
|
824 | def checkformat(mark): | |
825 | mark = mark.strip() |
|
825 | mark = mark.strip() | |
826 | if not mark: |
|
826 | if not mark: | |
827 | raise util.Abort(_("bookmark names cannot consist entirely of " |
|
827 | raise util.Abort(_("bookmark names cannot consist entirely of " | |
828 | "whitespace")) |
|
828 | "whitespace")) | |
829 | scmutil.checknewlabel(repo, mark, 'bookmark') |
|
829 | scmutil.checknewlabel(repo, mark, 'bookmark') | |
830 | return mark |
|
830 | return mark | |
831 |
|
831 | |||
832 | def checkconflict(repo, mark, cur, force=False, target=None): |
|
832 | def checkconflict(repo, mark, cur, force=False, target=None): | |
833 | if mark in marks and not force: |
|
833 | if mark in marks and not force: | |
834 | if target: |
|
834 | if target: | |
835 | if marks[mark] == target and target == cur: |
|
835 | if marks[mark] == target and target == cur: | |
836 | # re-activating a bookmark |
|
836 | # re-activating a bookmark | |
837 | return |
|
837 | return | |
838 | anc = repo.changelog.ancestors([repo[target].rev()]) |
|
838 | anc = repo.changelog.ancestors([repo[target].rev()]) | |
839 | bmctx = repo[marks[mark]] |
|
839 | bmctx = repo[marks[mark]] | |
840 | divs = [repo[b].node() for b in marks |
|
840 | divs = [repo[b].node() for b in marks | |
841 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] |
|
841 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] | |
842 |
|
842 | |||
843 | # allow resolving a single divergent bookmark even if moving |
|
843 | # allow resolving a single divergent bookmark even if moving | |
844 | # the bookmark across branches when a revision is specified |
|
844 | # the bookmark across branches when a revision is specified | |
845 | # that contains a divergent bookmark |
|
845 | # that contains a divergent bookmark | |
846 | if bmctx.rev() not in anc and target in divs: |
|
846 | if bmctx.rev() not in anc and target in divs: | |
847 | bookmarks.deletedivergent(repo, [target], mark) |
|
847 | bookmarks.deletedivergent(repo, [target], mark) | |
848 | return |
|
848 | return | |
849 |
|
849 | |||
850 | deletefrom = [b for b in divs |
|
850 | deletefrom = [b for b in divs | |
851 | if repo[b].rev() in anc or b == target] |
|
851 | if repo[b].rev() in anc or b == target] | |
852 | bookmarks.deletedivergent(repo, deletefrom, mark) |
|
852 | bookmarks.deletedivergent(repo, deletefrom, mark) | |
853 | if bookmarks.validdest(repo, bmctx, repo[target]): |
|
853 | if bookmarks.validdest(repo, bmctx, repo[target]): | |
854 | ui.status(_("moving bookmark '%s' forward from %s\n") % |
|
854 | ui.status(_("moving bookmark '%s' forward from %s\n") % | |
855 | (mark, short(bmctx.node()))) |
|
855 | (mark, short(bmctx.node()))) | |
856 | return |
|
856 | return | |
857 | raise util.Abort(_("bookmark '%s' already exists " |
|
857 | raise util.Abort(_("bookmark '%s' already exists " | |
858 | "(use -f to force)") % mark) |
|
858 | "(use -f to force)") % mark) | |
859 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) |
|
859 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) | |
860 | and not force): |
|
860 | and not force): | |
861 | raise util.Abort( |
|
861 | raise util.Abort( | |
862 | _("a bookmark cannot have the name of an existing branch")) |
|
862 | _("a bookmark cannot have the name of an existing branch")) | |
863 |
|
863 | |||
864 | if delete and rename: |
|
864 | if delete and rename: | |
865 | raise util.Abort(_("--delete and --rename are incompatible")) |
|
865 | raise util.Abort(_("--delete and --rename are incompatible")) | |
866 | if delete and rev: |
|
866 | if delete and rev: | |
867 | raise util.Abort(_("--rev is incompatible with --delete")) |
|
867 | raise util.Abort(_("--rev is incompatible with --delete")) | |
868 | if rename and rev: |
|
868 | if rename and rev: | |
869 | raise util.Abort(_("--rev is incompatible with --rename")) |
|
869 | raise util.Abort(_("--rev is incompatible with --rename")) | |
870 | if not names and (delete or rev): |
|
870 | if not names and (delete or rev): | |
871 | raise util.Abort(_("bookmark name required")) |
|
871 | raise util.Abort(_("bookmark name required")) | |
872 |
|
872 | |||
873 | if delete or rename or names or inactive: |
|
873 | if delete or rename or names or inactive: | |
874 | wlock = repo.wlock() |
|
874 | wlock = repo.wlock() | |
875 | try: |
|
875 | try: | |
876 | cur = repo.changectx('.').node() |
|
876 | cur = repo.changectx('.').node() | |
877 | marks = repo._bookmarks |
|
877 | marks = repo._bookmarks | |
878 | if delete: |
|
878 | if delete: | |
879 | for mark in names: |
|
879 | for mark in names: | |
880 | if mark not in marks: |
|
880 | if mark not in marks: | |
881 | raise util.Abort(_("bookmark '%s' does not exist") % |
|
881 | raise util.Abort(_("bookmark '%s' does not exist") % | |
882 | mark) |
|
882 | mark) | |
883 | if mark == repo._bookmarkcurrent: |
|
883 | if mark == repo._bookmarkcurrent: | |
884 | bookmarks.unsetcurrent(repo) |
|
884 | bookmarks.unsetcurrent(repo) | |
885 | del marks[mark] |
|
885 | del marks[mark] | |
886 | marks.write() |
|
886 | marks.write() | |
887 |
|
887 | |||
888 | elif rename: |
|
888 | elif rename: | |
889 | if not names: |
|
889 | if not names: | |
890 | raise util.Abort(_("new bookmark name required")) |
|
890 | raise util.Abort(_("new bookmark name required")) | |
891 | elif len(names) > 1: |
|
891 | elif len(names) > 1: | |
892 | raise util.Abort(_("only one new bookmark name allowed")) |
|
892 | raise util.Abort(_("only one new bookmark name allowed")) | |
893 | mark = checkformat(names[0]) |
|
893 | mark = checkformat(names[0]) | |
894 | if rename not in marks: |
|
894 | if rename not in marks: | |
895 | raise util.Abort(_("bookmark '%s' does not exist") % rename) |
|
895 | raise util.Abort(_("bookmark '%s' does not exist") % rename) | |
896 | checkconflict(repo, mark, cur, force) |
|
896 | checkconflict(repo, mark, cur, force) | |
897 | marks[mark] = marks[rename] |
|
897 | marks[mark] = marks[rename] | |
898 | if repo._bookmarkcurrent == rename and not inactive: |
|
898 | if repo._bookmarkcurrent == rename and not inactive: | |
899 | bookmarks.setcurrent(repo, mark) |
|
899 | bookmarks.setcurrent(repo, mark) | |
900 | del marks[rename] |
|
900 | del marks[rename] | |
901 | marks.write() |
|
901 | marks.write() | |
902 |
|
902 | |||
903 | elif names: |
|
903 | elif names: | |
904 | newact = None |
|
904 | newact = None | |
905 | for mark in names: |
|
905 | for mark in names: | |
906 | mark = checkformat(mark) |
|
906 | mark = checkformat(mark) | |
907 | if newact is None: |
|
907 | if newact is None: | |
908 | newact = mark |
|
908 | newact = mark | |
909 | if inactive and mark == repo._bookmarkcurrent: |
|
909 | if inactive and mark == repo._bookmarkcurrent: | |
910 | bookmarks.unsetcurrent(repo) |
|
910 | bookmarks.unsetcurrent(repo) | |
911 | return |
|
911 | return | |
912 | tgt = cur |
|
912 | tgt = cur | |
913 | if rev: |
|
913 | if rev: | |
914 | tgt = scmutil.revsingle(repo, rev).node() |
|
914 | tgt = scmutil.revsingle(repo, rev).node() | |
915 | checkconflict(repo, mark, cur, force, tgt) |
|
915 | checkconflict(repo, mark, cur, force, tgt) | |
916 | marks[mark] = tgt |
|
916 | marks[mark] = tgt | |
917 | if not inactive and cur == marks[newact] and not rev: |
|
917 | if not inactive and cur == marks[newact] and not rev: | |
918 | bookmarks.setcurrent(repo, newact) |
|
918 | bookmarks.setcurrent(repo, newact) | |
919 | elif cur != tgt and newact == repo._bookmarkcurrent: |
|
919 | elif cur != tgt and newact == repo._bookmarkcurrent: | |
920 | bookmarks.unsetcurrent(repo) |
|
920 | bookmarks.unsetcurrent(repo) | |
921 | marks.write() |
|
921 | marks.write() | |
922 |
|
922 | |||
923 | elif inactive: |
|
923 | elif inactive: | |
924 | if len(marks) == 0: |
|
924 | if len(marks) == 0: | |
925 | ui.status(_("no bookmarks set\n")) |
|
925 | ui.status(_("no bookmarks set\n")) | |
926 | elif not repo._bookmarkcurrent: |
|
926 | elif not repo._bookmarkcurrent: | |
927 | ui.status(_("no active bookmark\n")) |
|
927 | ui.status(_("no active bookmark\n")) | |
928 | else: |
|
928 | else: | |
929 | bookmarks.unsetcurrent(repo) |
|
929 | bookmarks.unsetcurrent(repo) | |
930 | finally: |
|
930 | finally: | |
931 | wlock.release() |
|
931 | wlock.release() | |
932 | else: # show bookmarks |
|
932 | else: # show bookmarks | |
933 | hexfn = ui.debugflag and hex or short |
|
933 | hexfn = ui.debugflag and hex or short | |
934 | marks = repo._bookmarks |
|
934 | marks = repo._bookmarks | |
935 | if len(marks) == 0: |
|
935 | if len(marks) == 0: | |
936 | ui.status(_("no bookmarks set\n")) |
|
936 | ui.status(_("no bookmarks set\n")) | |
937 | else: |
|
937 | else: | |
938 | for bmark, n in sorted(marks.iteritems()): |
|
938 | for bmark, n in sorted(marks.iteritems()): | |
939 | current = repo._bookmarkcurrent |
|
939 | current = repo._bookmarkcurrent | |
940 | if bmark == current: |
|
940 | if bmark == current: | |
941 | prefix, label = '*', 'bookmarks.current' |
|
941 | prefix, label = '*', 'bookmarks.current' | |
942 | else: |
|
942 | else: | |
943 | prefix, label = ' ', '' |
|
943 | prefix, label = ' ', '' | |
944 |
|
944 | |||
945 | if ui.quiet: |
|
945 | if ui.quiet: | |
946 | ui.write("%s\n" % bmark, label=label) |
|
946 | ui.write("%s\n" % bmark, label=label) | |
947 | else: |
|
947 | else: | |
948 | ui.write(" %s %-25s %d:%s\n" % ( |
|
948 | ui.write(" %s %-25s %d:%s\n" % ( | |
949 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), |
|
949 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), | |
950 | label=label) |
|
950 | label=label) | |
951 |
|
951 | |||
952 | @command('branch', |
|
952 | @command('branch', | |
953 | [('f', 'force', None, |
|
953 | [('f', 'force', None, | |
954 | _('set branch name even if it shadows an existing branch')), |
|
954 | _('set branch name even if it shadows an existing branch')), | |
955 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
955 | ('C', 'clean', None, _('reset branch name to parent branch name'))], | |
956 | _('[-fC] [NAME]')) |
|
956 | _('[-fC] [NAME]')) | |
957 | def branch(ui, repo, label=None, **opts): |
|
957 | def branch(ui, repo, label=None, **opts): | |
958 | """set or show the current branch name |
|
958 | """set or show the current branch name | |
959 |
|
959 | |||
960 | .. note:: |
|
960 | .. note:: | |
961 |
|
961 | |||
962 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
962 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
963 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
963 | light-weight bookmark instead. See :hg:`help glossary` for more | |
964 | information about named branches and bookmarks. |
|
964 | information about named branches and bookmarks. | |
965 |
|
965 | |||
966 | With no argument, show the current branch name. With one argument, |
|
966 | With no argument, show the current branch name. With one argument, | |
967 | set the working directory branch name (the branch will not exist |
|
967 | set the working directory branch name (the branch will not exist | |
968 | in the repository until the next commit). Standard practice |
|
968 | in the repository until the next commit). Standard practice | |
969 | recommends that primary development take place on the 'default' |
|
969 | recommends that primary development take place on the 'default' | |
970 | branch. |
|
970 | branch. | |
971 |
|
971 | |||
972 | Unless -f/--force is specified, branch will not let you set a |
|
972 | Unless -f/--force is specified, branch will not let you set a | |
973 | branch name that already exists, even if it's inactive. |
|
973 | branch name that already exists, even if it's inactive. | |
974 |
|
974 | |||
975 | Use -C/--clean to reset the working directory branch to that of |
|
975 | Use -C/--clean to reset the working directory branch to that of | |
976 | the parent of the working directory, negating a previous branch |
|
976 | the parent of the working directory, negating a previous branch | |
977 | change. |
|
977 | change. | |
978 |
|
978 | |||
979 | Use the command :hg:`update` to switch to an existing branch. Use |
|
979 | Use the command :hg:`update` to switch to an existing branch. Use | |
980 | :hg:`commit --close-branch` to mark this branch as closed. |
|
980 | :hg:`commit --close-branch` to mark this branch as closed. | |
981 |
|
981 | |||
982 | Returns 0 on success. |
|
982 | Returns 0 on success. | |
983 | """ |
|
983 | """ | |
984 | if label: |
|
984 | if label: | |
985 | label = label.strip() |
|
985 | label = label.strip() | |
986 |
|
986 | |||
987 | if not opts.get('clean') and not label: |
|
987 | if not opts.get('clean') and not label: | |
988 | ui.write("%s\n" % repo.dirstate.branch()) |
|
988 | ui.write("%s\n" % repo.dirstate.branch()) | |
989 | return |
|
989 | return | |
990 |
|
990 | |||
991 | wlock = repo.wlock() |
|
991 | wlock = repo.wlock() | |
992 | try: |
|
992 | try: | |
993 | if opts.get('clean'): |
|
993 | if opts.get('clean'): | |
994 | label = repo[None].p1().branch() |
|
994 | label = repo[None].p1().branch() | |
995 | repo.dirstate.setbranch(label) |
|
995 | repo.dirstate.setbranch(label) | |
996 | ui.status(_('reset working directory to branch %s\n') % label) |
|
996 | ui.status(_('reset working directory to branch %s\n') % label) | |
997 | elif label: |
|
997 | elif label: | |
998 | if not opts.get('force') and label in repo.branchmap(): |
|
998 | if not opts.get('force') and label in repo.branchmap(): | |
999 | if label not in [p.branch() for p in repo.parents()]: |
|
999 | if label not in [p.branch() for p in repo.parents()]: | |
1000 | raise util.Abort(_('a branch of the same name already' |
|
1000 | raise util.Abort(_('a branch of the same name already' | |
1001 | ' exists'), |
|
1001 | ' exists'), | |
1002 | # i18n: "it" refers to an existing branch |
|
1002 | # i18n: "it" refers to an existing branch | |
1003 | hint=_("use 'hg update' to switch to it")) |
|
1003 | hint=_("use 'hg update' to switch to it")) | |
1004 | scmutil.checknewlabel(repo, label, 'branch') |
|
1004 | scmutil.checknewlabel(repo, label, 'branch') | |
1005 | repo.dirstate.setbranch(label) |
|
1005 | repo.dirstate.setbranch(label) | |
1006 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1006 | ui.status(_('marked working directory as branch %s\n') % label) | |
1007 | ui.status(_('(branches are permanent and global, ' |
|
1007 | ui.status(_('(branches are permanent and global, ' | |
1008 | 'did you want a bookmark?)\n')) |
|
1008 | 'did you want a bookmark?)\n')) | |
1009 | finally: |
|
1009 | finally: | |
1010 | wlock.release() |
|
1010 | wlock.release() | |
1011 |
|
1011 | |||
1012 | @command('branches', |
|
1012 | @command('branches', | |
1013 | [('a', 'active', False, _('show only branches that have unmerged heads')), |
|
1013 | [('a', 'active', False, _('show only branches that have unmerged heads')), | |
1014 | ('c', 'closed', False, _('show normal and closed branches'))], |
|
1014 | ('c', 'closed', False, _('show normal and closed branches'))], | |
1015 | _('[-ac]')) |
|
1015 | _('[-ac]')) | |
1016 | def branches(ui, repo, active=False, closed=False): |
|
1016 | def branches(ui, repo, active=False, closed=False): | |
1017 | """list repository named branches |
|
1017 | """list repository named branches | |
1018 |
|
1018 | |||
1019 | List the repository's named branches, indicating which ones are |
|
1019 | List the repository's named branches, indicating which ones are | |
1020 | inactive. If -c/--closed is specified, also list branches which have |
|
1020 | inactive. If -c/--closed is specified, also list branches which have | |
1021 | been marked closed (see :hg:`commit --close-branch`). |
|
1021 | been marked closed (see :hg:`commit --close-branch`). | |
1022 |
|
1022 | |||
1023 | If -a/--active is specified, only show active branches. A branch |
|
1023 | If -a/--active is specified, only show active branches. A branch | |
1024 | is considered active if it contains repository heads. |
|
1024 | is considered active if it contains repository heads. | |
1025 |
|
1025 | |||
1026 | Use the command :hg:`update` to switch to an existing branch. |
|
1026 | Use the command :hg:`update` to switch to an existing branch. | |
1027 |
|
1027 | |||
1028 | Returns 0. |
|
1028 | Returns 0. | |
1029 | """ |
|
1029 | """ | |
1030 |
|
1030 | |||
1031 | hexfunc = ui.debugflag and hex or short |
|
1031 | hexfunc = ui.debugflag and hex or short | |
1032 |
|
1032 | |||
1033 | allheads = set(repo.heads()) |
|
1033 | allheads = set(repo.heads()) | |
1034 | branches = [] |
|
1034 | branches = [] | |
1035 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1035 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1036 | isactive = not isclosed and bool(set(heads) & allheads) |
|
1036 | isactive = not isclosed and bool(set(heads) & allheads) | |
1037 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1037 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1038 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1038 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1039 | reverse=True) |
|
1039 | reverse=True) | |
1040 |
|
1040 | |||
1041 | for tag, ctx, isactive, isopen in branches: |
|
1041 | for tag, ctx, isactive, isopen in branches: | |
1042 | if (not active) or isactive: |
|
1042 | if (not active) or isactive: | |
1043 | if isactive: |
|
1043 | if isactive: | |
1044 | label = 'branches.active' |
|
1044 | label = 'branches.active' | |
1045 | notice = '' |
|
1045 | notice = '' | |
1046 | elif not isopen: |
|
1046 | elif not isopen: | |
1047 | if not closed: |
|
1047 | if not closed: | |
1048 | continue |
|
1048 | continue | |
1049 | label = 'branches.closed' |
|
1049 | label = 'branches.closed' | |
1050 | notice = _(' (closed)') |
|
1050 | notice = _(' (closed)') | |
1051 | else: |
|
1051 | else: | |
1052 | label = 'branches.inactive' |
|
1052 | label = 'branches.inactive' | |
1053 | notice = _(' (inactive)') |
|
1053 | notice = _(' (inactive)') | |
1054 | if tag == repo.dirstate.branch(): |
|
1054 | if tag == repo.dirstate.branch(): | |
1055 | label = 'branches.current' |
|
1055 | label = 'branches.current' | |
1056 | rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag)) |
|
1056 | rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag)) | |
1057 | rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())), |
|
1057 | rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())), | |
1058 | 'log.changeset changeset.%s' % ctx.phasestr()) |
|
1058 | 'log.changeset changeset.%s' % ctx.phasestr()) | |
1059 | labeledtag = ui.label(tag, label) |
|
1059 | labeledtag = ui.label(tag, label) | |
1060 | if ui.quiet: |
|
1060 | if ui.quiet: | |
1061 | ui.write("%s\n" % labeledtag) |
|
1061 | ui.write("%s\n" % labeledtag) | |
1062 | else: |
|
1062 | else: | |
1063 | ui.write("%s %s%s\n" % (labeledtag, rev, notice)) |
|
1063 | ui.write("%s %s%s\n" % (labeledtag, rev, notice)) | |
1064 |
|
1064 | |||
1065 | @command('bundle', |
|
1065 | @command('bundle', | |
1066 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1066 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1067 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1067 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1068 | _('REV')), |
|
1068 | _('REV')), | |
1069 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1069 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1070 | _('BRANCH')), |
|
1070 | _('BRANCH')), | |
1071 | ('', 'base', [], |
|
1071 | ('', 'base', [], | |
1072 | _('a base changeset assumed to be available at the destination'), |
|
1072 | _('a base changeset assumed to be available at the destination'), | |
1073 | _('REV')), |
|
1073 | _('REV')), | |
1074 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1074 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1075 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1075 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1076 | ] + remoteopts, |
|
1076 | ] + remoteopts, | |
1077 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1077 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1078 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1078 | def bundle(ui, repo, fname, dest=None, **opts): | |
1079 | """create a changegroup file |
|
1079 | """create a changegroup file | |
1080 |
|
1080 | |||
1081 | Generate a compressed changegroup file collecting changesets not |
|
1081 | Generate a compressed changegroup file collecting changesets not | |
1082 | known to be in another repository. |
|
1082 | known to be in another repository. | |
1083 |
|
1083 | |||
1084 | If you omit the destination repository, then hg assumes the |
|
1084 | If you omit the destination repository, then hg assumes the | |
1085 | destination will have all the nodes you specify with --base |
|
1085 | destination will have all the nodes you specify with --base | |
1086 | parameters. To create a bundle containing all changesets, use |
|
1086 | parameters. To create a bundle containing all changesets, use | |
1087 | -a/--all (or --base null). |
|
1087 | -a/--all (or --base null). | |
1088 |
|
1088 | |||
1089 | You can change compression method with the -t/--type option. |
|
1089 | You can change compression method with the -t/--type option. | |
1090 | The available compression methods are: none, bzip2, and |
|
1090 | The available compression methods are: none, bzip2, and | |
1091 | gzip (by default, bundles are compressed using bzip2). |
|
1091 | gzip (by default, bundles are compressed using bzip2). | |
1092 |
|
1092 | |||
1093 | The bundle file can then be transferred using conventional means |
|
1093 | The bundle file can then be transferred using conventional means | |
1094 | and applied to another repository with the unbundle or pull |
|
1094 | and applied to another repository with the unbundle or pull | |
1095 | command. This is useful when direct push and pull are not |
|
1095 | command. This is useful when direct push and pull are not | |
1096 | available or when exporting an entire repository is undesirable. |
|
1096 | available or when exporting an entire repository is undesirable. | |
1097 |
|
1097 | |||
1098 | Applying bundles preserves all changeset contents including |
|
1098 | Applying bundles preserves all changeset contents including | |
1099 | permissions, copy/rename information, and revision history. |
|
1099 | permissions, copy/rename information, and revision history. | |
1100 |
|
1100 | |||
1101 | Returns 0 on success, 1 if no changes found. |
|
1101 | Returns 0 on success, 1 if no changes found. | |
1102 | """ |
|
1102 | """ | |
1103 | revs = None |
|
1103 | revs = None | |
1104 | if 'rev' in opts: |
|
1104 | if 'rev' in opts: | |
1105 | revs = scmutil.revrange(repo, opts['rev']) |
|
1105 | revs = scmutil.revrange(repo, opts['rev']) | |
1106 |
|
1106 | |||
1107 | bundletype = opts.get('type', 'bzip2').lower() |
|
1107 | bundletype = opts.get('type', 'bzip2').lower() | |
1108 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1108 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} | |
1109 | bundletype = btypes.get(bundletype) |
|
1109 | bundletype = btypes.get(bundletype) | |
1110 | if bundletype not in changegroup.bundletypes: |
|
1110 | if bundletype not in changegroup.bundletypes: | |
1111 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1111 | raise util.Abort(_('unknown bundle type specified with --type')) | |
1112 |
|
1112 | |||
1113 | if opts.get('all'): |
|
1113 | if opts.get('all'): | |
1114 | base = ['null'] |
|
1114 | base = ['null'] | |
1115 | else: |
|
1115 | else: | |
1116 | base = scmutil.revrange(repo, opts.get('base')) |
|
1116 | base = scmutil.revrange(repo, opts.get('base')) | |
1117 | # TODO: get desired bundlecaps from command line. |
|
1117 | # TODO: get desired bundlecaps from command line. | |
1118 | bundlecaps = None |
|
1118 | bundlecaps = None | |
1119 | if base: |
|
1119 | if base: | |
1120 | if dest: |
|
1120 | if dest: | |
1121 | raise util.Abort(_("--base is incompatible with specifying " |
|
1121 | raise util.Abort(_("--base is incompatible with specifying " | |
1122 | "a destination")) |
|
1122 | "a destination")) | |
1123 | common = [repo.lookup(rev) for rev in base] |
|
1123 | common = [repo.lookup(rev) for rev in base] | |
1124 | heads = revs and map(repo.lookup, revs) or revs |
|
1124 | heads = revs and map(repo.lookup, revs) or revs | |
1125 | cg = repo.getbundle('bundle', heads=heads, common=common, |
|
1125 | cg = repo.getbundle('bundle', heads=heads, common=common, | |
1126 | bundlecaps=bundlecaps) |
|
1126 | bundlecaps=bundlecaps) | |
1127 | outgoing = None |
|
1127 | outgoing = None | |
1128 | else: |
|
1128 | else: | |
1129 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1129 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1130 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1130 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1131 | other = hg.peer(repo, opts, dest) |
|
1131 | other = hg.peer(repo, opts, dest) | |
1132 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1132 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1133 | heads = revs and map(repo.lookup, revs) or revs |
|
1133 | heads = revs and map(repo.lookup, revs) or revs | |
1134 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1134 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1135 | onlyheads=heads, |
|
1135 | onlyheads=heads, | |
1136 | force=opts.get('force'), |
|
1136 | force=opts.get('force'), | |
1137 | portable=True) |
|
1137 | portable=True) | |
1138 | cg = repo.getlocalbundle('bundle', outgoing, bundlecaps) |
|
1138 | cg = repo.getlocalbundle('bundle', outgoing, bundlecaps) | |
1139 | if not cg: |
|
1139 | if not cg: | |
1140 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) |
|
1140 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) | |
1141 | return 1 |
|
1141 | return 1 | |
1142 |
|
1142 | |||
1143 | changegroup.writebundle(cg, fname, bundletype) |
|
1143 | changegroup.writebundle(cg, fname, bundletype) | |
1144 |
|
1144 | |||
1145 | @command('cat', |
|
1145 | @command('cat', | |
1146 | [('o', 'output', '', |
|
1146 | [('o', 'output', '', | |
1147 | _('print output to file with formatted name'), _('FORMAT')), |
|
1147 | _('print output to file with formatted name'), _('FORMAT')), | |
1148 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1148 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1149 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1149 | ('', 'decode', None, _('apply any matching decode filter')), | |
1150 | ] + walkopts, |
|
1150 | ] + walkopts, | |
1151 | _('[OPTION]... FILE...')) |
|
1151 | _('[OPTION]... FILE...')) | |
1152 | def cat(ui, repo, file1, *pats, **opts): |
|
1152 | def cat(ui, repo, file1, *pats, **opts): | |
1153 | """output the current or given revision of files |
|
1153 | """output the current or given revision of files | |
1154 |
|
1154 | |||
1155 | Print the specified files as they were at the given revision. If |
|
1155 | Print the specified files as they were at the given revision. If | |
1156 | no revision is given, the parent of the working directory is used. |
|
1156 | no revision is given, the parent of the working directory is used. | |
1157 |
|
1157 | |||
1158 | Output may be to a file, in which case the name of the file is |
|
1158 | Output may be to a file, in which case the name of the file is | |
1159 | given using a format string. The formatting rules are the same as |
|
1159 | given using a format string. The formatting rules are the same as | |
1160 | for the export command, with the following additions: |
|
1160 | for the export command, with the following additions: | |
1161 |
|
1161 | |||
1162 | :``%s``: basename of file being printed |
|
1162 | :``%s``: basename of file being printed | |
1163 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1163 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1164 | :``%p``: root-relative path name of file being printed |
|
1164 | :``%p``: root-relative path name of file being printed | |
1165 |
|
1165 | |||
1166 | Returns 0 on success. |
|
1166 | Returns 0 on success. | |
1167 | """ |
|
1167 | """ | |
1168 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1168 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1169 | err = 1 |
|
1169 | err = 1 | |
1170 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1170 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1171 |
|
1171 | |||
1172 | def write(path): |
|
1172 | def write(path): | |
1173 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), |
|
1173 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), | |
1174 | pathname=path) |
|
1174 | pathname=path) | |
1175 | data = ctx[path].data() |
|
1175 | data = ctx[path].data() | |
1176 | if opts.get('decode'): |
|
1176 | if opts.get('decode'): | |
1177 | data = repo.wwritedata(path, data) |
|
1177 | data = repo.wwritedata(path, data) | |
1178 | fp.write(data) |
|
1178 | fp.write(data) | |
1179 | fp.close() |
|
1179 | fp.close() | |
1180 |
|
1180 | |||
1181 | # Automation often uses hg cat on single files, so special case it |
|
1181 | # Automation often uses hg cat on single files, so special case it | |
1182 | # for performance to avoid the cost of parsing the manifest. |
|
1182 | # for performance to avoid the cost of parsing the manifest. | |
1183 | if len(m.files()) == 1 and not m.anypats(): |
|
1183 | if len(m.files()) == 1 and not m.anypats(): | |
1184 | file = m.files()[0] |
|
1184 | file = m.files()[0] | |
1185 | mf = repo.manifest |
|
1185 | mf = repo.manifest | |
1186 | mfnode = ctx._changeset[0] |
|
1186 | mfnode = ctx._changeset[0] | |
1187 | if mf.find(mfnode, file)[0]: |
|
1187 | if mf.find(mfnode, file)[0]: | |
1188 | write(file) |
|
1188 | write(file) | |
1189 | return 0 |
|
1189 | return 0 | |
1190 |
|
1190 | |||
1191 | for abs in ctx.walk(m): |
|
1191 | for abs in ctx.walk(m): | |
1192 | write(abs) |
|
1192 | write(abs) | |
1193 | err = 0 |
|
1193 | err = 0 | |
1194 | return err |
|
1194 | return err | |
1195 |
|
1195 | |||
1196 | @command('^clone', |
|
1196 | @command('^clone', | |
1197 | [('U', 'noupdate', None, |
|
1197 | [('U', 'noupdate', None, | |
1198 | _('the clone will include an empty working copy (only a repository)')), |
|
1198 | _('the clone will include an empty working copy (only a repository)')), | |
1199 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), |
|
1199 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), | |
1200 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1200 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1201 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1201 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
1202 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1202 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1203 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), |
|
1203 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), | |
1204 | ] + remoteopts, |
|
1204 | ] + remoteopts, | |
1205 | _('[OPTION]... SOURCE [DEST]')) |
|
1205 | _('[OPTION]... SOURCE [DEST]')) | |
1206 | def clone(ui, source, dest=None, **opts): |
|
1206 | def clone(ui, source, dest=None, **opts): | |
1207 | """make a copy of an existing repository |
|
1207 | """make a copy of an existing repository | |
1208 |
|
1208 | |||
1209 | Create a copy of an existing repository in a new directory. |
|
1209 | Create a copy of an existing repository in a new directory. | |
1210 |
|
1210 | |||
1211 | If no destination directory name is specified, it defaults to the |
|
1211 | If no destination directory name is specified, it defaults to the | |
1212 | basename of the source. |
|
1212 | basename of the source. | |
1213 |
|
1213 | |||
1214 | The location of the source is added to the new repository's |
|
1214 | The location of the source is added to the new repository's | |
1215 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1215 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1216 |
|
1216 | |||
1217 | Only local paths and ``ssh://`` URLs are supported as |
|
1217 | Only local paths and ``ssh://`` URLs are supported as | |
1218 | destinations. For ``ssh://`` destinations, no working directory or |
|
1218 | destinations. For ``ssh://`` destinations, no working directory or | |
1219 | ``.hg/hgrc`` will be created on the remote side. |
|
1219 | ``.hg/hgrc`` will be created on the remote side. | |
1220 |
|
1220 | |||
1221 | To pull only a subset of changesets, specify one or more revisions |
|
1221 | To pull only a subset of changesets, specify one or more revisions | |
1222 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1222 | identifiers with -r/--rev or branches with -b/--branch. The | |
1223 | resulting clone will contain only the specified changesets and |
|
1223 | resulting clone will contain only the specified changesets and | |
1224 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1224 | their ancestors. These options (or 'clone src#rev dest') imply | |
1225 | --pull, even for local source repositories. Note that specifying a |
|
1225 | --pull, even for local source repositories. Note that specifying a | |
1226 | tag will include the tagged changeset but not the changeset |
|
1226 | tag will include the tagged changeset but not the changeset | |
1227 | containing the tag. |
|
1227 | containing the tag. | |
1228 |
|
1228 | |||
1229 | If the source repository has a bookmark called '@' set, that |
|
1229 | If the source repository has a bookmark called '@' set, that | |
1230 | revision will be checked out in the new repository by default. |
|
1230 | revision will be checked out in the new repository by default. | |
1231 |
|
1231 | |||
1232 | To check out a particular version, use -u/--update, or |
|
1232 | To check out a particular version, use -u/--update, or | |
1233 | -U/--noupdate to create a clone with no working directory. |
|
1233 | -U/--noupdate to create a clone with no working directory. | |
1234 |
|
1234 | |||
1235 | .. container:: verbose |
|
1235 | .. container:: verbose | |
1236 |
|
1236 | |||
1237 | For efficiency, hardlinks are used for cloning whenever the |
|
1237 | For efficiency, hardlinks are used for cloning whenever the | |
1238 | source and destination are on the same filesystem (note this |
|
1238 | source and destination are on the same filesystem (note this | |
1239 | applies only to the repository data, not to the working |
|
1239 | applies only to the repository data, not to the working | |
1240 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1240 | directory). Some filesystems, such as AFS, implement hardlinking | |
1241 | incorrectly, but do not report errors. In these cases, use the |
|
1241 | incorrectly, but do not report errors. In these cases, use the | |
1242 | --pull option to avoid hardlinking. |
|
1242 | --pull option to avoid hardlinking. | |
1243 |
|
1243 | |||
1244 | In some cases, you can clone repositories and the working |
|
1244 | In some cases, you can clone repositories and the working | |
1245 | directory using full hardlinks with :: |
|
1245 | directory using full hardlinks with :: | |
1246 |
|
1246 | |||
1247 | $ cp -al REPO REPOCLONE |
|
1247 | $ cp -al REPO REPOCLONE | |
1248 |
|
1248 | |||
1249 | This is the fastest way to clone, but it is not always safe. The |
|
1249 | This is the fastest way to clone, but it is not always safe. The | |
1250 | operation is not atomic (making sure REPO is not modified during |
|
1250 | operation is not atomic (making sure REPO is not modified during | |
1251 | the operation is up to you) and you have to make sure your |
|
1251 | the operation is up to you) and you have to make sure your | |
1252 | editor breaks hardlinks (Emacs and most Linux Kernel tools do |
|
1252 | editor breaks hardlinks (Emacs and most Linux Kernel tools do | |
1253 | so). Also, this is not compatible with certain extensions that |
|
1253 | so). Also, this is not compatible with certain extensions that | |
1254 | place their metadata under the .hg directory, such as mq. |
|
1254 | place their metadata under the .hg directory, such as mq. | |
1255 |
|
1255 | |||
1256 | Mercurial will update the working directory to the first applicable |
|
1256 | Mercurial will update the working directory to the first applicable | |
1257 | revision from this list: |
|
1257 | revision from this list: | |
1258 |
|
1258 | |||
1259 | a) null if -U or the source repository has no changesets |
|
1259 | a) null if -U or the source repository has no changesets | |
1260 | b) if -u . and the source repository is local, the first parent of |
|
1260 | b) if -u . and the source repository is local, the first parent of | |
1261 | the source repository's working directory |
|
1261 | the source repository's working directory | |
1262 | c) the changeset specified with -u (if a branch name, this means the |
|
1262 | c) the changeset specified with -u (if a branch name, this means the | |
1263 | latest head of that branch) |
|
1263 | latest head of that branch) | |
1264 | d) the changeset specified with -r |
|
1264 | d) the changeset specified with -r | |
1265 | e) the tipmost head specified with -b |
|
1265 | e) the tipmost head specified with -b | |
1266 | f) the tipmost head specified with the url#branch source syntax |
|
1266 | f) the tipmost head specified with the url#branch source syntax | |
1267 | g) the revision marked with the '@' bookmark, if present |
|
1267 | g) the revision marked with the '@' bookmark, if present | |
1268 | h) the tipmost head of the default branch |
|
1268 | h) the tipmost head of the default branch | |
1269 | i) tip |
|
1269 | i) tip | |
1270 |
|
1270 | |||
1271 | Examples: |
|
1271 | Examples: | |
1272 |
|
1272 | |||
1273 | - clone a remote repository to a new directory named hg/:: |
|
1273 | - clone a remote repository to a new directory named hg/:: | |
1274 |
|
1274 | |||
1275 | hg clone http://selenic.com/hg |
|
1275 | hg clone http://selenic.com/hg | |
1276 |
|
1276 | |||
1277 | - create a lightweight local clone:: |
|
1277 | - create a lightweight local clone:: | |
1278 |
|
1278 | |||
1279 | hg clone project/ project-feature/ |
|
1279 | hg clone project/ project-feature/ | |
1280 |
|
1280 | |||
1281 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1281 | - clone from an absolute path on an ssh server (note double-slash):: | |
1282 |
|
1282 | |||
1283 | hg clone ssh://user@server//home/projects/alpha/ |
|
1283 | hg clone ssh://user@server//home/projects/alpha/ | |
1284 |
|
1284 | |||
1285 | - do a high-speed clone over a LAN while checking out a |
|
1285 | - do a high-speed clone over a LAN while checking out a | |
1286 | specified version:: |
|
1286 | specified version:: | |
1287 |
|
1287 | |||
1288 | hg clone --uncompressed http://server/repo -u 1.5 |
|
1288 | hg clone --uncompressed http://server/repo -u 1.5 | |
1289 |
|
1289 | |||
1290 | - create a repository without changesets after a particular revision:: |
|
1290 | - create a repository without changesets after a particular revision:: | |
1291 |
|
1291 | |||
1292 | hg clone -r 04e544 experimental/ good/ |
|
1292 | hg clone -r 04e544 experimental/ good/ | |
1293 |
|
1293 | |||
1294 | - clone (and track) a particular named branch:: |
|
1294 | - clone (and track) a particular named branch:: | |
1295 |
|
1295 | |||
1296 | hg clone http://selenic.com/hg#stable |
|
1296 | hg clone http://selenic.com/hg#stable | |
1297 |
|
1297 | |||
1298 | See :hg:`help urls` for details on specifying URLs. |
|
1298 | See :hg:`help urls` for details on specifying URLs. | |
1299 |
|
1299 | |||
1300 | Returns 0 on success. |
|
1300 | Returns 0 on success. | |
1301 | """ |
|
1301 | """ | |
1302 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1302 | if opts.get('noupdate') and opts.get('updaterev'): | |
1303 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1303 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1304 |
|
1304 | |||
1305 | r = hg.clone(ui, opts, source, dest, |
|
1305 | r = hg.clone(ui, opts, source, dest, | |
1306 | pull=opts.get('pull'), |
|
1306 | pull=opts.get('pull'), | |
1307 | stream=opts.get('uncompressed'), |
|
1307 | stream=opts.get('uncompressed'), | |
1308 | rev=opts.get('rev'), |
|
1308 | rev=opts.get('rev'), | |
1309 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1309 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1310 | branch=opts.get('branch')) |
|
1310 | branch=opts.get('branch')) | |
1311 |
|
1311 | |||
1312 | return r is None |
|
1312 | return r is None | |
1313 |
|
1313 | |||
1314 | @command('^commit|ci', |
|
1314 | @command('^commit|ci', | |
1315 | [('A', 'addremove', None, |
|
1315 | [('A', 'addremove', None, | |
1316 | _('mark new/missing files as added/removed before committing')), |
|
1316 | _('mark new/missing files as added/removed before committing')), | |
1317 | ('', 'close-branch', None, |
|
1317 | ('', 'close-branch', None, | |
1318 | _('mark a branch as closed, hiding it from the branch list')), |
|
1318 | _('mark a branch as closed, hiding it from the branch list')), | |
1319 | ('', 'amend', None, _('amend the parent of the working dir')), |
|
1319 | ('', 'amend', None, _('amend the parent of the working dir')), | |
1320 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1320 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1321 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1321 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1322 | _('[OPTION]... [FILE]...')) |
|
1322 | _('[OPTION]... [FILE]...')) | |
1323 | def commit(ui, repo, *pats, **opts): |
|
1323 | def commit(ui, repo, *pats, **opts): | |
1324 | """commit the specified files or all outstanding changes |
|
1324 | """commit the specified files or all outstanding changes | |
1325 |
|
1325 | |||
1326 | Commit changes to the given files into the repository. Unlike a |
|
1326 | Commit changes to the given files into the repository. Unlike a | |
1327 | centralized SCM, this operation is a local operation. See |
|
1327 | centralized SCM, this operation is a local operation. See | |
1328 | :hg:`push` for a way to actively distribute your changes. |
|
1328 | :hg:`push` for a way to actively distribute your changes. | |
1329 |
|
1329 | |||
1330 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1330 | If a list of files is omitted, all changes reported by :hg:`status` | |
1331 | will be committed. |
|
1331 | will be committed. | |
1332 |
|
1332 | |||
1333 | If you are committing the result of a merge, do not provide any |
|
1333 | If you are committing the result of a merge, do not provide any | |
1334 | filenames or -I/-X filters. |
|
1334 | filenames or -I/-X filters. | |
1335 |
|
1335 | |||
1336 | If no commit message is specified, Mercurial starts your |
|
1336 | If no commit message is specified, Mercurial starts your | |
1337 | configured editor where you can enter a message. In case your |
|
1337 | configured editor where you can enter a message. In case your | |
1338 | commit fails, you will find a backup of your message in |
|
1338 | commit fails, you will find a backup of your message in | |
1339 | ``.hg/last-message.txt``. |
|
1339 | ``.hg/last-message.txt``. | |
1340 |
|
1340 | |||
1341 | The --amend flag can be used to amend the parent of the |
|
1341 | The --amend flag can be used to amend the parent of the | |
1342 | working directory with a new commit that contains the changes |
|
1342 | working directory with a new commit that contains the changes | |
1343 | in the parent in addition to those currently reported by :hg:`status`, |
|
1343 | in the parent in addition to those currently reported by :hg:`status`, | |
1344 | if there are any. The old commit is stored in a backup bundle in |
|
1344 | if there are any. The old commit is stored in a backup bundle in | |
1345 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1345 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1346 | on how to restore it). |
|
1346 | on how to restore it). | |
1347 |
|
1347 | |||
1348 | Message, user and date are taken from the amended commit unless |
|
1348 | Message, user and date are taken from the amended commit unless | |
1349 | specified. When a message isn't specified on the command line, |
|
1349 | specified. When a message isn't specified on the command line, | |
1350 | the editor will open with the message of the amended commit. |
|
1350 | the editor will open with the message of the amended commit. | |
1351 |
|
1351 | |||
1352 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1352 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1353 | or changesets that have children. |
|
1353 | or changesets that have children. | |
1354 |
|
1354 | |||
1355 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1355 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1356 |
|
1356 | |||
1357 | Returns 0 on success, 1 if nothing changed. |
|
1357 | Returns 0 on success, 1 if nothing changed. | |
1358 | """ |
|
1358 | """ | |
1359 | if opts.get('subrepos'): |
|
1359 | if opts.get('subrepos'): | |
1360 | if opts.get('amend'): |
|
1360 | if opts.get('amend'): | |
1361 | raise util.Abort(_('cannot amend with --subrepos')) |
|
1361 | raise util.Abort(_('cannot amend with --subrepos')) | |
1362 | # Let --subrepos on the command line override config setting. |
|
1362 | # Let --subrepos on the command line override config setting. | |
1363 | ui.setconfig('ui', 'commitsubrepos', True) |
|
1363 | ui.setconfig('ui', 'commitsubrepos', True) | |
1364 |
|
1364 | |||
1365 | # Save this for restoring it later |
|
1365 | # Save this for restoring it later | |
1366 | oldcommitphase = ui.config('phases', 'new-commit') |
|
1366 | oldcommitphase = ui.config('phases', 'new-commit') | |
1367 |
|
1367 | |||
1368 | cmdutil.checkunfinished(repo, commit=True) |
|
1368 | cmdutil.checkunfinished(repo, commit=True) | |
1369 |
|
1369 | |||
1370 | branch = repo[None].branch() |
|
1370 | branch = repo[None].branch() | |
1371 | bheads = repo.branchheads(branch) |
|
1371 | bheads = repo.branchheads(branch) | |
1372 |
|
1372 | |||
1373 | extra = {} |
|
1373 | extra = {} | |
1374 | if opts.get('close_branch'): |
|
1374 | if opts.get('close_branch'): | |
1375 | extra['close'] = 1 |
|
1375 | extra['close'] = 1 | |
1376 |
|
1376 | |||
1377 | if not bheads: |
|
1377 | if not bheads: | |
1378 | raise util.Abort(_('can only close branch heads')) |
|
1378 | raise util.Abort(_('can only close branch heads')) | |
1379 | elif opts.get('amend'): |
|
1379 | elif opts.get('amend'): | |
1380 | if repo.parents()[0].p1().branch() != branch and \ |
|
1380 | if repo.parents()[0].p1().branch() != branch and \ | |
1381 | repo.parents()[0].p2().branch() != branch: |
|
1381 | repo.parents()[0].p2().branch() != branch: | |
1382 | raise util.Abort(_('can only close branch heads')) |
|
1382 | raise util.Abort(_('can only close branch heads')) | |
1383 |
|
1383 | |||
1384 | if opts.get('amend'): |
|
1384 | if opts.get('amend'): | |
1385 | if ui.configbool('ui', 'commitsubrepos'): |
|
1385 | if ui.configbool('ui', 'commitsubrepos'): | |
1386 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1386 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1387 |
|
1387 | |||
1388 | old = repo['.'] |
|
1388 | old = repo['.'] | |
1389 | if old.phase() == phases.public: |
|
1389 | if old.phase() == phases.public: | |
1390 | raise util.Abort(_('cannot amend public changesets')) |
|
1390 | raise util.Abort(_('cannot amend public changesets')) | |
1391 | if len(repo[None].parents()) > 1: |
|
1391 | if len(repo[None].parents()) > 1: | |
1392 | raise util.Abort(_('cannot amend while merging')) |
|
1392 | raise util.Abort(_('cannot amend while merging')) | |
1393 | if (not obsolete._enabled) and old.children(): |
|
1393 | if (not obsolete._enabled) and old.children(): | |
1394 | raise util.Abort(_('cannot amend changeset with children')) |
|
1394 | raise util.Abort(_('cannot amend changeset with children')) | |
1395 |
|
1395 | |||
1396 | e = cmdutil.commiteditor |
|
1396 | e = cmdutil.commiteditor | |
1397 | if opts.get('force_editor'): |
|
1397 | if opts.get('force_editor'): | |
1398 | e = cmdutil.commitforceeditor |
|
1398 | e = cmdutil.commitforceeditor | |
1399 |
|
1399 | |||
1400 | # commitfunc is used only for temporary amend commit by cmdutil.amend |
|
1400 | # commitfunc is used only for temporary amend commit by cmdutil.amend | |
1401 | def commitfunc(ui, repo, message, match, opts): |
|
1401 | def commitfunc(ui, repo, message, match, opts): | |
1402 | editor = e |
|
1402 | editor = e | |
1403 | # message contains text from -m or -l, if it's empty, |
|
1403 | # message contains text from -m or -l, if it's empty, | |
1404 | # open the editor with the old message |
|
1404 | # open the editor with the old message | |
1405 | if not message: |
|
1405 | if not message: | |
1406 | message = old.description() |
|
1406 | message = old.description() | |
1407 | editor = cmdutil.commitforceeditor |
|
1407 | editor = cmdutil.commitforceeditor | |
1408 | return repo.commit(message, |
|
1408 | return repo.commit(message, | |
1409 | opts.get('user') or old.user(), |
|
1409 | opts.get('user') or old.user(), | |
1410 | opts.get('date') or old.date(), |
|
1410 | opts.get('date') or old.date(), | |
1411 | match, |
|
1411 | match, | |
1412 | editor=editor, |
|
1412 | editor=editor, | |
1413 | extra=extra) |
|
1413 | extra=extra) | |
1414 |
|
1414 | |||
1415 | current = repo._bookmarkcurrent |
|
1415 | current = repo._bookmarkcurrent | |
1416 | marks = old.bookmarks() |
|
1416 | marks = old.bookmarks() | |
1417 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) |
|
1417 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) | |
1418 | if node == old.node(): |
|
1418 | if node == old.node(): | |
1419 | ui.status(_("nothing changed\n")) |
|
1419 | ui.status(_("nothing changed\n")) | |
1420 | return 1 |
|
1420 | return 1 | |
1421 | elif marks: |
|
1421 | elif marks: | |
1422 | ui.debug('moving bookmarks %r from %s to %s\n' % |
|
1422 | ui.debug('moving bookmarks %r from %s to %s\n' % | |
1423 | (marks, old.hex(), hex(node))) |
|
1423 | (marks, old.hex(), hex(node))) | |
1424 | newmarks = repo._bookmarks |
|
1424 | newmarks = repo._bookmarks | |
1425 | for bm in marks: |
|
1425 | for bm in marks: | |
1426 | newmarks[bm] = node |
|
1426 | newmarks[bm] = node | |
1427 | if bm == current: |
|
1427 | if bm == current: | |
1428 | bookmarks.setcurrent(repo, bm) |
|
1428 | bookmarks.setcurrent(repo, bm) | |
1429 | newmarks.write() |
|
1429 | newmarks.write() | |
1430 | else: |
|
1430 | else: | |
1431 | e = cmdutil.commiteditor |
|
1431 | e = cmdutil.commiteditor | |
1432 | if opts.get('force_editor'): |
|
1432 | if opts.get('force_editor'): | |
1433 | e = cmdutil.commitforceeditor |
|
1433 | e = cmdutil.commitforceeditor | |
1434 |
|
1434 | |||
1435 | def commitfunc(ui, repo, message, match, opts): |
|
1435 | def commitfunc(ui, repo, message, match, opts): | |
1436 | try: |
|
1436 | try: | |
1437 | if opts.get('secret'): |
|
1437 | if opts.get('secret'): | |
1438 | ui.setconfig('phases', 'new-commit', 'secret') |
|
1438 | ui.setconfig('phases', 'new-commit', 'secret') | |
|
1439 | # Propagate to subrepos | |||
|
1440 | repo.baseui.setconfig('phases', 'new-commit', 'secret') | |||
1439 |
|
1441 | |||
1440 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1442 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
1441 | match, editor=e, extra=extra) |
|
1443 | match, editor=e, extra=extra) | |
1442 | finally: |
|
1444 | finally: | |
1443 | ui.setconfig('phases', 'new-commit', oldcommitphase) |
|
1445 | ui.setconfig('phases', 'new-commit', oldcommitphase) | |
|
1446 | repo.baseui.setconfig('phases', 'new-commit', oldcommitphase) | |||
1444 |
|
1447 | |||
1445 |
|
1448 | |||
1446 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1449 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1447 |
|
1450 | |||
1448 | if not node: |
|
1451 | if not node: | |
1449 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
|
1452 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) | |
1450 | if stat[3]: |
|
1453 | if stat[3]: | |
1451 | ui.status(_("nothing changed (%d missing files, see " |
|
1454 | ui.status(_("nothing changed (%d missing files, see " | |
1452 | "'hg status')\n") % len(stat[3])) |
|
1455 | "'hg status')\n") % len(stat[3])) | |
1453 | else: |
|
1456 | else: | |
1454 | ui.status(_("nothing changed\n")) |
|
1457 | ui.status(_("nothing changed\n")) | |
1455 | return 1 |
|
1458 | return 1 | |
1456 |
|
1459 | |||
1457 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1460 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1458 |
|
1461 | |||
1459 | @command('copy|cp', |
|
1462 | @command('copy|cp', | |
1460 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1463 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1461 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1464 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1462 | ] + walkopts + dryrunopts, |
|
1465 | ] + walkopts + dryrunopts, | |
1463 | _('[OPTION]... [SOURCE]... DEST')) |
|
1466 | _('[OPTION]... [SOURCE]... DEST')) | |
1464 | def copy(ui, repo, *pats, **opts): |
|
1467 | def copy(ui, repo, *pats, **opts): | |
1465 | """mark files as copied for the next commit |
|
1468 | """mark files as copied for the next commit | |
1466 |
|
1469 | |||
1467 | Mark dest as having copies of source files. If dest is a |
|
1470 | Mark dest as having copies of source files. If dest is a | |
1468 | directory, copies are put in that directory. If dest is a file, |
|
1471 | directory, copies are put in that directory. If dest is a file, | |
1469 | the source must be a single file. |
|
1472 | the source must be a single file. | |
1470 |
|
1473 | |||
1471 | By default, this command copies the contents of files as they |
|
1474 | By default, this command copies the contents of files as they | |
1472 | exist in the working directory. If invoked with -A/--after, the |
|
1475 | exist in the working directory. If invoked with -A/--after, the | |
1473 | operation is recorded, but no copying is performed. |
|
1476 | operation is recorded, but no copying is performed. | |
1474 |
|
1477 | |||
1475 | This command takes effect with the next commit. To undo a copy |
|
1478 | This command takes effect with the next commit. To undo a copy | |
1476 | before that, see :hg:`revert`. |
|
1479 | before that, see :hg:`revert`. | |
1477 |
|
1480 | |||
1478 | Returns 0 on success, 1 if errors are encountered. |
|
1481 | Returns 0 on success, 1 if errors are encountered. | |
1479 | """ |
|
1482 | """ | |
1480 | wlock = repo.wlock(False) |
|
1483 | wlock = repo.wlock(False) | |
1481 | try: |
|
1484 | try: | |
1482 | return cmdutil.copy(ui, repo, pats, opts) |
|
1485 | return cmdutil.copy(ui, repo, pats, opts) | |
1483 | finally: |
|
1486 | finally: | |
1484 | wlock.release() |
|
1487 | wlock.release() | |
1485 |
|
1488 | |||
1486 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) |
|
1489 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) | |
1487 | def debugancestor(ui, repo, *args): |
|
1490 | def debugancestor(ui, repo, *args): | |
1488 | """find the ancestor revision of two revisions in a given index""" |
|
1491 | """find the ancestor revision of two revisions in a given index""" | |
1489 | if len(args) == 3: |
|
1492 | if len(args) == 3: | |
1490 | index, rev1, rev2 = args |
|
1493 | index, rev1, rev2 = args | |
1491 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) |
|
1494 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) | |
1492 | lookup = r.lookup |
|
1495 | lookup = r.lookup | |
1493 | elif len(args) == 2: |
|
1496 | elif len(args) == 2: | |
1494 | if not repo: |
|
1497 | if not repo: | |
1495 | raise util.Abort(_("there is no Mercurial repository here " |
|
1498 | raise util.Abort(_("there is no Mercurial repository here " | |
1496 | "(.hg not found)")) |
|
1499 | "(.hg not found)")) | |
1497 | rev1, rev2 = args |
|
1500 | rev1, rev2 = args | |
1498 | r = repo.changelog |
|
1501 | r = repo.changelog | |
1499 | lookup = repo.lookup |
|
1502 | lookup = repo.lookup | |
1500 | else: |
|
1503 | else: | |
1501 | raise util.Abort(_('either two or three arguments required')) |
|
1504 | raise util.Abort(_('either two or three arguments required')) | |
1502 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
1505 | a = r.ancestor(lookup(rev1), lookup(rev2)) | |
1503 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
1506 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
1504 |
|
1507 | |||
1505 | @command('debugbuilddag', |
|
1508 | @command('debugbuilddag', | |
1506 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
1509 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), | |
1507 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
1510 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), | |
1508 | ('n', 'new-file', None, _('add new file at each rev'))], |
|
1511 | ('n', 'new-file', None, _('add new file at each rev'))], | |
1509 | _('[OPTION]... [TEXT]')) |
|
1512 | _('[OPTION]... [TEXT]')) | |
1510 | def debugbuilddag(ui, repo, text=None, |
|
1513 | def debugbuilddag(ui, repo, text=None, | |
1511 | mergeable_file=False, |
|
1514 | mergeable_file=False, | |
1512 | overwritten_file=False, |
|
1515 | overwritten_file=False, | |
1513 | new_file=False): |
|
1516 | new_file=False): | |
1514 | """builds a repo with a given DAG from scratch in the current empty repo |
|
1517 | """builds a repo with a given DAG from scratch in the current empty repo | |
1515 |
|
1518 | |||
1516 | The description of the DAG is read from stdin if not given on the |
|
1519 | The description of the DAG is read from stdin if not given on the | |
1517 | command line. |
|
1520 | command line. | |
1518 |
|
1521 | |||
1519 | Elements: |
|
1522 | Elements: | |
1520 |
|
1523 | |||
1521 | - "+n" is a linear run of n nodes based on the current default parent |
|
1524 | - "+n" is a linear run of n nodes based on the current default parent | |
1522 | - "." is a single node based on the current default parent |
|
1525 | - "." is a single node based on the current default parent | |
1523 | - "$" resets the default parent to null (implied at the start); |
|
1526 | - "$" resets the default parent to null (implied at the start); | |
1524 | otherwise the default parent is always the last node created |
|
1527 | otherwise the default parent is always the last node created | |
1525 | - "<p" sets the default parent to the backref p |
|
1528 | - "<p" sets the default parent to the backref p | |
1526 | - "*p" is a fork at parent p, which is a backref |
|
1529 | - "*p" is a fork at parent p, which is a backref | |
1527 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs |
|
1530 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs | |
1528 | - "/p2" is a merge of the preceding node and p2 |
|
1531 | - "/p2" is a merge of the preceding node and p2 | |
1529 | - ":tag" defines a local tag for the preceding node |
|
1532 | - ":tag" defines a local tag for the preceding node | |
1530 | - "@branch" sets the named branch for subsequent nodes |
|
1533 | - "@branch" sets the named branch for subsequent nodes | |
1531 | - "#...\\n" is a comment up to the end of the line |
|
1534 | - "#...\\n" is a comment up to the end of the line | |
1532 |
|
1535 | |||
1533 | Whitespace between the above elements is ignored. |
|
1536 | Whitespace between the above elements is ignored. | |
1534 |
|
1537 | |||
1535 | A backref is either |
|
1538 | A backref is either | |
1536 |
|
1539 | |||
1537 | - a number n, which references the node curr-n, where curr is the current |
|
1540 | - a number n, which references the node curr-n, where curr is the current | |
1538 | node, or |
|
1541 | node, or | |
1539 | - the name of a local tag you placed earlier using ":tag", or |
|
1542 | - the name of a local tag you placed earlier using ":tag", or | |
1540 | - empty to denote the default parent. |
|
1543 | - empty to denote the default parent. | |
1541 |
|
1544 | |||
1542 | All string valued-elements are either strictly alphanumeric, or must |
|
1545 | All string valued-elements are either strictly alphanumeric, or must | |
1543 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
1546 | be enclosed in double quotes ("..."), with "\\" as escape character. | |
1544 | """ |
|
1547 | """ | |
1545 |
|
1548 | |||
1546 | if text is None: |
|
1549 | if text is None: | |
1547 | ui.status(_("reading DAG from stdin\n")) |
|
1550 | ui.status(_("reading DAG from stdin\n")) | |
1548 | text = ui.fin.read() |
|
1551 | text = ui.fin.read() | |
1549 |
|
1552 | |||
1550 | cl = repo.changelog |
|
1553 | cl = repo.changelog | |
1551 | if len(cl) > 0: |
|
1554 | if len(cl) > 0: | |
1552 | raise util.Abort(_('repository is not empty')) |
|
1555 | raise util.Abort(_('repository is not empty')) | |
1553 |
|
1556 | |||
1554 | # determine number of revs in DAG |
|
1557 | # determine number of revs in DAG | |
1555 | total = 0 |
|
1558 | total = 0 | |
1556 | for type, data in dagparser.parsedag(text): |
|
1559 | for type, data in dagparser.parsedag(text): | |
1557 | if type == 'n': |
|
1560 | if type == 'n': | |
1558 | total += 1 |
|
1561 | total += 1 | |
1559 |
|
1562 | |||
1560 | if mergeable_file: |
|
1563 | if mergeable_file: | |
1561 | linesperrev = 2 |
|
1564 | linesperrev = 2 | |
1562 | # make a file with k lines per rev |
|
1565 | # make a file with k lines per rev | |
1563 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] |
|
1566 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] | |
1564 | initialmergedlines.append("") |
|
1567 | initialmergedlines.append("") | |
1565 |
|
1568 | |||
1566 | tags = [] |
|
1569 | tags = [] | |
1567 |
|
1570 | |||
1568 | lock = tr = None |
|
1571 | lock = tr = None | |
1569 | try: |
|
1572 | try: | |
1570 | lock = repo.lock() |
|
1573 | lock = repo.lock() | |
1571 | tr = repo.transaction("builddag") |
|
1574 | tr = repo.transaction("builddag") | |
1572 |
|
1575 | |||
1573 | at = -1 |
|
1576 | at = -1 | |
1574 | atbranch = 'default' |
|
1577 | atbranch = 'default' | |
1575 | nodeids = [] |
|
1578 | nodeids = [] | |
1576 | id = 0 |
|
1579 | id = 0 | |
1577 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1580 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1578 | for type, data in dagparser.parsedag(text): |
|
1581 | for type, data in dagparser.parsedag(text): | |
1579 | if type == 'n': |
|
1582 | if type == 'n': | |
1580 | ui.note(('node %s\n' % str(data))) |
|
1583 | ui.note(('node %s\n' % str(data))) | |
1581 | id, ps = data |
|
1584 | id, ps = data | |
1582 |
|
1585 | |||
1583 | files = [] |
|
1586 | files = [] | |
1584 | fctxs = {} |
|
1587 | fctxs = {} | |
1585 |
|
1588 | |||
1586 | p2 = None |
|
1589 | p2 = None | |
1587 | if mergeable_file: |
|
1590 | if mergeable_file: | |
1588 | fn = "mf" |
|
1591 | fn = "mf" | |
1589 | p1 = repo[ps[0]] |
|
1592 | p1 = repo[ps[0]] | |
1590 | if len(ps) > 1: |
|
1593 | if len(ps) > 1: | |
1591 | p2 = repo[ps[1]] |
|
1594 | p2 = repo[ps[1]] | |
1592 | pa = p1.ancestor(p2) |
|
1595 | pa = p1.ancestor(p2) | |
1593 | base, local, other = [x[fn].data() for x in (pa, p1, |
|
1596 | base, local, other = [x[fn].data() for x in (pa, p1, | |
1594 | p2)] |
|
1597 | p2)] | |
1595 | m3 = simplemerge.Merge3Text(base, local, other) |
|
1598 | m3 = simplemerge.Merge3Text(base, local, other) | |
1596 | ml = [l.strip() for l in m3.merge_lines()] |
|
1599 | ml = [l.strip() for l in m3.merge_lines()] | |
1597 | ml.append("") |
|
1600 | ml.append("") | |
1598 | elif at > 0: |
|
1601 | elif at > 0: | |
1599 | ml = p1[fn].data().split("\n") |
|
1602 | ml = p1[fn].data().split("\n") | |
1600 | else: |
|
1603 | else: | |
1601 | ml = initialmergedlines |
|
1604 | ml = initialmergedlines | |
1602 | ml[id * linesperrev] += " r%i" % id |
|
1605 | ml[id * linesperrev] += " r%i" % id | |
1603 | mergedtext = "\n".join(ml) |
|
1606 | mergedtext = "\n".join(ml) | |
1604 | files.append(fn) |
|
1607 | files.append(fn) | |
1605 | fctxs[fn] = context.memfilectx(fn, mergedtext) |
|
1608 | fctxs[fn] = context.memfilectx(fn, mergedtext) | |
1606 |
|
1609 | |||
1607 | if overwritten_file: |
|
1610 | if overwritten_file: | |
1608 | fn = "of" |
|
1611 | fn = "of" | |
1609 | files.append(fn) |
|
1612 | files.append(fn) | |
1610 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1613 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1611 |
|
1614 | |||
1612 | if new_file: |
|
1615 | if new_file: | |
1613 | fn = "nf%i" % id |
|
1616 | fn = "nf%i" % id | |
1614 | files.append(fn) |
|
1617 | files.append(fn) | |
1615 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1618 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1616 | if len(ps) > 1: |
|
1619 | if len(ps) > 1: | |
1617 | if not p2: |
|
1620 | if not p2: | |
1618 | p2 = repo[ps[1]] |
|
1621 | p2 = repo[ps[1]] | |
1619 | for fn in p2: |
|
1622 | for fn in p2: | |
1620 | if fn.startswith("nf"): |
|
1623 | if fn.startswith("nf"): | |
1621 | files.append(fn) |
|
1624 | files.append(fn) | |
1622 | fctxs[fn] = p2[fn] |
|
1625 | fctxs[fn] = p2[fn] | |
1623 |
|
1626 | |||
1624 | def fctxfn(repo, cx, path): |
|
1627 | def fctxfn(repo, cx, path): | |
1625 | return fctxs.get(path) |
|
1628 | return fctxs.get(path) | |
1626 |
|
1629 | |||
1627 | if len(ps) == 0 or ps[0] < 0: |
|
1630 | if len(ps) == 0 or ps[0] < 0: | |
1628 | pars = [None, None] |
|
1631 | pars = [None, None] | |
1629 | elif len(ps) == 1: |
|
1632 | elif len(ps) == 1: | |
1630 | pars = [nodeids[ps[0]], None] |
|
1633 | pars = [nodeids[ps[0]], None] | |
1631 | else: |
|
1634 | else: | |
1632 | pars = [nodeids[p] for p in ps] |
|
1635 | pars = [nodeids[p] for p in ps] | |
1633 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, |
|
1636 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, | |
1634 | date=(id, 0), |
|
1637 | date=(id, 0), | |
1635 | user="debugbuilddag", |
|
1638 | user="debugbuilddag", | |
1636 | extra={'branch': atbranch}) |
|
1639 | extra={'branch': atbranch}) | |
1637 | nodeid = repo.commitctx(cx) |
|
1640 | nodeid = repo.commitctx(cx) | |
1638 | nodeids.append(nodeid) |
|
1641 | nodeids.append(nodeid) | |
1639 | at = id |
|
1642 | at = id | |
1640 | elif type == 'l': |
|
1643 | elif type == 'l': | |
1641 | id, name = data |
|
1644 | id, name = data | |
1642 | ui.note(('tag %s\n' % name)) |
|
1645 | ui.note(('tag %s\n' % name)) | |
1643 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) |
|
1646 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) | |
1644 | elif type == 'a': |
|
1647 | elif type == 'a': | |
1645 | ui.note(('branch %s\n' % data)) |
|
1648 | ui.note(('branch %s\n' % data)) | |
1646 | atbranch = data |
|
1649 | atbranch = data | |
1647 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1650 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1648 | tr.close() |
|
1651 | tr.close() | |
1649 |
|
1652 | |||
1650 | if tags: |
|
1653 | if tags: | |
1651 | repo.opener.write("localtags", "".join(tags)) |
|
1654 | repo.opener.write("localtags", "".join(tags)) | |
1652 | finally: |
|
1655 | finally: | |
1653 | ui.progress(_('building'), None) |
|
1656 | ui.progress(_('building'), None) | |
1654 | release(tr, lock) |
|
1657 | release(tr, lock) | |
1655 |
|
1658 | |||
1656 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) |
|
1659 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) | |
1657 | def debugbundle(ui, bundlepath, all=None, **opts): |
|
1660 | def debugbundle(ui, bundlepath, all=None, **opts): | |
1658 | """lists the contents of a bundle""" |
|
1661 | """lists the contents of a bundle""" | |
1659 | f = hg.openpath(ui, bundlepath) |
|
1662 | f = hg.openpath(ui, bundlepath) | |
1660 | try: |
|
1663 | try: | |
1661 | gen = changegroup.readbundle(f, bundlepath) |
|
1664 | gen = changegroup.readbundle(f, bundlepath) | |
1662 | if all: |
|
1665 | if all: | |
1663 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) |
|
1666 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) | |
1664 |
|
1667 | |||
1665 | def showchunks(named): |
|
1668 | def showchunks(named): | |
1666 | ui.write("\n%s\n" % named) |
|
1669 | ui.write("\n%s\n" % named) | |
1667 | chain = None |
|
1670 | chain = None | |
1668 | while True: |
|
1671 | while True: | |
1669 | chunkdata = gen.deltachunk(chain) |
|
1672 | chunkdata = gen.deltachunk(chain) | |
1670 | if not chunkdata: |
|
1673 | if not chunkdata: | |
1671 | break |
|
1674 | break | |
1672 | node = chunkdata['node'] |
|
1675 | node = chunkdata['node'] | |
1673 | p1 = chunkdata['p1'] |
|
1676 | p1 = chunkdata['p1'] | |
1674 | p2 = chunkdata['p2'] |
|
1677 | p2 = chunkdata['p2'] | |
1675 | cs = chunkdata['cs'] |
|
1678 | cs = chunkdata['cs'] | |
1676 | deltabase = chunkdata['deltabase'] |
|
1679 | deltabase = chunkdata['deltabase'] | |
1677 | delta = chunkdata['delta'] |
|
1680 | delta = chunkdata['delta'] | |
1678 | ui.write("%s %s %s %s %s %s\n" % |
|
1681 | ui.write("%s %s %s %s %s %s\n" % | |
1679 | (hex(node), hex(p1), hex(p2), |
|
1682 | (hex(node), hex(p1), hex(p2), | |
1680 | hex(cs), hex(deltabase), len(delta))) |
|
1683 | hex(cs), hex(deltabase), len(delta))) | |
1681 | chain = node |
|
1684 | chain = node | |
1682 |
|
1685 | |||
1683 | chunkdata = gen.changelogheader() |
|
1686 | chunkdata = gen.changelogheader() | |
1684 | showchunks("changelog") |
|
1687 | showchunks("changelog") | |
1685 | chunkdata = gen.manifestheader() |
|
1688 | chunkdata = gen.manifestheader() | |
1686 | showchunks("manifest") |
|
1689 | showchunks("manifest") | |
1687 | while True: |
|
1690 | while True: | |
1688 | chunkdata = gen.filelogheader() |
|
1691 | chunkdata = gen.filelogheader() | |
1689 | if not chunkdata: |
|
1692 | if not chunkdata: | |
1690 | break |
|
1693 | break | |
1691 | fname = chunkdata['filename'] |
|
1694 | fname = chunkdata['filename'] | |
1692 | showchunks(fname) |
|
1695 | showchunks(fname) | |
1693 | else: |
|
1696 | else: | |
1694 | chunkdata = gen.changelogheader() |
|
1697 | chunkdata = gen.changelogheader() | |
1695 | chain = None |
|
1698 | chain = None | |
1696 | while True: |
|
1699 | while True: | |
1697 | chunkdata = gen.deltachunk(chain) |
|
1700 | chunkdata = gen.deltachunk(chain) | |
1698 | if not chunkdata: |
|
1701 | if not chunkdata: | |
1699 | break |
|
1702 | break | |
1700 | node = chunkdata['node'] |
|
1703 | node = chunkdata['node'] | |
1701 | ui.write("%s\n" % hex(node)) |
|
1704 | ui.write("%s\n" % hex(node)) | |
1702 | chain = node |
|
1705 | chain = node | |
1703 | finally: |
|
1706 | finally: | |
1704 | f.close() |
|
1707 | f.close() | |
1705 |
|
1708 | |||
1706 | @command('debugcheckstate', [], '') |
|
1709 | @command('debugcheckstate', [], '') | |
1707 | def debugcheckstate(ui, repo): |
|
1710 | def debugcheckstate(ui, repo): | |
1708 | """validate the correctness of the current dirstate""" |
|
1711 | """validate the correctness of the current dirstate""" | |
1709 | parent1, parent2 = repo.dirstate.parents() |
|
1712 | parent1, parent2 = repo.dirstate.parents() | |
1710 | m1 = repo[parent1].manifest() |
|
1713 | m1 = repo[parent1].manifest() | |
1711 | m2 = repo[parent2].manifest() |
|
1714 | m2 = repo[parent2].manifest() | |
1712 | errors = 0 |
|
1715 | errors = 0 | |
1713 | for f in repo.dirstate: |
|
1716 | for f in repo.dirstate: | |
1714 | state = repo.dirstate[f] |
|
1717 | state = repo.dirstate[f] | |
1715 | if state in "nr" and f not in m1: |
|
1718 | if state in "nr" and f not in m1: | |
1716 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
1719 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | |
1717 | errors += 1 |
|
1720 | errors += 1 | |
1718 | if state in "a" and f in m1: |
|
1721 | if state in "a" and f in m1: | |
1719 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
1722 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | |
1720 | errors += 1 |
|
1723 | errors += 1 | |
1721 | if state in "m" and f not in m1 and f not in m2: |
|
1724 | if state in "m" and f not in m1 and f not in m2: | |
1722 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
1725 | ui.warn(_("%s in state %s, but not in either manifest\n") % | |
1723 | (f, state)) |
|
1726 | (f, state)) | |
1724 | errors += 1 |
|
1727 | errors += 1 | |
1725 | for f in m1: |
|
1728 | for f in m1: | |
1726 | state = repo.dirstate[f] |
|
1729 | state = repo.dirstate[f] | |
1727 | if state not in "nrm": |
|
1730 | if state not in "nrm": | |
1728 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
1731 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | |
1729 | errors += 1 |
|
1732 | errors += 1 | |
1730 | if errors: |
|
1733 | if errors: | |
1731 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
1734 | error = _(".hg/dirstate inconsistent with current parent's manifest") | |
1732 | raise util.Abort(error) |
|
1735 | raise util.Abort(error) | |
1733 |
|
1736 | |||
1734 | @command('debugcommands', [], _('[COMMAND]')) |
|
1737 | @command('debugcommands', [], _('[COMMAND]')) | |
1735 | def debugcommands(ui, cmd='', *args): |
|
1738 | def debugcommands(ui, cmd='', *args): | |
1736 | """list all available commands and options""" |
|
1739 | """list all available commands and options""" | |
1737 | for cmd, vals in sorted(table.iteritems()): |
|
1740 | for cmd, vals in sorted(table.iteritems()): | |
1738 | cmd = cmd.split('|')[0].strip('^') |
|
1741 | cmd = cmd.split('|')[0].strip('^') | |
1739 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1742 | opts = ', '.join([i[1] for i in vals[1]]) | |
1740 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1743 | ui.write('%s: %s\n' % (cmd, opts)) | |
1741 |
|
1744 | |||
1742 | @command('debugcomplete', |
|
1745 | @command('debugcomplete', | |
1743 | [('o', 'options', None, _('show the command options'))], |
|
1746 | [('o', 'options', None, _('show the command options'))], | |
1744 | _('[-o] CMD')) |
|
1747 | _('[-o] CMD')) | |
1745 | def debugcomplete(ui, cmd='', **opts): |
|
1748 | def debugcomplete(ui, cmd='', **opts): | |
1746 | """returns the completion list associated with the given command""" |
|
1749 | """returns the completion list associated with the given command""" | |
1747 |
|
1750 | |||
1748 | if opts.get('options'): |
|
1751 | if opts.get('options'): | |
1749 | options = [] |
|
1752 | options = [] | |
1750 | otables = [globalopts] |
|
1753 | otables = [globalopts] | |
1751 | if cmd: |
|
1754 | if cmd: | |
1752 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1755 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
1753 | otables.append(entry[1]) |
|
1756 | otables.append(entry[1]) | |
1754 | for t in otables: |
|
1757 | for t in otables: | |
1755 | for o in t: |
|
1758 | for o in t: | |
1756 | if "(DEPRECATED)" in o[3]: |
|
1759 | if "(DEPRECATED)" in o[3]: | |
1757 | continue |
|
1760 | continue | |
1758 | if o[0]: |
|
1761 | if o[0]: | |
1759 | options.append('-%s' % o[0]) |
|
1762 | options.append('-%s' % o[0]) | |
1760 | options.append('--%s' % o[1]) |
|
1763 | options.append('--%s' % o[1]) | |
1761 | ui.write("%s\n" % "\n".join(options)) |
|
1764 | ui.write("%s\n" % "\n".join(options)) | |
1762 | return |
|
1765 | return | |
1763 |
|
1766 | |||
1764 | cmdlist = cmdutil.findpossible(cmd, table) |
|
1767 | cmdlist = cmdutil.findpossible(cmd, table) | |
1765 | if ui.verbose: |
|
1768 | if ui.verbose: | |
1766 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1769 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
1767 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1770 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
1768 |
|
1771 | |||
1769 | @command('debugdag', |
|
1772 | @command('debugdag', | |
1770 | [('t', 'tags', None, _('use tags as labels')), |
|
1773 | [('t', 'tags', None, _('use tags as labels')), | |
1771 | ('b', 'branches', None, _('annotate with branch names')), |
|
1774 | ('b', 'branches', None, _('annotate with branch names')), | |
1772 | ('', 'dots', None, _('use dots for runs')), |
|
1775 | ('', 'dots', None, _('use dots for runs')), | |
1773 | ('s', 'spaces', None, _('separate elements by spaces'))], |
|
1776 | ('s', 'spaces', None, _('separate elements by spaces'))], | |
1774 | _('[OPTION]... [FILE [REV]...]')) |
|
1777 | _('[OPTION]... [FILE [REV]...]')) | |
1775 | def debugdag(ui, repo, file_=None, *revs, **opts): |
|
1778 | def debugdag(ui, repo, file_=None, *revs, **opts): | |
1776 | """format the changelog or an index DAG as a concise textual description |
|
1779 | """format the changelog or an index DAG as a concise textual description | |
1777 |
|
1780 | |||
1778 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1781 | If you pass a revlog index, the revlog's DAG is emitted. If you list | |
1779 | revision numbers, they get labeled in the output as rN. |
|
1782 | revision numbers, they get labeled in the output as rN. | |
1780 |
|
1783 | |||
1781 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1784 | Otherwise, the changelog DAG of the current repo is emitted. | |
1782 | """ |
|
1785 | """ | |
1783 | spaces = opts.get('spaces') |
|
1786 | spaces = opts.get('spaces') | |
1784 | dots = opts.get('dots') |
|
1787 | dots = opts.get('dots') | |
1785 | if file_: |
|
1788 | if file_: | |
1786 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1789 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
1787 | revs = set((int(r) for r in revs)) |
|
1790 | revs = set((int(r) for r in revs)) | |
1788 | def events(): |
|
1791 | def events(): | |
1789 | for r in rlog: |
|
1792 | for r in rlog: | |
1790 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) |
|
1793 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) | |
1791 | if p != -1))) |
|
1794 | if p != -1))) | |
1792 | if r in revs: |
|
1795 | if r in revs: | |
1793 | yield 'l', (r, "r%i" % r) |
|
1796 | yield 'l', (r, "r%i" % r) | |
1794 | elif repo: |
|
1797 | elif repo: | |
1795 | cl = repo.changelog |
|
1798 | cl = repo.changelog | |
1796 | tags = opts.get('tags') |
|
1799 | tags = opts.get('tags') | |
1797 | branches = opts.get('branches') |
|
1800 | branches = opts.get('branches') | |
1798 | if tags: |
|
1801 | if tags: | |
1799 | labels = {} |
|
1802 | labels = {} | |
1800 | for l, n in repo.tags().items(): |
|
1803 | for l, n in repo.tags().items(): | |
1801 | labels.setdefault(cl.rev(n), []).append(l) |
|
1804 | labels.setdefault(cl.rev(n), []).append(l) | |
1802 | def events(): |
|
1805 | def events(): | |
1803 | b = "default" |
|
1806 | b = "default" | |
1804 | for r in cl: |
|
1807 | for r in cl: | |
1805 | if branches: |
|
1808 | if branches: | |
1806 | newb = cl.read(cl.node(r))[5]['branch'] |
|
1809 | newb = cl.read(cl.node(r))[5]['branch'] | |
1807 | if newb != b: |
|
1810 | if newb != b: | |
1808 | yield 'a', newb |
|
1811 | yield 'a', newb | |
1809 | b = newb |
|
1812 | b = newb | |
1810 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) |
|
1813 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) | |
1811 | if p != -1))) |
|
1814 | if p != -1))) | |
1812 | if tags: |
|
1815 | if tags: | |
1813 | ls = labels.get(r) |
|
1816 | ls = labels.get(r) | |
1814 | if ls: |
|
1817 | if ls: | |
1815 | for l in ls: |
|
1818 | for l in ls: | |
1816 | yield 'l', (r, l) |
|
1819 | yield 'l', (r, l) | |
1817 | else: |
|
1820 | else: | |
1818 | raise util.Abort(_('need repo for changelog dag')) |
|
1821 | raise util.Abort(_('need repo for changelog dag')) | |
1819 |
|
1822 | |||
1820 | for line in dagparser.dagtextlines(events(), |
|
1823 | for line in dagparser.dagtextlines(events(), | |
1821 | addspaces=spaces, |
|
1824 | addspaces=spaces, | |
1822 | wraplabels=True, |
|
1825 | wraplabels=True, | |
1823 | wrapannotations=True, |
|
1826 | wrapannotations=True, | |
1824 | wrapnonlinear=dots, |
|
1827 | wrapnonlinear=dots, | |
1825 | usedots=dots, |
|
1828 | usedots=dots, | |
1826 | maxlinewidth=70): |
|
1829 | maxlinewidth=70): | |
1827 | ui.write(line) |
|
1830 | ui.write(line) | |
1828 | ui.write("\n") |
|
1831 | ui.write("\n") | |
1829 |
|
1832 | |||
1830 | @command('debugdata', |
|
1833 | @command('debugdata', | |
1831 | [('c', 'changelog', False, _('open changelog')), |
|
1834 | [('c', 'changelog', False, _('open changelog')), | |
1832 | ('m', 'manifest', False, _('open manifest'))], |
|
1835 | ('m', 'manifest', False, _('open manifest'))], | |
1833 | _('-c|-m|FILE REV')) |
|
1836 | _('-c|-m|FILE REV')) | |
1834 | def debugdata(ui, repo, file_, rev=None, **opts): |
|
1837 | def debugdata(ui, repo, file_, rev=None, **opts): | |
1835 | """dump the contents of a data file revision""" |
|
1838 | """dump the contents of a data file revision""" | |
1836 | if opts.get('changelog') or opts.get('manifest'): |
|
1839 | if opts.get('changelog') or opts.get('manifest'): | |
1837 | file_, rev = None, file_ |
|
1840 | file_, rev = None, file_ | |
1838 | elif rev is None: |
|
1841 | elif rev is None: | |
1839 | raise error.CommandError('debugdata', _('invalid arguments')) |
|
1842 | raise error.CommandError('debugdata', _('invalid arguments')) | |
1840 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) |
|
1843 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) | |
1841 | try: |
|
1844 | try: | |
1842 | ui.write(r.revision(r.lookup(rev))) |
|
1845 | ui.write(r.revision(r.lookup(rev))) | |
1843 | except KeyError: |
|
1846 | except KeyError: | |
1844 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
1847 | raise util.Abort(_('invalid revision identifier %s') % rev) | |
1845 |
|
1848 | |||
1846 | @command('debugdate', |
|
1849 | @command('debugdate', | |
1847 | [('e', 'extended', None, _('try extended date formats'))], |
|
1850 | [('e', 'extended', None, _('try extended date formats'))], | |
1848 | _('[-e] DATE [RANGE]')) |
|
1851 | _('[-e] DATE [RANGE]')) | |
1849 | def debugdate(ui, date, range=None, **opts): |
|
1852 | def debugdate(ui, date, range=None, **opts): | |
1850 | """parse and display a date""" |
|
1853 | """parse and display a date""" | |
1851 | if opts["extended"]: |
|
1854 | if opts["extended"]: | |
1852 | d = util.parsedate(date, util.extendeddateformats) |
|
1855 | d = util.parsedate(date, util.extendeddateformats) | |
1853 | else: |
|
1856 | else: | |
1854 | d = util.parsedate(date) |
|
1857 | d = util.parsedate(date) | |
1855 | ui.write(("internal: %s %s\n") % d) |
|
1858 | ui.write(("internal: %s %s\n") % d) | |
1856 | ui.write(("standard: %s\n") % util.datestr(d)) |
|
1859 | ui.write(("standard: %s\n") % util.datestr(d)) | |
1857 | if range: |
|
1860 | if range: | |
1858 | m = util.matchdate(range) |
|
1861 | m = util.matchdate(range) | |
1859 | ui.write(("match: %s\n") % m(d[0])) |
|
1862 | ui.write(("match: %s\n") % m(d[0])) | |
1860 |
|
1863 | |||
1861 | @command('debugdiscovery', |
|
1864 | @command('debugdiscovery', | |
1862 | [('', 'old', None, _('use old-style discovery')), |
|
1865 | [('', 'old', None, _('use old-style discovery')), | |
1863 | ('', 'nonheads', None, |
|
1866 | ('', 'nonheads', None, | |
1864 | _('use old-style discovery with non-heads included')), |
|
1867 | _('use old-style discovery with non-heads included')), | |
1865 | ] + remoteopts, |
|
1868 | ] + remoteopts, | |
1866 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) |
|
1869 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) | |
1867 | def debugdiscovery(ui, repo, remoteurl="default", **opts): |
|
1870 | def debugdiscovery(ui, repo, remoteurl="default", **opts): | |
1868 | """runs the changeset discovery protocol in isolation""" |
|
1871 | """runs the changeset discovery protocol in isolation""" | |
1869 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), |
|
1872 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), | |
1870 | opts.get('branch')) |
|
1873 | opts.get('branch')) | |
1871 | remote = hg.peer(repo, opts, remoteurl) |
|
1874 | remote = hg.peer(repo, opts, remoteurl) | |
1872 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) |
|
1875 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) | |
1873 |
|
1876 | |||
1874 | # make sure tests are repeatable |
|
1877 | # make sure tests are repeatable | |
1875 | random.seed(12323) |
|
1878 | random.seed(12323) | |
1876 |
|
1879 | |||
1877 | def doit(localheads, remoteheads, remote=remote): |
|
1880 | def doit(localheads, remoteheads, remote=remote): | |
1878 | if opts.get('old'): |
|
1881 | if opts.get('old'): | |
1879 | if localheads: |
|
1882 | if localheads: | |
1880 | raise util.Abort('cannot use localheads with old style ' |
|
1883 | raise util.Abort('cannot use localheads with old style ' | |
1881 | 'discovery') |
|
1884 | 'discovery') | |
1882 | if not util.safehasattr(remote, 'branches'): |
|
1885 | if not util.safehasattr(remote, 'branches'): | |
1883 | # enable in-client legacy support |
|
1886 | # enable in-client legacy support | |
1884 | remote = localrepo.locallegacypeer(remote.local()) |
|
1887 | remote = localrepo.locallegacypeer(remote.local()) | |
1885 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, |
|
1888 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, | |
1886 | force=True) |
|
1889 | force=True) | |
1887 | common = set(common) |
|
1890 | common = set(common) | |
1888 | if not opts.get('nonheads'): |
|
1891 | if not opts.get('nonheads'): | |
1889 | ui.write(("unpruned common: %s\n") % |
|
1892 | ui.write(("unpruned common: %s\n") % | |
1890 | " ".join(sorted(short(n) for n in common))) |
|
1893 | " ".join(sorted(short(n) for n in common))) | |
1891 | dag = dagutil.revlogdag(repo.changelog) |
|
1894 | dag = dagutil.revlogdag(repo.changelog) | |
1892 | all = dag.ancestorset(dag.internalizeall(common)) |
|
1895 | all = dag.ancestorset(dag.internalizeall(common)) | |
1893 | common = dag.externalizeall(dag.headsetofconnecteds(all)) |
|
1896 | common = dag.externalizeall(dag.headsetofconnecteds(all)) | |
1894 | else: |
|
1897 | else: | |
1895 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) |
|
1898 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) | |
1896 | common = set(common) |
|
1899 | common = set(common) | |
1897 | rheads = set(hds) |
|
1900 | rheads = set(hds) | |
1898 | lheads = set(repo.heads()) |
|
1901 | lheads = set(repo.heads()) | |
1899 | ui.write(("common heads: %s\n") % |
|
1902 | ui.write(("common heads: %s\n") % | |
1900 | " ".join(sorted(short(n) for n in common))) |
|
1903 | " ".join(sorted(short(n) for n in common))) | |
1901 | if lheads <= common: |
|
1904 | if lheads <= common: | |
1902 | ui.write(("local is subset\n")) |
|
1905 | ui.write(("local is subset\n")) | |
1903 | elif rheads <= common: |
|
1906 | elif rheads <= common: | |
1904 | ui.write(("remote is subset\n")) |
|
1907 | ui.write(("remote is subset\n")) | |
1905 |
|
1908 | |||
1906 | serverlogs = opts.get('serverlog') |
|
1909 | serverlogs = opts.get('serverlog') | |
1907 | if serverlogs: |
|
1910 | if serverlogs: | |
1908 | for filename in serverlogs: |
|
1911 | for filename in serverlogs: | |
1909 | logfile = open(filename, 'r') |
|
1912 | logfile = open(filename, 'r') | |
1910 | try: |
|
1913 | try: | |
1911 | line = logfile.readline() |
|
1914 | line = logfile.readline() | |
1912 | while line: |
|
1915 | while line: | |
1913 | parts = line.strip().split(';') |
|
1916 | parts = line.strip().split(';') | |
1914 | op = parts[1] |
|
1917 | op = parts[1] | |
1915 | if op == 'cg': |
|
1918 | if op == 'cg': | |
1916 | pass |
|
1919 | pass | |
1917 | elif op == 'cgss': |
|
1920 | elif op == 'cgss': | |
1918 | doit(parts[2].split(' '), parts[3].split(' ')) |
|
1921 | doit(parts[2].split(' '), parts[3].split(' ')) | |
1919 | elif op == 'unb': |
|
1922 | elif op == 'unb': | |
1920 | doit(parts[3].split(' '), parts[2].split(' ')) |
|
1923 | doit(parts[3].split(' '), parts[2].split(' ')) | |
1921 | line = logfile.readline() |
|
1924 | line = logfile.readline() | |
1922 | finally: |
|
1925 | finally: | |
1923 | logfile.close() |
|
1926 | logfile.close() | |
1924 |
|
1927 | |||
1925 | else: |
|
1928 | else: | |
1926 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, |
|
1929 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, | |
1927 | opts.get('remote_head')) |
|
1930 | opts.get('remote_head')) | |
1928 | localrevs = opts.get('local_head') |
|
1931 | localrevs = opts.get('local_head') | |
1929 | doit(localrevs, remoterevs) |
|
1932 | doit(localrevs, remoterevs) | |
1930 |
|
1933 | |||
1931 | @command('debugfileset', |
|
1934 | @command('debugfileset', | |
1932 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], |
|
1935 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], | |
1933 | _('[-r REV] FILESPEC')) |
|
1936 | _('[-r REV] FILESPEC')) | |
1934 | def debugfileset(ui, repo, expr, **opts): |
|
1937 | def debugfileset(ui, repo, expr, **opts): | |
1935 | '''parse and apply a fileset specification''' |
|
1938 | '''parse and apply a fileset specification''' | |
1936 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
1939 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
1937 | if ui.verbose: |
|
1940 | if ui.verbose: | |
1938 | tree = fileset.parse(expr)[0] |
|
1941 | tree = fileset.parse(expr)[0] | |
1939 | ui.note(tree, "\n") |
|
1942 | ui.note(tree, "\n") | |
1940 |
|
1943 | |||
1941 | for f in fileset.getfileset(ctx, expr): |
|
1944 | for f in fileset.getfileset(ctx, expr): | |
1942 | ui.write("%s\n" % f) |
|
1945 | ui.write("%s\n" % f) | |
1943 |
|
1946 | |||
1944 | @command('debugfsinfo', [], _('[PATH]')) |
|
1947 | @command('debugfsinfo', [], _('[PATH]')) | |
1945 | def debugfsinfo(ui, path="."): |
|
1948 | def debugfsinfo(ui, path="."): | |
1946 | """show information detected about current filesystem""" |
|
1949 | """show information detected about current filesystem""" | |
1947 | util.writefile('.debugfsinfo', '') |
|
1950 | util.writefile('.debugfsinfo', '') | |
1948 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) |
|
1951 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) | |
1949 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) |
|
1952 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) | |
1950 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) |
|
1953 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) | |
1951 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') |
|
1954 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') | |
1952 | and 'yes' or 'no')) |
|
1955 | and 'yes' or 'no')) | |
1953 | os.unlink('.debugfsinfo') |
|
1956 | os.unlink('.debugfsinfo') | |
1954 |
|
1957 | |||
1955 | @command('debuggetbundle', |
|
1958 | @command('debuggetbundle', | |
1956 | [('H', 'head', [], _('id of head node'), _('ID')), |
|
1959 | [('H', 'head', [], _('id of head node'), _('ID')), | |
1957 | ('C', 'common', [], _('id of common node'), _('ID')), |
|
1960 | ('C', 'common', [], _('id of common node'), _('ID')), | |
1958 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], |
|
1961 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], | |
1959 | _('REPO FILE [-H|-C ID]...')) |
|
1962 | _('REPO FILE [-H|-C ID]...')) | |
1960 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): |
|
1963 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): | |
1961 | """retrieves a bundle from a repo |
|
1964 | """retrieves a bundle from a repo | |
1962 |
|
1965 | |||
1963 | Every ID must be a full-length hex node id string. Saves the bundle to the |
|
1966 | Every ID must be a full-length hex node id string. Saves the bundle to the | |
1964 | given file. |
|
1967 | given file. | |
1965 | """ |
|
1968 | """ | |
1966 | repo = hg.peer(ui, opts, repopath) |
|
1969 | repo = hg.peer(ui, opts, repopath) | |
1967 | if not repo.capable('getbundle'): |
|
1970 | if not repo.capable('getbundle'): | |
1968 | raise util.Abort("getbundle() not supported by target repository") |
|
1971 | raise util.Abort("getbundle() not supported by target repository") | |
1969 | args = {} |
|
1972 | args = {} | |
1970 | if common: |
|
1973 | if common: | |
1971 | args['common'] = [bin(s) for s in common] |
|
1974 | args['common'] = [bin(s) for s in common] | |
1972 | if head: |
|
1975 | if head: | |
1973 | args['heads'] = [bin(s) for s in head] |
|
1976 | args['heads'] = [bin(s) for s in head] | |
1974 | # TODO: get desired bundlecaps from command line. |
|
1977 | # TODO: get desired bundlecaps from command line. | |
1975 | args['bundlecaps'] = None |
|
1978 | args['bundlecaps'] = None | |
1976 | bundle = repo.getbundle('debug', **args) |
|
1979 | bundle = repo.getbundle('debug', **args) | |
1977 |
|
1980 | |||
1978 | bundletype = opts.get('type', 'bzip2').lower() |
|
1981 | bundletype = opts.get('type', 'bzip2').lower() | |
1979 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1982 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} | |
1980 | bundletype = btypes.get(bundletype) |
|
1983 | bundletype = btypes.get(bundletype) | |
1981 | if bundletype not in changegroup.bundletypes: |
|
1984 | if bundletype not in changegroup.bundletypes: | |
1982 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1985 | raise util.Abort(_('unknown bundle type specified with --type')) | |
1983 | changegroup.writebundle(bundle, bundlepath, bundletype) |
|
1986 | changegroup.writebundle(bundle, bundlepath, bundletype) | |
1984 |
|
1987 | |||
1985 | @command('debugignore', [], '') |
|
1988 | @command('debugignore', [], '') | |
1986 | def debugignore(ui, repo, *values, **opts): |
|
1989 | def debugignore(ui, repo, *values, **opts): | |
1987 | """display the combined ignore pattern""" |
|
1990 | """display the combined ignore pattern""" | |
1988 | ignore = repo.dirstate._ignore |
|
1991 | ignore = repo.dirstate._ignore | |
1989 | includepat = getattr(ignore, 'includepat', None) |
|
1992 | includepat = getattr(ignore, 'includepat', None) | |
1990 | if includepat is not None: |
|
1993 | if includepat is not None: | |
1991 | ui.write("%s\n" % includepat) |
|
1994 | ui.write("%s\n" % includepat) | |
1992 | else: |
|
1995 | else: | |
1993 | raise util.Abort(_("no ignore patterns found")) |
|
1996 | raise util.Abort(_("no ignore patterns found")) | |
1994 |
|
1997 | |||
1995 | @command('debugindex', |
|
1998 | @command('debugindex', | |
1996 | [('c', 'changelog', False, _('open changelog')), |
|
1999 | [('c', 'changelog', False, _('open changelog')), | |
1997 | ('m', 'manifest', False, _('open manifest')), |
|
2000 | ('m', 'manifest', False, _('open manifest')), | |
1998 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], |
|
2001 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], | |
1999 | _('[-f FORMAT] -c|-m|FILE')) |
|
2002 | _('[-f FORMAT] -c|-m|FILE')) | |
2000 | def debugindex(ui, repo, file_=None, **opts): |
|
2003 | def debugindex(ui, repo, file_=None, **opts): | |
2001 | """dump the contents of an index file""" |
|
2004 | """dump the contents of an index file""" | |
2002 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) |
|
2005 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) | |
2003 | format = opts.get('format', 0) |
|
2006 | format = opts.get('format', 0) | |
2004 | if format not in (0, 1): |
|
2007 | if format not in (0, 1): | |
2005 | raise util.Abort(_("unknown format %d") % format) |
|
2008 | raise util.Abort(_("unknown format %d") % format) | |
2006 |
|
2009 | |||
2007 | generaldelta = r.version & revlog.REVLOGGENERALDELTA |
|
2010 | generaldelta = r.version & revlog.REVLOGGENERALDELTA | |
2008 | if generaldelta: |
|
2011 | if generaldelta: | |
2009 | basehdr = ' delta' |
|
2012 | basehdr = ' delta' | |
2010 | else: |
|
2013 | else: | |
2011 | basehdr = ' base' |
|
2014 | basehdr = ' base' | |
2012 |
|
2015 | |||
2013 | if format == 0: |
|
2016 | if format == 0: | |
2014 | ui.write(" rev offset length " + basehdr + " linkrev" |
|
2017 | ui.write(" rev offset length " + basehdr + " linkrev" | |
2015 | " nodeid p1 p2\n") |
|
2018 | " nodeid p1 p2\n") | |
2016 | elif format == 1: |
|
2019 | elif format == 1: | |
2017 | ui.write(" rev flag offset length" |
|
2020 | ui.write(" rev flag offset length" | |
2018 | " size " + basehdr + " link p1 p2" |
|
2021 | " size " + basehdr + " link p1 p2" | |
2019 | " nodeid\n") |
|
2022 | " nodeid\n") | |
2020 |
|
2023 | |||
2021 | for i in r: |
|
2024 | for i in r: | |
2022 | node = r.node(i) |
|
2025 | node = r.node(i) | |
2023 | if generaldelta: |
|
2026 | if generaldelta: | |
2024 | base = r.deltaparent(i) |
|
2027 | base = r.deltaparent(i) | |
2025 | else: |
|
2028 | else: | |
2026 | base = r.chainbase(i) |
|
2029 | base = r.chainbase(i) | |
2027 | if format == 0: |
|
2030 | if format == 0: | |
2028 | try: |
|
2031 | try: | |
2029 | pp = r.parents(node) |
|
2032 | pp = r.parents(node) | |
2030 | except Exception: |
|
2033 | except Exception: | |
2031 | pp = [nullid, nullid] |
|
2034 | pp = [nullid, nullid] | |
2032 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
2035 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | |
2033 | i, r.start(i), r.length(i), base, r.linkrev(i), |
|
2036 | i, r.start(i), r.length(i), base, r.linkrev(i), | |
2034 | short(node), short(pp[0]), short(pp[1]))) |
|
2037 | short(node), short(pp[0]), short(pp[1]))) | |
2035 | elif format == 1: |
|
2038 | elif format == 1: | |
2036 | pr = r.parentrevs(i) |
|
2039 | pr = r.parentrevs(i) | |
2037 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( |
|
2040 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( | |
2038 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), |
|
2041 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), | |
2039 | base, r.linkrev(i), pr[0], pr[1], short(node))) |
|
2042 | base, r.linkrev(i), pr[0], pr[1], short(node))) | |
2040 |
|
2043 | |||
2041 | @command('debugindexdot', [], _('FILE')) |
|
2044 | @command('debugindexdot', [], _('FILE')) | |
2042 | def debugindexdot(ui, repo, file_): |
|
2045 | def debugindexdot(ui, repo, file_): | |
2043 | """dump an index DAG as a graphviz dot file""" |
|
2046 | """dump an index DAG as a graphviz dot file""" | |
2044 | r = None |
|
2047 | r = None | |
2045 | if repo: |
|
2048 | if repo: | |
2046 | filelog = repo.file(file_) |
|
2049 | filelog = repo.file(file_) | |
2047 | if len(filelog): |
|
2050 | if len(filelog): | |
2048 | r = filelog |
|
2051 | r = filelog | |
2049 | if not r: |
|
2052 | if not r: | |
2050 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
2053 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
2051 | ui.write(("digraph G {\n")) |
|
2054 | ui.write(("digraph G {\n")) | |
2052 | for i in r: |
|
2055 | for i in r: | |
2053 | node = r.node(i) |
|
2056 | node = r.node(i) | |
2054 | pp = r.parents(node) |
|
2057 | pp = r.parents(node) | |
2055 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
2058 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | |
2056 | if pp[1] != nullid: |
|
2059 | if pp[1] != nullid: | |
2057 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
2060 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | |
2058 | ui.write("}\n") |
|
2061 | ui.write("}\n") | |
2059 |
|
2062 | |||
2060 | @command('debuginstall', [], '') |
|
2063 | @command('debuginstall', [], '') | |
2061 | def debuginstall(ui): |
|
2064 | def debuginstall(ui): | |
2062 | '''test Mercurial installation |
|
2065 | '''test Mercurial installation | |
2063 |
|
2066 | |||
2064 | Returns 0 on success. |
|
2067 | Returns 0 on success. | |
2065 | ''' |
|
2068 | ''' | |
2066 |
|
2069 | |||
2067 | def writetemp(contents): |
|
2070 | def writetemp(contents): | |
2068 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
2071 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") | |
2069 | f = os.fdopen(fd, "wb") |
|
2072 | f = os.fdopen(fd, "wb") | |
2070 | f.write(contents) |
|
2073 | f.write(contents) | |
2071 | f.close() |
|
2074 | f.close() | |
2072 | return name |
|
2075 | return name | |
2073 |
|
2076 | |||
2074 | problems = 0 |
|
2077 | problems = 0 | |
2075 |
|
2078 | |||
2076 | # encoding |
|
2079 | # encoding | |
2077 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) |
|
2080 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) | |
2078 | try: |
|
2081 | try: | |
2079 | encoding.fromlocal("test") |
|
2082 | encoding.fromlocal("test") | |
2080 | except util.Abort, inst: |
|
2083 | except util.Abort, inst: | |
2081 | ui.write(" %s\n" % inst) |
|
2084 | ui.write(" %s\n" % inst) | |
2082 | ui.write(_(" (check that your locale is properly set)\n")) |
|
2085 | ui.write(_(" (check that your locale is properly set)\n")) | |
2083 | problems += 1 |
|
2086 | problems += 1 | |
2084 |
|
2087 | |||
2085 | # Python lib |
|
2088 | # Python lib | |
2086 | ui.status(_("checking Python lib (%s)...\n") |
|
2089 | ui.status(_("checking Python lib (%s)...\n") | |
2087 | % os.path.dirname(os.__file__)) |
|
2090 | % os.path.dirname(os.__file__)) | |
2088 |
|
2091 | |||
2089 | # compiled modules |
|
2092 | # compiled modules | |
2090 | ui.status(_("checking installed modules (%s)...\n") |
|
2093 | ui.status(_("checking installed modules (%s)...\n") | |
2091 | % os.path.dirname(__file__)) |
|
2094 | % os.path.dirname(__file__)) | |
2092 | try: |
|
2095 | try: | |
2093 | import bdiff, mpatch, base85, osutil |
|
2096 | import bdiff, mpatch, base85, osutil | |
2094 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
2097 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes | |
2095 | except Exception, inst: |
|
2098 | except Exception, inst: | |
2096 | ui.write(" %s\n" % inst) |
|
2099 | ui.write(" %s\n" % inst) | |
2097 | ui.write(_(" One or more extensions could not be found")) |
|
2100 | ui.write(_(" One or more extensions could not be found")) | |
2098 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
2101 | ui.write(_(" (check that you compiled the extensions)\n")) | |
2099 | problems += 1 |
|
2102 | problems += 1 | |
2100 |
|
2103 | |||
2101 | # templates |
|
2104 | # templates | |
2102 | import templater |
|
2105 | import templater | |
2103 | p = templater.templatepath() |
|
2106 | p = templater.templatepath() | |
2104 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) |
|
2107 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) | |
2105 | try: |
|
2108 | try: | |
2106 | templater.templater(templater.templatepath("map-cmdline.default")) |
|
2109 | templater.templater(templater.templatepath("map-cmdline.default")) | |
2107 | except Exception, inst: |
|
2110 | except Exception, inst: | |
2108 | ui.write(" %s\n" % inst) |
|
2111 | ui.write(" %s\n" % inst) | |
2109 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
2112 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) | |
2110 | problems += 1 |
|
2113 | problems += 1 | |
2111 |
|
2114 | |||
2112 | # editor |
|
2115 | # editor | |
2113 | ui.status(_("checking commit editor...\n")) |
|
2116 | ui.status(_("checking commit editor...\n")) | |
2114 | editor = ui.geteditor() |
|
2117 | editor = ui.geteditor() | |
2115 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) |
|
2118 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) | |
2116 | if not cmdpath: |
|
2119 | if not cmdpath: | |
2117 | if editor == 'vi': |
|
2120 | if editor == 'vi': | |
2118 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
2121 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) | |
2119 | ui.write(_(" (specify a commit editor in your configuration" |
|
2122 | ui.write(_(" (specify a commit editor in your configuration" | |
2120 | " file)\n")) |
|
2123 | " file)\n")) | |
2121 | else: |
|
2124 | else: | |
2122 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
2125 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) | |
2123 | ui.write(_(" (specify a commit editor in your configuration" |
|
2126 | ui.write(_(" (specify a commit editor in your configuration" | |
2124 | " file)\n")) |
|
2127 | " file)\n")) | |
2125 | problems += 1 |
|
2128 | problems += 1 | |
2126 |
|
2129 | |||
2127 | # check username |
|
2130 | # check username | |
2128 | ui.status(_("checking username...\n")) |
|
2131 | ui.status(_("checking username...\n")) | |
2129 | try: |
|
2132 | try: | |
2130 | ui.username() |
|
2133 | ui.username() | |
2131 | except util.Abort, e: |
|
2134 | except util.Abort, e: | |
2132 | ui.write(" %s\n" % e) |
|
2135 | ui.write(" %s\n" % e) | |
2133 | ui.write(_(" (specify a username in your configuration file)\n")) |
|
2136 | ui.write(_(" (specify a username in your configuration file)\n")) | |
2134 | problems += 1 |
|
2137 | problems += 1 | |
2135 |
|
2138 | |||
2136 | if not problems: |
|
2139 | if not problems: | |
2137 | ui.status(_("no problems detected\n")) |
|
2140 | ui.status(_("no problems detected\n")) | |
2138 | else: |
|
2141 | else: | |
2139 | ui.write(_("%s problems detected," |
|
2142 | ui.write(_("%s problems detected," | |
2140 | " please check your install!\n") % problems) |
|
2143 | " please check your install!\n") % problems) | |
2141 |
|
2144 | |||
2142 | return problems |
|
2145 | return problems | |
2143 |
|
2146 | |||
2144 | @command('debugknown', [], _('REPO ID...')) |
|
2147 | @command('debugknown', [], _('REPO ID...')) | |
2145 | def debugknown(ui, repopath, *ids, **opts): |
|
2148 | def debugknown(ui, repopath, *ids, **opts): | |
2146 | """test whether node ids are known to a repo |
|
2149 | """test whether node ids are known to a repo | |
2147 |
|
2150 | |||
2148 | Every ID must be a full-length hex node id string. Returns a list of 0s |
|
2151 | Every ID must be a full-length hex node id string. Returns a list of 0s | |
2149 | and 1s indicating unknown/known. |
|
2152 | and 1s indicating unknown/known. | |
2150 | """ |
|
2153 | """ | |
2151 | repo = hg.peer(ui, opts, repopath) |
|
2154 | repo = hg.peer(ui, opts, repopath) | |
2152 | if not repo.capable('known'): |
|
2155 | if not repo.capable('known'): | |
2153 | raise util.Abort("known() not supported by target repository") |
|
2156 | raise util.Abort("known() not supported by target repository") | |
2154 | flags = repo.known([bin(s) for s in ids]) |
|
2157 | flags = repo.known([bin(s) for s in ids]) | |
2155 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
2158 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) | |
2156 |
|
2159 | |||
2157 | @command('debuglabelcomplete', [], _('LABEL...')) |
|
2160 | @command('debuglabelcomplete', [], _('LABEL...')) | |
2158 | def debuglabelcomplete(ui, repo, *args): |
|
2161 | def debuglabelcomplete(ui, repo, *args): | |
2159 | '''complete "labels" - tags, open branch names, bookmark names''' |
|
2162 | '''complete "labels" - tags, open branch names, bookmark names''' | |
2160 |
|
2163 | |||
2161 | labels = set() |
|
2164 | labels = set() | |
2162 | labels.update(t[0] for t in repo.tagslist()) |
|
2165 | labels.update(t[0] for t in repo.tagslist()) | |
2163 | labels.update(repo._bookmarks.keys()) |
|
2166 | labels.update(repo._bookmarks.keys()) | |
2164 | labels.update(tag for (tag, heads, tip, closed) |
|
2167 | labels.update(tag for (tag, heads, tip, closed) | |
2165 | in repo.branchmap().iterbranches() if not closed) |
|
2168 | in repo.branchmap().iterbranches() if not closed) | |
2166 | completions = set() |
|
2169 | completions = set() | |
2167 | if not args: |
|
2170 | if not args: | |
2168 | args = [''] |
|
2171 | args = [''] | |
2169 | for a in args: |
|
2172 | for a in args: | |
2170 | completions.update(l for l in labels if l.startswith(a)) |
|
2173 | completions.update(l for l in labels if l.startswith(a)) | |
2171 | ui.write('\n'.join(sorted(completions))) |
|
2174 | ui.write('\n'.join(sorted(completions))) | |
2172 | ui.write('\n') |
|
2175 | ui.write('\n') | |
2173 |
|
2176 | |||
2174 | @command('debugobsolete', |
|
2177 | @command('debugobsolete', | |
2175 | [('', 'flags', 0, _('markers flag')), |
|
2178 | [('', 'flags', 0, _('markers flag')), | |
2176 | ] + commitopts2, |
|
2179 | ] + commitopts2, | |
2177 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) |
|
2180 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) | |
2178 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): |
|
2181 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): | |
2179 | """create arbitrary obsolete marker |
|
2182 | """create arbitrary obsolete marker | |
2180 |
|
2183 | |||
2181 | With no arguments, displays the list of obsolescence markers.""" |
|
2184 | With no arguments, displays the list of obsolescence markers.""" | |
2182 | def parsenodeid(s): |
|
2185 | def parsenodeid(s): | |
2183 | try: |
|
2186 | try: | |
2184 | # We do not use revsingle/revrange functions here to accept |
|
2187 | # We do not use revsingle/revrange functions here to accept | |
2185 | # arbitrary node identifiers, possibly not present in the |
|
2188 | # arbitrary node identifiers, possibly not present in the | |
2186 | # local repository. |
|
2189 | # local repository. | |
2187 | n = bin(s) |
|
2190 | n = bin(s) | |
2188 | if len(n) != len(nullid): |
|
2191 | if len(n) != len(nullid): | |
2189 | raise TypeError() |
|
2192 | raise TypeError() | |
2190 | return n |
|
2193 | return n | |
2191 | except TypeError: |
|
2194 | except TypeError: | |
2192 | raise util.Abort('changeset references must be full hexadecimal ' |
|
2195 | raise util.Abort('changeset references must be full hexadecimal ' | |
2193 | 'node identifiers') |
|
2196 | 'node identifiers') | |
2194 |
|
2197 | |||
2195 | if precursor is not None: |
|
2198 | if precursor is not None: | |
2196 | metadata = {} |
|
2199 | metadata = {} | |
2197 | if 'date' in opts: |
|
2200 | if 'date' in opts: | |
2198 | metadata['date'] = opts['date'] |
|
2201 | metadata['date'] = opts['date'] | |
2199 | metadata['user'] = opts['user'] or ui.username() |
|
2202 | metadata['user'] = opts['user'] or ui.username() | |
2200 | succs = tuple(parsenodeid(succ) for succ in successors) |
|
2203 | succs = tuple(parsenodeid(succ) for succ in successors) | |
2201 | l = repo.lock() |
|
2204 | l = repo.lock() | |
2202 | try: |
|
2205 | try: | |
2203 | tr = repo.transaction('debugobsolete') |
|
2206 | tr = repo.transaction('debugobsolete') | |
2204 | try: |
|
2207 | try: | |
2205 | repo.obsstore.create(tr, parsenodeid(precursor), succs, |
|
2208 | repo.obsstore.create(tr, parsenodeid(precursor), succs, | |
2206 | opts['flags'], metadata) |
|
2209 | opts['flags'], metadata) | |
2207 | tr.close() |
|
2210 | tr.close() | |
2208 | finally: |
|
2211 | finally: | |
2209 | tr.release() |
|
2212 | tr.release() | |
2210 | finally: |
|
2213 | finally: | |
2211 | l.release() |
|
2214 | l.release() | |
2212 | else: |
|
2215 | else: | |
2213 | for m in obsolete.allmarkers(repo): |
|
2216 | for m in obsolete.allmarkers(repo): | |
2214 | ui.write(hex(m.precnode())) |
|
2217 | ui.write(hex(m.precnode())) | |
2215 | for repl in m.succnodes(): |
|
2218 | for repl in m.succnodes(): | |
2216 | ui.write(' ') |
|
2219 | ui.write(' ') | |
2217 | ui.write(hex(repl)) |
|
2220 | ui.write(hex(repl)) | |
2218 | ui.write(' %X ' % m._data[2]) |
|
2221 | ui.write(' %X ' % m._data[2]) | |
2219 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
2222 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | |
2220 | sorted(m.metadata().items())))) |
|
2223 | sorted(m.metadata().items())))) | |
2221 | ui.write('\n') |
|
2224 | ui.write('\n') | |
2222 |
|
2225 | |||
2223 | @command('debugpathcomplete', |
|
2226 | @command('debugpathcomplete', | |
2224 | [('f', 'full', None, _('complete an entire path')), |
|
2227 | [('f', 'full', None, _('complete an entire path')), | |
2225 | ('n', 'normal', None, _('show only normal files')), |
|
2228 | ('n', 'normal', None, _('show only normal files')), | |
2226 | ('a', 'added', None, _('show only added files')), |
|
2229 | ('a', 'added', None, _('show only added files')), | |
2227 | ('r', 'removed', None, _('show only removed files'))], |
|
2230 | ('r', 'removed', None, _('show only removed files'))], | |
2228 | _('FILESPEC...')) |
|
2231 | _('FILESPEC...')) | |
2229 | def debugpathcomplete(ui, repo, *specs, **opts): |
|
2232 | def debugpathcomplete(ui, repo, *specs, **opts): | |
2230 | '''complete part or all of a tracked path |
|
2233 | '''complete part or all of a tracked path | |
2231 |
|
2234 | |||
2232 | This command supports shells that offer path name completion. It |
|
2235 | This command supports shells that offer path name completion. It | |
2233 | currently completes only files already known to the dirstate. |
|
2236 | currently completes only files already known to the dirstate. | |
2234 |
|
2237 | |||
2235 | Completion extends only to the next path segment unless |
|
2238 | Completion extends only to the next path segment unless | |
2236 | --full is specified, in which case entire paths are used.''' |
|
2239 | --full is specified, in which case entire paths are used.''' | |
2237 |
|
2240 | |||
2238 | def complete(path, acceptable): |
|
2241 | def complete(path, acceptable): | |
2239 | dirstate = repo.dirstate |
|
2242 | dirstate = repo.dirstate | |
2240 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) |
|
2243 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) | |
2241 | rootdir = repo.root + os.sep |
|
2244 | rootdir = repo.root + os.sep | |
2242 | if spec != repo.root and not spec.startswith(rootdir): |
|
2245 | if spec != repo.root and not spec.startswith(rootdir): | |
2243 | return [], [] |
|
2246 | return [], [] | |
2244 | if os.path.isdir(spec): |
|
2247 | if os.path.isdir(spec): | |
2245 | spec += '/' |
|
2248 | spec += '/' | |
2246 | spec = spec[len(rootdir):] |
|
2249 | spec = spec[len(rootdir):] | |
2247 | fixpaths = os.sep != '/' |
|
2250 | fixpaths = os.sep != '/' | |
2248 | if fixpaths: |
|
2251 | if fixpaths: | |
2249 | spec = spec.replace(os.sep, '/') |
|
2252 | spec = spec.replace(os.sep, '/') | |
2250 | speclen = len(spec) |
|
2253 | speclen = len(spec) | |
2251 | fullpaths = opts['full'] |
|
2254 | fullpaths = opts['full'] | |
2252 | files, dirs = set(), set() |
|
2255 | files, dirs = set(), set() | |
2253 | adddir, addfile = dirs.add, files.add |
|
2256 | adddir, addfile = dirs.add, files.add | |
2254 | for f, st in dirstate.iteritems(): |
|
2257 | for f, st in dirstate.iteritems(): | |
2255 | if f.startswith(spec) and st[0] in acceptable: |
|
2258 | if f.startswith(spec) and st[0] in acceptable: | |
2256 | if fixpaths: |
|
2259 | if fixpaths: | |
2257 | f = f.replace('/', os.sep) |
|
2260 | f = f.replace('/', os.sep) | |
2258 | if fullpaths: |
|
2261 | if fullpaths: | |
2259 | addfile(f) |
|
2262 | addfile(f) | |
2260 | continue |
|
2263 | continue | |
2261 | s = f.find(os.sep, speclen) |
|
2264 | s = f.find(os.sep, speclen) | |
2262 | if s >= 0: |
|
2265 | if s >= 0: | |
2263 | adddir(f[:s]) |
|
2266 | adddir(f[:s]) | |
2264 | else: |
|
2267 | else: | |
2265 | addfile(f) |
|
2268 | addfile(f) | |
2266 | return files, dirs |
|
2269 | return files, dirs | |
2267 |
|
2270 | |||
2268 | acceptable = '' |
|
2271 | acceptable = '' | |
2269 | if opts['normal']: |
|
2272 | if opts['normal']: | |
2270 | acceptable += 'nm' |
|
2273 | acceptable += 'nm' | |
2271 | if opts['added']: |
|
2274 | if opts['added']: | |
2272 | acceptable += 'a' |
|
2275 | acceptable += 'a' | |
2273 | if opts['removed']: |
|
2276 | if opts['removed']: | |
2274 | acceptable += 'r' |
|
2277 | acceptable += 'r' | |
2275 | cwd = repo.getcwd() |
|
2278 | cwd = repo.getcwd() | |
2276 | if not specs: |
|
2279 | if not specs: | |
2277 | specs = ['.'] |
|
2280 | specs = ['.'] | |
2278 |
|
2281 | |||
2279 | files, dirs = set(), set() |
|
2282 | files, dirs = set(), set() | |
2280 | for spec in specs: |
|
2283 | for spec in specs: | |
2281 | f, d = complete(spec, acceptable or 'nmar') |
|
2284 | f, d = complete(spec, acceptable or 'nmar') | |
2282 | files.update(f) |
|
2285 | files.update(f) | |
2283 | dirs.update(d) |
|
2286 | dirs.update(d) | |
2284 | files.update(dirs) |
|
2287 | files.update(dirs) | |
2285 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) |
|
2288 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) | |
2286 | ui.write('\n') |
|
2289 | ui.write('\n') | |
2287 |
|
2290 | |||
2288 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) |
|
2291 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) | |
2289 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): |
|
2292 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): | |
2290 | '''access the pushkey key/value protocol |
|
2293 | '''access the pushkey key/value protocol | |
2291 |
|
2294 | |||
2292 | With two args, list the keys in the given namespace. |
|
2295 | With two args, list the keys in the given namespace. | |
2293 |
|
2296 | |||
2294 | With five args, set a key to new if it currently is set to old. |
|
2297 | With five args, set a key to new if it currently is set to old. | |
2295 | Reports success or failure. |
|
2298 | Reports success or failure. | |
2296 | ''' |
|
2299 | ''' | |
2297 |
|
2300 | |||
2298 | target = hg.peer(ui, {}, repopath) |
|
2301 | target = hg.peer(ui, {}, repopath) | |
2299 | if keyinfo: |
|
2302 | if keyinfo: | |
2300 | key, old, new = keyinfo |
|
2303 | key, old, new = keyinfo | |
2301 | r = target.pushkey(namespace, key, old, new) |
|
2304 | r = target.pushkey(namespace, key, old, new) | |
2302 | ui.status(str(r) + '\n') |
|
2305 | ui.status(str(r) + '\n') | |
2303 | return not r |
|
2306 | return not r | |
2304 | else: |
|
2307 | else: | |
2305 | for k, v in sorted(target.listkeys(namespace).iteritems()): |
|
2308 | for k, v in sorted(target.listkeys(namespace).iteritems()): | |
2306 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
2309 | ui.write("%s\t%s\n" % (k.encode('string-escape'), | |
2307 | v.encode('string-escape'))) |
|
2310 | v.encode('string-escape'))) | |
2308 |
|
2311 | |||
2309 | @command('debugpvec', [], _('A B')) |
|
2312 | @command('debugpvec', [], _('A B')) | |
2310 | def debugpvec(ui, repo, a, b=None): |
|
2313 | def debugpvec(ui, repo, a, b=None): | |
2311 | ca = scmutil.revsingle(repo, a) |
|
2314 | ca = scmutil.revsingle(repo, a) | |
2312 | cb = scmutil.revsingle(repo, b) |
|
2315 | cb = scmutil.revsingle(repo, b) | |
2313 | pa = pvec.ctxpvec(ca) |
|
2316 | pa = pvec.ctxpvec(ca) | |
2314 | pb = pvec.ctxpvec(cb) |
|
2317 | pb = pvec.ctxpvec(cb) | |
2315 | if pa == pb: |
|
2318 | if pa == pb: | |
2316 | rel = "=" |
|
2319 | rel = "=" | |
2317 | elif pa > pb: |
|
2320 | elif pa > pb: | |
2318 | rel = ">" |
|
2321 | rel = ">" | |
2319 | elif pa < pb: |
|
2322 | elif pa < pb: | |
2320 | rel = "<" |
|
2323 | rel = "<" | |
2321 | elif pa | pb: |
|
2324 | elif pa | pb: | |
2322 | rel = "|" |
|
2325 | rel = "|" | |
2323 | ui.write(_("a: %s\n") % pa) |
|
2326 | ui.write(_("a: %s\n") % pa) | |
2324 | ui.write(_("b: %s\n") % pb) |
|
2327 | ui.write(_("b: %s\n") % pb) | |
2325 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) |
|
2328 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) | |
2326 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % |
|
2329 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % | |
2327 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), |
|
2330 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), | |
2328 | pa.distance(pb), rel)) |
|
2331 | pa.distance(pb), rel)) | |
2329 |
|
2332 | |||
2330 | @command('debugrebuilddirstate|debugrebuildstate', |
|
2333 | @command('debugrebuilddirstate|debugrebuildstate', | |
2331 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], |
|
2334 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], | |
2332 | _('[-r REV]')) |
|
2335 | _('[-r REV]')) | |
2333 | def debugrebuilddirstate(ui, repo, rev): |
|
2336 | def debugrebuilddirstate(ui, repo, rev): | |
2334 | """rebuild the dirstate as it would look like for the given revision |
|
2337 | """rebuild the dirstate as it would look like for the given revision | |
2335 |
|
2338 | |||
2336 | If no revision is specified the first current parent will be used. |
|
2339 | If no revision is specified the first current parent will be used. | |
2337 |
|
2340 | |||
2338 | The dirstate will be set to the files of the given revision. |
|
2341 | The dirstate will be set to the files of the given revision. | |
2339 | The actual working directory content or existing dirstate |
|
2342 | The actual working directory content or existing dirstate | |
2340 | information such as adds or removes is not considered. |
|
2343 | information such as adds or removes is not considered. | |
2341 |
|
2344 | |||
2342 | One use of this command is to make the next :hg:`status` invocation |
|
2345 | One use of this command is to make the next :hg:`status` invocation | |
2343 | check the actual file content. |
|
2346 | check the actual file content. | |
2344 | """ |
|
2347 | """ | |
2345 | ctx = scmutil.revsingle(repo, rev) |
|
2348 | ctx = scmutil.revsingle(repo, rev) | |
2346 | wlock = repo.wlock() |
|
2349 | wlock = repo.wlock() | |
2347 | try: |
|
2350 | try: | |
2348 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
2351 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) | |
2349 | finally: |
|
2352 | finally: | |
2350 | wlock.release() |
|
2353 | wlock.release() | |
2351 |
|
2354 | |||
2352 | @command('debugrename', |
|
2355 | @command('debugrename', | |
2353 | [('r', 'rev', '', _('revision to debug'), _('REV'))], |
|
2356 | [('r', 'rev', '', _('revision to debug'), _('REV'))], | |
2354 | _('[-r REV] FILE')) |
|
2357 | _('[-r REV] FILE')) | |
2355 | def debugrename(ui, repo, file1, *pats, **opts): |
|
2358 | def debugrename(ui, repo, file1, *pats, **opts): | |
2356 | """dump rename information""" |
|
2359 | """dump rename information""" | |
2357 |
|
2360 | |||
2358 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
2361 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
2359 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
2362 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
2360 | for abs in ctx.walk(m): |
|
2363 | for abs in ctx.walk(m): | |
2361 | fctx = ctx[abs] |
|
2364 | fctx = ctx[abs] | |
2362 | o = fctx.filelog().renamed(fctx.filenode()) |
|
2365 | o = fctx.filelog().renamed(fctx.filenode()) | |
2363 | rel = m.rel(abs) |
|
2366 | rel = m.rel(abs) | |
2364 | if o: |
|
2367 | if o: | |
2365 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
2368 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) | |
2366 | else: |
|
2369 | else: | |
2367 | ui.write(_("%s not renamed\n") % rel) |
|
2370 | ui.write(_("%s not renamed\n") % rel) | |
2368 |
|
2371 | |||
2369 | @command('debugrevlog', |
|
2372 | @command('debugrevlog', | |
2370 | [('c', 'changelog', False, _('open changelog')), |
|
2373 | [('c', 'changelog', False, _('open changelog')), | |
2371 | ('m', 'manifest', False, _('open manifest')), |
|
2374 | ('m', 'manifest', False, _('open manifest')), | |
2372 | ('d', 'dump', False, _('dump index data'))], |
|
2375 | ('d', 'dump', False, _('dump index data'))], | |
2373 | _('-c|-m|FILE')) |
|
2376 | _('-c|-m|FILE')) | |
2374 | def debugrevlog(ui, repo, file_=None, **opts): |
|
2377 | def debugrevlog(ui, repo, file_=None, **opts): | |
2375 | """show data and statistics about a revlog""" |
|
2378 | """show data and statistics about a revlog""" | |
2376 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) |
|
2379 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) | |
2377 |
|
2380 | |||
2378 | if opts.get("dump"): |
|
2381 | if opts.get("dump"): | |
2379 | numrevs = len(r) |
|
2382 | numrevs = len(r) | |
2380 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" |
|
2383 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" | |
2381 | " rawsize totalsize compression heads\n") |
|
2384 | " rawsize totalsize compression heads\n") | |
2382 | ts = 0 |
|
2385 | ts = 0 | |
2383 | heads = set() |
|
2386 | heads = set() | |
2384 | for rev in xrange(numrevs): |
|
2387 | for rev in xrange(numrevs): | |
2385 | dbase = r.deltaparent(rev) |
|
2388 | dbase = r.deltaparent(rev) | |
2386 | if dbase == -1: |
|
2389 | if dbase == -1: | |
2387 | dbase = rev |
|
2390 | dbase = rev | |
2388 | cbase = r.chainbase(rev) |
|
2391 | cbase = r.chainbase(rev) | |
2389 | p1, p2 = r.parentrevs(rev) |
|
2392 | p1, p2 = r.parentrevs(rev) | |
2390 | rs = r.rawsize(rev) |
|
2393 | rs = r.rawsize(rev) | |
2391 | ts = ts + rs |
|
2394 | ts = ts + rs | |
2392 | heads -= set(r.parentrevs(rev)) |
|
2395 | heads -= set(r.parentrevs(rev)) | |
2393 | heads.add(rev) |
|
2396 | heads.add(rev) | |
2394 | ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" % |
|
2397 | ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" % | |
2395 | (rev, p1, p2, r.start(rev), r.end(rev), |
|
2398 | (rev, p1, p2, r.start(rev), r.end(rev), | |
2396 | r.start(dbase), r.start(cbase), |
|
2399 | r.start(dbase), r.start(cbase), | |
2397 | r.start(p1), r.start(p2), |
|
2400 | r.start(p1), r.start(p2), | |
2398 | rs, ts, ts / r.end(rev), len(heads))) |
|
2401 | rs, ts, ts / r.end(rev), len(heads))) | |
2399 | return 0 |
|
2402 | return 0 | |
2400 |
|
2403 | |||
2401 | v = r.version |
|
2404 | v = r.version | |
2402 | format = v & 0xFFFF |
|
2405 | format = v & 0xFFFF | |
2403 | flags = [] |
|
2406 | flags = [] | |
2404 | gdelta = False |
|
2407 | gdelta = False | |
2405 | if v & revlog.REVLOGNGINLINEDATA: |
|
2408 | if v & revlog.REVLOGNGINLINEDATA: | |
2406 | flags.append('inline') |
|
2409 | flags.append('inline') | |
2407 | if v & revlog.REVLOGGENERALDELTA: |
|
2410 | if v & revlog.REVLOGGENERALDELTA: | |
2408 | gdelta = True |
|
2411 | gdelta = True | |
2409 | flags.append('generaldelta') |
|
2412 | flags.append('generaldelta') | |
2410 | if not flags: |
|
2413 | if not flags: | |
2411 | flags = ['(none)'] |
|
2414 | flags = ['(none)'] | |
2412 |
|
2415 | |||
2413 | nummerges = 0 |
|
2416 | nummerges = 0 | |
2414 | numfull = 0 |
|
2417 | numfull = 0 | |
2415 | numprev = 0 |
|
2418 | numprev = 0 | |
2416 | nump1 = 0 |
|
2419 | nump1 = 0 | |
2417 | nump2 = 0 |
|
2420 | nump2 = 0 | |
2418 | numother = 0 |
|
2421 | numother = 0 | |
2419 | nump1prev = 0 |
|
2422 | nump1prev = 0 | |
2420 | nump2prev = 0 |
|
2423 | nump2prev = 0 | |
2421 | chainlengths = [] |
|
2424 | chainlengths = [] | |
2422 |
|
2425 | |||
2423 | datasize = [None, 0, 0L] |
|
2426 | datasize = [None, 0, 0L] | |
2424 | fullsize = [None, 0, 0L] |
|
2427 | fullsize = [None, 0, 0L] | |
2425 | deltasize = [None, 0, 0L] |
|
2428 | deltasize = [None, 0, 0L] | |
2426 |
|
2429 | |||
2427 | def addsize(size, l): |
|
2430 | def addsize(size, l): | |
2428 | if l[0] is None or size < l[0]: |
|
2431 | if l[0] is None or size < l[0]: | |
2429 | l[0] = size |
|
2432 | l[0] = size | |
2430 | if size > l[1]: |
|
2433 | if size > l[1]: | |
2431 | l[1] = size |
|
2434 | l[1] = size | |
2432 | l[2] += size |
|
2435 | l[2] += size | |
2433 |
|
2436 | |||
2434 | numrevs = len(r) |
|
2437 | numrevs = len(r) | |
2435 | for rev in xrange(numrevs): |
|
2438 | for rev in xrange(numrevs): | |
2436 | p1, p2 = r.parentrevs(rev) |
|
2439 | p1, p2 = r.parentrevs(rev) | |
2437 | delta = r.deltaparent(rev) |
|
2440 | delta = r.deltaparent(rev) | |
2438 | if format > 0: |
|
2441 | if format > 0: | |
2439 | addsize(r.rawsize(rev), datasize) |
|
2442 | addsize(r.rawsize(rev), datasize) | |
2440 | if p2 != nullrev: |
|
2443 | if p2 != nullrev: | |
2441 | nummerges += 1 |
|
2444 | nummerges += 1 | |
2442 | size = r.length(rev) |
|
2445 | size = r.length(rev) | |
2443 | if delta == nullrev: |
|
2446 | if delta == nullrev: | |
2444 | chainlengths.append(0) |
|
2447 | chainlengths.append(0) | |
2445 | numfull += 1 |
|
2448 | numfull += 1 | |
2446 | addsize(size, fullsize) |
|
2449 | addsize(size, fullsize) | |
2447 | else: |
|
2450 | else: | |
2448 | chainlengths.append(chainlengths[delta] + 1) |
|
2451 | chainlengths.append(chainlengths[delta] + 1) | |
2449 | addsize(size, deltasize) |
|
2452 | addsize(size, deltasize) | |
2450 | if delta == rev - 1: |
|
2453 | if delta == rev - 1: | |
2451 | numprev += 1 |
|
2454 | numprev += 1 | |
2452 | if delta == p1: |
|
2455 | if delta == p1: | |
2453 | nump1prev += 1 |
|
2456 | nump1prev += 1 | |
2454 | elif delta == p2: |
|
2457 | elif delta == p2: | |
2455 | nump2prev += 1 |
|
2458 | nump2prev += 1 | |
2456 | elif delta == p1: |
|
2459 | elif delta == p1: | |
2457 | nump1 += 1 |
|
2460 | nump1 += 1 | |
2458 | elif delta == p2: |
|
2461 | elif delta == p2: | |
2459 | nump2 += 1 |
|
2462 | nump2 += 1 | |
2460 | elif delta != nullrev: |
|
2463 | elif delta != nullrev: | |
2461 | numother += 1 |
|
2464 | numother += 1 | |
2462 |
|
2465 | |||
2463 | # Adjust size min value for empty cases |
|
2466 | # Adjust size min value for empty cases | |
2464 | for size in (datasize, fullsize, deltasize): |
|
2467 | for size in (datasize, fullsize, deltasize): | |
2465 | if size[0] is None: |
|
2468 | if size[0] is None: | |
2466 | size[0] = 0 |
|
2469 | size[0] = 0 | |
2467 |
|
2470 | |||
2468 | numdeltas = numrevs - numfull |
|
2471 | numdeltas = numrevs - numfull | |
2469 | numoprev = numprev - nump1prev - nump2prev |
|
2472 | numoprev = numprev - nump1prev - nump2prev | |
2470 | totalrawsize = datasize[2] |
|
2473 | totalrawsize = datasize[2] | |
2471 | datasize[2] /= numrevs |
|
2474 | datasize[2] /= numrevs | |
2472 | fulltotal = fullsize[2] |
|
2475 | fulltotal = fullsize[2] | |
2473 | fullsize[2] /= numfull |
|
2476 | fullsize[2] /= numfull | |
2474 | deltatotal = deltasize[2] |
|
2477 | deltatotal = deltasize[2] | |
2475 | if numrevs - numfull > 0: |
|
2478 | if numrevs - numfull > 0: | |
2476 | deltasize[2] /= numrevs - numfull |
|
2479 | deltasize[2] /= numrevs - numfull | |
2477 | totalsize = fulltotal + deltatotal |
|
2480 | totalsize = fulltotal + deltatotal | |
2478 | avgchainlen = sum(chainlengths) / numrevs |
|
2481 | avgchainlen = sum(chainlengths) / numrevs | |
2479 | compratio = totalrawsize / totalsize |
|
2482 | compratio = totalrawsize / totalsize | |
2480 |
|
2483 | |||
2481 | basedfmtstr = '%%%dd\n' |
|
2484 | basedfmtstr = '%%%dd\n' | |
2482 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' |
|
2485 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' | |
2483 |
|
2486 | |||
2484 | def dfmtstr(max): |
|
2487 | def dfmtstr(max): | |
2485 | return basedfmtstr % len(str(max)) |
|
2488 | return basedfmtstr % len(str(max)) | |
2486 | def pcfmtstr(max, padding=0): |
|
2489 | def pcfmtstr(max, padding=0): | |
2487 | return basepcfmtstr % (len(str(max)), ' ' * padding) |
|
2490 | return basepcfmtstr % (len(str(max)), ' ' * padding) | |
2488 |
|
2491 | |||
2489 | def pcfmt(value, total): |
|
2492 | def pcfmt(value, total): | |
2490 | return (value, 100 * float(value) / total) |
|
2493 | return (value, 100 * float(value) / total) | |
2491 |
|
2494 | |||
2492 | ui.write(('format : %d\n') % format) |
|
2495 | ui.write(('format : %d\n') % format) | |
2493 | ui.write(('flags : %s\n') % ', '.join(flags)) |
|
2496 | ui.write(('flags : %s\n') % ', '.join(flags)) | |
2494 |
|
2497 | |||
2495 | ui.write('\n') |
|
2498 | ui.write('\n') | |
2496 | fmt = pcfmtstr(totalsize) |
|
2499 | fmt = pcfmtstr(totalsize) | |
2497 | fmt2 = dfmtstr(totalsize) |
|
2500 | fmt2 = dfmtstr(totalsize) | |
2498 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
2501 | ui.write(('revisions : ') + fmt2 % numrevs) | |
2499 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) |
|
2502 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) | |
2500 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) |
|
2503 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) | |
2501 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
2504 | ui.write(('revisions : ') + fmt2 % numrevs) | |
2502 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) |
|
2505 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) | |
2503 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) |
|
2506 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) | |
2504 | ui.write(('revision size : ') + fmt2 % totalsize) |
|
2507 | ui.write(('revision size : ') + fmt2 % totalsize) | |
2505 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) |
|
2508 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) | |
2506 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) |
|
2509 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) | |
2507 |
|
2510 | |||
2508 | ui.write('\n') |
|
2511 | ui.write('\n') | |
2509 | fmt = dfmtstr(max(avgchainlen, compratio)) |
|
2512 | fmt = dfmtstr(max(avgchainlen, compratio)) | |
2510 | ui.write(('avg chain length : ') + fmt % avgchainlen) |
|
2513 | ui.write(('avg chain length : ') + fmt % avgchainlen) | |
2511 | ui.write(('compression ratio : ') + fmt % compratio) |
|
2514 | ui.write(('compression ratio : ') + fmt % compratio) | |
2512 |
|
2515 | |||
2513 | if format > 0: |
|
2516 | if format > 0: | |
2514 | ui.write('\n') |
|
2517 | ui.write('\n') | |
2515 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') |
|
2518 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') | |
2516 | % tuple(datasize)) |
|
2519 | % tuple(datasize)) | |
2517 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') |
|
2520 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') | |
2518 | % tuple(fullsize)) |
|
2521 | % tuple(fullsize)) | |
2519 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') |
|
2522 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') | |
2520 | % tuple(deltasize)) |
|
2523 | % tuple(deltasize)) | |
2521 |
|
2524 | |||
2522 | if numdeltas > 0: |
|
2525 | if numdeltas > 0: | |
2523 | ui.write('\n') |
|
2526 | ui.write('\n') | |
2524 | fmt = pcfmtstr(numdeltas) |
|
2527 | fmt = pcfmtstr(numdeltas) | |
2525 | fmt2 = pcfmtstr(numdeltas, 4) |
|
2528 | fmt2 = pcfmtstr(numdeltas, 4) | |
2526 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) |
|
2529 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) | |
2527 | if numprev > 0: |
|
2530 | if numprev > 0: | |
2528 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, |
|
2531 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, | |
2529 | numprev)) |
|
2532 | numprev)) | |
2530 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, |
|
2533 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, | |
2531 | numprev)) |
|
2534 | numprev)) | |
2532 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, |
|
2535 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, | |
2533 | numprev)) |
|
2536 | numprev)) | |
2534 | if gdelta: |
|
2537 | if gdelta: | |
2535 | ui.write(('deltas against p1 : ') |
|
2538 | ui.write(('deltas against p1 : ') | |
2536 | + fmt % pcfmt(nump1, numdeltas)) |
|
2539 | + fmt % pcfmt(nump1, numdeltas)) | |
2537 | ui.write(('deltas against p2 : ') |
|
2540 | ui.write(('deltas against p2 : ') | |
2538 | + fmt % pcfmt(nump2, numdeltas)) |
|
2541 | + fmt % pcfmt(nump2, numdeltas)) | |
2539 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, |
|
2542 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, | |
2540 | numdeltas)) |
|
2543 | numdeltas)) | |
2541 |
|
2544 | |||
2542 | @command('debugrevspec', [], ('REVSPEC')) |
|
2545 | @command('debugrevspec', [], ('REVSPEC')) | |
2543 | def debugrevspec(ui, repo, expr): |
|
2546 | def debugrevspec(ui, repo, expr): | |
2544 | """parse and apply a revision specification |
|
2547 | """parse and apply a revision specification | |
2545 |
|
2548 | |||
2546 | Use --verbose to print the parsed tree before and after aliases |
|
2549 | Use --verbose to print the parsed tree before and after aliases | |
2547 | expansion. |
|
2550 | expansion. | |
2548 | """ |
|
2551 | """ | |
2549 | if ui.verbose: |
|
2552 | if ui.verbose: | |
2550 | tree = revset.parse(expr)[0] |
|
2553 | tree = revset.parse(expr)[0] | |
2551 | ui.note(revset.prettyformat(tree), "\n") |
|
2554 | ui.note(revset.prettyformat(tree), "\n") | |
2552 | newtree = revset.findaliases(ui, tree) |
|
2555 | newtree = revset.findaliases(ui, tree) | |
2553 | if newtree != tree: |
|
2556 | if newtree != tree: | |
2554 | ui.note(revset.prettyformat(newtree), "\n") |
|
2557 | ui.note(revset.prettyformat(newtree), "\n") | |
2555 | func = revset.match(ui, expr) |
|
2558 | func = revset.match(ui, expr) | |
2556 | for c in func(repo, range(len(repo))): |
|
2559 | for c in func(repo, range(len(repo))): | |
2557 | ui.write("%s\n" % c) |
|
2560 | ui.write("%s\n" % c) | |
2558 |
|
2561 | |||
2559 | @command('debugsetparents', [], _('REV1 [REV2]')) |
|
2562 | @command('debugsetparents', [], _('REV1 [REV2]')) | |
2560 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
2563 | def debugsetparents(ui, repo, rev1, rev2=None): | |
2561 | """manually set the parents of the current working directory |
|
2564 | """manually set the parents of the current working directory | |
2562 |
|
2565 | |||
2563 | This is useful for writing repository conversion tools, but should |
|
2566 | This is useful for writing repository conversion tools, but should | |
2564 | be used with care. |
|
2567 | be used with care. | |
2565 |
|
2568 | |||
2566 | Returns 0 on success. |
|
2569 | Returns 0 on success. | |
2567 | """ |
|
2570 | """ | |
2568 |
|
2571 | |||
2569 | r1 = scmutil.revsingle(repo, rev1).node() |
|
2572 | r1 = scmutil.revsingle(repo, rev1).node() | |
2570 | r2 = scmutil.revsingle(repo, rev2, 'null').node() |
|
2573 | r2 = scmutil.revsingle(repo, rev2, 'null').node() | |
2571 |
|
2574 | |||
2572 | wlock = repo.wlock() |
|
2575 | wlock = repo.wlock() | |
2573 | try: |
|
2576 | try: | |
2574 | repo.setparents(r1, r2) |
|
2577 | repo.setparents(r1, r2) | |
2575 | finally: |
|
2578 | finally: | |
2576 | wlock.release() |
|
2579 | wlock.release() | |
2577 |
|
2580 | |||
2578 | @command('debugdirstate|debugstate', |
|
2581 | @command('debugdirstate|debugstate', | |
2579 | [('', 'nodates', None, _('do not display the saved mtime')), |
|
2582 | [('', 'nodates', None, _('do not display the saved mtime')), | |
2580 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
2583 | ('', 'datesort', None, _('sort by saved mtime'))], | |
2581 | _('[OPTION]...')) |
|
2584 | _('[OPTION]...')) | |
2582 | def debugstate(ui, repo, nodates=None, datesort=None): |
|
2585 | def debugstate(ui, repo, nodates=None, datesort=None): | |
2583 | """show the contents of the current dirstate""" |
|
2586 | """show the contents of the current dirstate""" | |
2584 | timestr = "" |
|
2587 | timestr = "" | |
2585 | showdate = not nodates |
|
2588 | showdate = not nodates | |
2586 | if datesort: |
|
2589 | if datesort: | |
2587 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
|
2590 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename | |
2588 | else: |
|
2591 | else: | |
2589 | keyfunc = None # sort by filename |
|
2592 | keyfunc = None # sort by filename | |
2590 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): |
|
2593 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | |
2591 | if showdate: |
|
2594 | if showdate: | |
2592 | if ent[3] == -1: |
|
2595 | if ent[3] == -1: | |
2593 | # Pad or slice to locale representation |
|
2596 | # Pad or slice to locale representation | |
2594 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2597 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", | |
2595 | time.localtime(0))) |
|
2598 | time.localtime(0))) | |
2596 | timestr = 'unset' |
|
2599 | timestr = 'unset' | |
2597 | timestr = (timestr[:locale_len] + |
|
2600 | timestr = (timestr[:locale_len] + | |
2598 | ' ' * (locale_len - len(timestr))) |
|
2601 | ' ' * (locale_len - len(timestr))) | |
2599 | else: |
|
2602 | else: | |
2600 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2603 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", | |
2601 | time.localtime(ent[3])) |
|
2604 | time.localtime(ent[3])) | |
2602 | if ent[1] & 020000: |
|
2605 | if ent[1] & 020000: | |
2603 | mode = 'lnk' |
|
2606 | mode = 'lnk' | |
2604 | else: |
|
2607 | else: | |
2605 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) |
|
2608 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) | |
2606 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
2609 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) | |
2607 | for f in repo.dirstate.copies(): |
|
2610 | for f in repo.dirstate.copies(): | |
2608 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
2611 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | |
2609 |
|
2612 | |||
2610 | @command('debugsub', |
|
2613 | @command('debugsub', | |
2611 | [('r', 'rev', '', |
|
2614 | [('r', 'rev', '', | |
2612 | _('revision to check'), _('REV'))], |
|
2615 | _('revision to check'), _('REV'))], | |
2613 | _('[-r REV] [REV]')) |
|
2616 | _('[-r REV] [REV]')) | |
2614 | def debugsub(ui, repo, rev=None): |
|
2617 | def debugsub(ui, repo, rev=None): | |
2615 | ctx = scmutil.revsingle(repo, rev, None) |
|
2618 | ctx = scmutil.revsingle(repo, rev, None) | |
2616 | for k, v in sorted(ctx.substate.items()): |
|
2619 | for k, v in sorted(ctx.substate.items()): | |
2617 | ui.write(('path %s\n') % k) |
|
2620 | ui.write(('path %s\n') % k) | |
2618 | ui.write((' source %s\n') % v[0]) |
|
2621 | ui.write((' source %s\n') % v[0]) | |
2619 | ui.write((' revision %s\n') % v[1]) |
|
2622 | ui.write((' revision %s\n') % v[1]) | |
2620 |
|
2623 | |||
2621 | @command('debugsuccessorssets', |
|
2624 | @command('debugsuccessorssets', | |
2622 | [], |
|
2625 | [], | |
2623 | _('[REV]')) |
|
2626 | _('[REV]')) | |
2624 | def debugsuccessorssets(ui, repo, *revs): |
|
2627 | def debugsuccessorssets(ui, repo, *revs): | |
2625 | """show set of successors for revision |
|
2628 | """show set of successors for revision | |
2626 |
|
2629 | |||
2627 | A successors set of changeset A is a consistent group of revisions that |
|
2630 | A successors set of changeset A is a consistent group of revisions that | |
2628 | succeed A. It contains non-obsolete changesets only. |
|
2631 | succeed A. It contains non-obsolete changesets only. | |
2629 |
|
2632 | |||
2630 | In most cases a changeset A has a single successors set containing a single |
|
2633 | In most cases a changeset A has a single successors set containing a single | |
2631 | successor (changeset A replaced by A'). |
|
2634 | successor (changeset A replaced by A'). | |
2632 |
|
2635 | |||
2633 | A changeset that is made obsolete with no successors are called "pruned". |
|
2636 | A changeset that is made obsolete with no successors are called "pruned". | |
2634 | Such changesets have no successors sets at all. |
|
2637 | Such changesets have no successors sets at all. | |
2635 |
|
2638 | |||
2636 | A changeset that has been "split" will have a successors set containing |
|
2639 | A changeset that has been "split" will have a successors set containing | |
2637 | more than one successor. |
|
2640 | more than one successor. | |
2638 |
|
2641 | |||
2639 | A changeset that has been rewritten in multiple different ways is called |
|
2642 | A changeset that has been rewritten in multiple different ways is called | |
2640 | "divergent". Such changesets have multiple successor sets (each of which |
|
2643 | "divergent". Such changesets have multiple successor sets (each of which | |
2641 | may also be split, i.e. have multiple successors). |
|
2644 | may also be split, i.e. have multiple successors). | |
2642 |
|
2645 | |||
2643 | Results are displayed as follows:: |
|
2646 | Results are displayed as follows:: | |
2644 |
|
2647 | |||
2645 | <rev1> |
|
2648 | <rev1> | |
2646 | <successors-1A> |
|
2649 | <successors-1A> | |
2647 | <rev2> |
|
2650 | <rev2> | |
2648 | <successors-2A> |
|
2651 | <successors-2A> | |
2649 | <successors-2B1> <successors-2B2> <successors-2B3> |
|
2652 | <successors-2B1> <successors-2B2> <successors-2B3> | |
2650 |
|
2653 | |||
2651 | Here rev2 has two possible (i.e. divergent) successors sets. The first |
|
2654 | Here rev2 has two possible (i.e. divergent) successors sets. The first | |
2652 | holds one element, whereas the second holds three (i.e. the changeset has |
|
2655 | holds one element, whereas the second holds three (i.e. the changeset has | |
2653 | been split). |
|
2656 | been split). | |
2654 | """ |
|
2657 | """ | |
2655 | # passed to successorssets caching computation from one call to another |
|
2658 | # passed to successorssets caching computation from one call to another | |
2656 | cache = {} |
|
2659 | cache = {} | |
2657 | ctx2str = str |
|
2660 | ctx2str = str | |
2658 | node2str = short |
|
2661 | node2str = short | |
2659 | if ui.debug(): |
|
2662 | if ui.debug(): | |
2660 | def ctx2str(ctx): |
|
2663 | def ctx2str(ctx): | |
2661 | return ctx.hex() |
|
2664 | return ctx.hex() | |
2662 | node2str = hex |
|
2665 | node2str = hex | |
2663 | for rev in scmutil.revrange(repo, revs): |
|
2666 | for rev in scmutil.revrange(repo, revs): | |
2664 | ctx = repo[rev] |
|
2667 | ctx = repo[rev] | |
2665 | ui.write('%s\n'% ctx2str(ctx)) |
|
2668 | ui.write('%s\n'% ctx2str(ctx)) | |
2666 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): |
|
2669 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): | |
2667 | if succsset: |
|
2670 | if succsset: | |
2668 | ui.write(' ') |
|
2671 | ui.write(' ') | |
2669 | ui.write(node2str(succsset[0])) |
|
2672 | ui.write(node2str(succsset[0])) | |
2670 | for node in succsset[1:]: |
|
2673 | for node in succsset[1:]: | |
2671 | ui.write(' ') |
|
2674 | ui.write(' ') | |
2672 | ui.write(node2str(node)) |
|
2675 | ui.write(node2str(node)) | |
2673 | ui.write('\n') |
|
2676 | ui.write('\n') | |
2674 |
|
2677 | |||
2675 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) |
|
2678 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) | |
2676 | def debugwalk(ui, repo, *pats, **opts): |
|
2679 | def debugwalk(ui, repo, *pats, **opts): | |
2677 | """show how files match on given patterns""" |
|
2680 | """show how files match on given patterns""" | |
2678 | m = scmutil.match(repo[None], pats, opts) |
|
2681 | m = scmutil.match(repo[None], pats, opts) | |
2679 | items = list(repo.walk(m)) |
|
2682 | items = list(repo.walk(m)) | |
2680 | if not items: |
|
2683 | if not items: | |
2681 | return |
|
2684 | return | |
2682 | f = lambda fn: fn |
|
2685 | f = lambda fn: fn | |
2683 | if ui.configbool('ui', 'slash') and os.sep != '/': |
|
2686 | if ui.configbool('ui', 'slash') and os.sep != '/': | |
2684 | f = lambda fn: util.normpath(fn) |
|
2687 | f = lambda fn: util.normpath(fn) | |
2685 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
2688 | fmt = 'f %%-%ds %%-%ds %%s' % ( | |
2686 | max([len(abs) for abs in items]), |
|
2689 | max([len(abs) for abs in items]), | |
2687 | max([len(m.rel(abs)) for abs in items])) |
|
2690 | max([len(m.rel(abs)) for abs in items])) | |
2688 | for abs in items: |
|
2691 | for abs in items: | |
2689 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') |
|
2692 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') | |
2690 | ui.write("%s\n" % line.rstrip()) |
|
2693 | ui.write("%s\n" % line.rstrip()) | |
2691 |
|
2694 | |||
2692 | @command('debugwireargs', |
|
2695 | @command('debugwireargs', | |
2693 | [('', 'three', '', 'three'), |
|
2696 | [('', 'three', '', 'three'), | |
2694 | ('', 'four', '', 'four'), |
|
2697 | ('', 'four', '', 'four'), | |
2695 | ('', 'five', '', 'five'), |
|
2698 | ('', 'five', '', 'five'), | |
2696 | ] + remoteopts, |
|
2699 | ] + remoteopts, | |
2697 | _('REPO [OPTIONS]... [ONE [TWO]]')) |
|
2700 | _('REPO [OPTIONS]... [ONE [TWO]]')) | |
2698 | def debugwireargs(ui, repopath, *vals, **opts): |
|
2701 | def debugwireargs(ui, repopath, *vals, **opts): | |
2699 | repo = hg.peer(ui, opts, repopath) |
|
2702 | repo = hg.peer(ui, opts, repopath) | |
2700 | for opt in remoteopts: |
|
2703 | for opt in remoteopts: | |
2701 | del opts[opt[1]] |
|
2704 | del opts[opt[1]] | |
2702 | args = {} |
|
2705 | args = {} | |
2703 | for k, v in opts.iteritems(): |
|
2706 | for k, v in opts.iteritems(): | |
2704 | if v: |
|
2707 | if v: | |
2705 | args[k] = v |
|
2708 | args[k] = v | |
2706 | # run twice to check that we don't mess up the stream for the next command |
|
2709 | # run twice to check that we don't mess up the stream for the next command | |
2707 | res1 = repo.debugwireargs(*vals, **args) |
|
2710 | res1 = repo.debugwireargs(*vals, **args) | |
2708 | res2 = repo.debugwireargs(*vals, **args) |
|
2711 | res2 = repo.debugwireargs(*vals, **args) | |
2709 | ui.write("%s\n" % res1) |
|
2712 | ui.write("%s\n" % res1) | |
2710 | if res1 != res2: |
|
2713 | if res1 != res2: | |
2711 | ui.warn("%s\n" % res2) |
|
2714 | ui.warn("%s\n" % res2) | |
2712 |
|
2715 | |||
2713 | @command('^diff', |
|
2716 | @command('^diff', | |
2714 | [('r', 'rev', [], _('revision'), _('REV')), |
|
2717 | [('r', 'rev', [], _('revision'), _('REV')), | |
2715 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
2718 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
2716 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
2719 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
2717 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) |
|
2720 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) | |
2718 | def diff(ui, repo, *pats, **opts): |
|
2721 | def diff(ui, repo, *pats, **opts): | |
2719 | """diff repository (or selected files) |
|
2722 | """diff repository (or selected files) | |
2720 |
|
2723 | |||
2721 | Show differences between revisions for the specified files. |
|
2724 | Show differences between revisions for the specified files. | |
2722 |
|
2725 | |||
2723 | Differences between files are shown using the unified diff format. |
|
2726 | Differences between files are shown using the unified diff format. | |
2724 |
|
2727 | |||
2725 | .. note:: |
|
2728 | .. note:: | |
2726 |
|
2729 | |||
2727 | diff may generate unexpected results for merges, as it will |
|
2730 | diff may generate unexpected results for merges, as it will | |
2728 | default to comparing against the working directory's first |
|
2731 | default to comparing against the working directory's first | |
2729 | parent changeset if no revisions are specified. |
|
2732 | parent changeset if no revisions are specified. | |
2730 |
|
2733 | |||
2731 | When two revision arguments are given, then changes are shown |
|
2734 | When two revision arguments are given, then changes are shown | |
2732 | between those revisions. If only one revision is specified then |
|
2735 | between those revisions. If only one revision is specified then | |
2733 | that revision is compared to the working directory, and, when no |
|
2736 | that revision is compared to the working directory, and, when no | |
2734 | revisions are specified, the working directory files are compared |
|
2737 | revisions are specified, the working directory files are compared | |
2735 | to its parent. |
|
2738 | to its parent. | |
2736 |
|
2739 | |||
2737 | Alternatively you can specify -c/--change with a revision to see |
|
2740 | Alternatively you can specify -c/--change with a revision to see | |
2738 | the changes in that changeset relative to its first parent. |
|
2741 | the changes in that changeset relative to its first parent. | |
2739 |
|
2742 | |||
2740 | Without the -a/--text option, diff will avoid generating diffs of |
|
2743 | Without the -a/--text option, diff will avoid generating diffs of | |
2741 | files it detects as binary. With -a, diff will generate a diff |
|
2744 | files it detects as binary. With -a, diff will generate a diff | |
2742 | anyway, probably with undesirable results. |
|
2745 | anyway, probably with undesirable results. | |
2743 |
|
2746 | |||
2744 | Use the -g/--git option to generate diffs in the git extended diff |
|
2747 | Use the -g/--git option to generate diffs in the git extended diff | |
2745 | format. For more information, read :hg:`help diffs`. |
|
2748 | format. For more information, read :hg:`help diffs`. | |
2746 |
|
2749 | |||
2747 | .. container:: verbose |
|
2750 | .. container:: verbose | |
2748 |
|
2751 | |||
2749 | Examples: |
|
2752 | Examples: | |
2750 |
|
2753 | |||
2751 | - compare a file in the current working directory to its parent:: |
|
2754 | - compare a file in the current working directory to its parent:: | |
2752 |
|
2755 | |||
2753 | hg diff foo.c |
|
2756 | hg diff foo.c | |
2754 |
|
2757 | |||
2755 | - compare two historical versions of a directory, with rename info:: |
|
2758 | - compare two historical versions of a directory, with rename info:: | |
2756 |
|
2759 | |||
2757 | hg diff --git -r 1.0:1.2 lib/ |
|
2760 | hg diff --git -r 1.0:1.2 lib/ | |
2758 |
|
2761 | |||
2759 | - get change stats relative to the last change on some date:: |
|
2762 | - get change stats relative to the last change on some date:: | |
2760 |
|
2763 | |||
2761 | hg diff --stat -r "date('may 2')" |
|
2764 | hg diff --stat -r "date('may 2')" | |
2762 |
|
2765 | |||
2763 | - diff all newly-added files that contain a keyword:: |
|
2766 | - diff all newly-added files that contain a keyword:: | |
2764 |
|
2767 | |||
2765 | hg diff "set:added() and grep(GNU)" |
|
2768 | hg diff "set:added() and grep(GNU)" | |
2766 |
|
2769 | |||
2767 | - compare a revision and its parents:: |
|
2770 | - compare a revision and its parents:: | |
2768 |
|
2771 | |||
2769 | hg diff -c 9353 # compare against first parent |
|
2772 | hg diff -c 9353 # compare against first parent | |
2770 | hg diff -r 9353^:9353 # same using revset syntax |
|
2773 | hg diff -r 9353^:9353 # same using revset syntax | |
2771 | hg diff -r 9353^2:9353 # compare against the second parent |
|
2774 | hg diff -r 9353^2:9353 # compare against the second parent | |
2772 |
|
2775 | |||
2773 | Returns 0 on success. |
|
2776 | Returns 0 on success. | |
2774 | """ |
|
2777 | """ | |
2775 |
|
2778 | |||
2776 | revs = opts.get('rev') |
|
2779 | revs = opts.get('rev') | |
2777 | change = opts.get('change') |
|
2780 | change = opts.get('change') | |
2778 | stat = opts.get('stat') |
|
2781 | stat = opts.get('stat') | |
2779 | reverse = opts.get('reverse') |
|
2782 | reverse = opts.get('reverse') | |
2780 |
|
2783 | |||
2781 | if revs and change: |
|
2784 | if revs and change: | |
2782 | msg = _('cannot specify --rev and --change at the same time') |
|
2785 | msg = _('cannot specify --rev and --change at the same time') | |
2783 | raise util.Abort(msg) |
|
2786 | raise util.Abort(msg) | |
2784 | elif change: |
|
2787 | elif change: | |
2785 | node2 = scmutil.revsingle(repo, change, None).node() |
|
2788 | node2 = scmutil.revsingle(repo, change, None).node() | |
2786 | node1 = repo[node2].p1().node() |
|
2789 | node1 = repo[node2].p1().node() | |
2787 | else: |
|
2790 | else: | |
2788 | node1, node2 = scmutil.revpair(repo, revs) |
|
2791 | node1, node2 = scmutil.revpair(repo, revs) | |
2789 |
|
2792 | |||
2790 | if reverse: |
|
2793 | if reverse: | |
2791 | node1, node2 = node2, node1 |
|
2794 | node1, node2 = node2, node1 | |
2792 |
|
2795 | |||
2793 | diffopts = patch.diffopts(ui, opts) |
|
2796 | diffopts = patch.diffopts(ui, opts) | |
2794 | m = scmutil.match(repo[node2], pats, opts) |
|
2797 | m = scmutil.match(repo[node2], pats, opts) | |
2795 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
2798 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
2796 | listsubrepos=opts.get('subrepos')) |
|
2799 | listsubrepos=opts.get('subrepos')) | |
2797 |
|
2800 | |||
2798 | @command('^export', |
|
2801 | @command('^export', | |
2799 | [('o', 'output', '', |
|
2802 | [('o', 'output', '', | |
2800 | _('print output to file with formatted name'), _('FORMAT')), |
|
2803 | _('print output to file with formatted name'), _('FORMAT')), | |
2801 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
2804 | ('', 'switch-parent', None, _('diff against the second parent')), | |
2802 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
2805 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
2803 | ] + diffopts, |
|
2806 | ] + diffopts, | |
2804 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) |
|
2807 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) | |
2805 | def export(ui, repo, *changesets, **opts): |
|
2808 | def export(ui, repo, *changesets, **opts): | |
2806 | """dump the header and diffs for one or more changesets |
|
2809 | """dump the header and diffs for one or more changesets | |
2807 |
|
2810 | |||
2808 | Print the changeset header and diffs for one or more revisions. |
|
2811 | Print the changeset header and diffs for one or more revisions. | |
2809 | If no revision is given, the parent of the working directory is used. |
|
2812 | If no revision is given, the parent of the working directory is used. | |
2810 |
|
2813 | |||
2811 | The information shown in the changeset header is: author, date, |
|
2814 | The information shown in the changeset header is: author, date, | |
2812 | branch name (if non-default), changeset hash, parent(s) and commit |
|
2815 | branch name (if non-default), changeset hash, parent(s) and commit | |
2813 | comment. |
|
2816 | comment. | |
2814 |
|
2817 | |||
2815 | .. note:: |
|
2818 | .. note:: | |
2816 |
|
2819 | |||
2817 | export may generate unexpected diff output for merge |
|
2820 | export may generate unexpected diff output for merge | |
2818 | changesets, as it will compare the merge changeset against its |
|
2821 | changesets, as it will compare the merge changeset against its | |
2819 | first parent only. |
|
2822 | first parent only. | |
2820 |
|
2823 | |||
2821 | Output may be to a file, in which case the name of the file is |
|
2824 | Output may be to a file, in which case the name of the file is | |
2822 | given using a format string. The formatting rules are as follows: |
|
2825 | given using a format string. The formatting rules are as follows: | |
2823 |
|
2826 | |||
2824 | :``%%``: literal "%" character |
|
2827 | :``%%``: literal "%" character | |
2825 | :``%H``: changeset hash (40 hexadecimal digits) |
|
2828 | :``%H``: changeset hash (40 hexadecimal digits) | |
2826 | :``%N``: number of patches being generated |
|
2829 | :``%N``: number of patches being generated | |
2827 | :``%R``: changeset revision number |
|
2830 | :``%R``: changeset revision number | |
2828 | :``%b``: basename of the exporting repository |
|
2831 | :``%b``: basename of the exporting repository | |
2829 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
2832 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
2830 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
2833 | :``%m``: first line of the commit message (only alphanumeric characters) | |
2831 | :``%n``: zero-padded sequence number, starting at 1 |
|
2834 | :``%n``: zero-padded sequence number, starting at 1 | |
2832 | :``%r``: zero-padded changeset revision number |
|
2835 | :``%r``: zero-padded changeset revision number | |
2833 |
|
2836 | |||
2834 | Without the -a/--text option, export will avoid generating diffs |
|
2837 | Without the -a/--text option, export will avoid generating diffs | |
2835 | of files it detects as binary. With -a, export will generate a |
|
2838 | of files it detects as binary. With -a, export will generate a | |
2836 | diff anyway, probably with undesirable results. |
|
2839 | diff anyway, probably with undesirable results. | |
2837 |
|
2840 | |||
2838 | Use the -g/--git option to generate diffs in the git extended diff |
|
2841 | Use the -g/--git option to generate diffs in the git extended diff | |
2839 | format. See :hg:`help diffs` for more information. |
|
2842 | format. See :hg:`help diffs` for more information. | |
2840 |
|
2843 | |||
2841 | With the --switch-parent option, the diff will be against the |
|
2844 | With the --switch-parent option, the diff will be against the | |
2842 | second parent. It can be useful to review a merge. |
|
2845 | second parent. It can be useful to review a merge. | |
2843 |
|
2846 | |||
2844 | .. container:: verbose |
|
2847 | .. container:: verbose | |
2845 |
|
2848 | |||
2846 | Examples: |
|
2849 | Examples: | |
2847 |
|
2850 | |||
2848 | - use export and import to transplant a bugfix to the current |
|
2851 | - use export and import to transplant a bugfix to the current | |
2849 | branch:: |
|
2852 | branch:: | |
2850 |
|
2853 | |||
2851 | hg export -r 9353 | hg import - |
|
2854 | hg export -r 9353 | hg import - | |
2852 |
|
2855 | |||
2853 | - export all the changesets between two revisions to a file with |
|
2856 | - export all the changesets between two revisions to a file with | |
2854 | rename information:: |
|
2857 | rename information:: | |
2855 |
|
2858 | |||
2856 | hg export --git -r 123:150 > changes.txt |
|
2859 | hg export --git -r 123:150 > changes.txt | |
2857 |
|
2860 | |||
2858 | - split outgoing changes into a series of patches with |
|
2861 | - split outgoing changes into a series of patches with | |
2859 | descriptive names:: |
|
2862 | descriptive names:: | |
2860 |
|
2863 | |||
2861 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
2864 | hg export -r "outgoing()" -o "%n-%m.patch" | |
2862 |
|
2865 | |||
2863 | Returns 0 on success. |
|
2866 | Returns 0 on success. | |
2864 | """ |
|
2867 | """ | |
2865 | changesets += tuple(opts.get('rev', [])) |
|
2868 | changesets += tuple(opts.get('rev', [])) | |
2866 | if not changesets: |
|
2869 | if not changesets: | |
2867 | changesets = ['.'] |
|
2870 | changesets = ['.'] | |
2868 | revs = scmutil.revrange(repo, changesets) |
|
2871 | revs = scmutil.revrange(repo, changesets) | |
2869 | if not revs: |
|
2872 | if not revs: | |
2870 | raise util.Abort(_("export requires at least one changeset")) |
|
2873 | raise util.Abort(_("export requires at least one changeset")) | |
2871 | if len(revs) > 1: |
|
2874 | if len(revs) > 1: | |
2872 | ui.note(_('exporting patches:\n')) |
|
2875 | ui.note(_('exporting patches:\n')) | |
2873 | else: |
|
2876 | else: | |
2874 | ui.note(_('exporting patch:\n')) |
|
2877 | ui.note(_('exporting patch:\n')) | |
2875 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
2878 | cmdutil.export(repo, revs, template=opts.get('output'), | |
2876 | switch_parent=opts.get('switch_parent'), |
|
2879 | switch_parent=opts.get('switch_parent'), | |
2877 | opts=patch.diffopts(ui, opts)) |
|
2880 | opts=patch.diffopts(ui, opts)) | |
2878 |
|
2881 | |||
2879 | @command('^forget', walkopts, _('[OPTION]... FILE...')) |
|
2882 | @command('^forget', walkopts, _('[OPTION]... FILE...')) | |
2880 | def forget(ui, repo, *pats, **opts): |
|
2883 | def forget(ui, repo, *pats, **opts): | |
2881 | """forget the specified files on the next commit |
|
2884 | """forget the specified files on the next commit | |
2882 |
|
2885 | |||
2883 | Mark the specified files so they will no longer be tracked |
|
2886 | Mark the specified files so they will no longer be tracked | |
2884 | after the next commit. |
|
2887 | after the next commit. | |
2885 |
|
2888 | |||
2886 | This only removes files from the current branch, not from the |
|
2889 | This only removes files from the current branch, not from the | |
2887 | entire project history, and it does not delete them from the |
|
2890 | entire project history, and it does not delete them from the | |
2888 | working directory. |
|
2891 | working directory. | |
2889 |
|
2892 | |||
2890 | To undo a forget before the next commit, see :hg:`add`. |
|
2893 | To undo a forget before the next commit, see :hg:`add`. | |
2891 |
|
2894 | |||
2892 | .. container:: verbose |
|
2895 | .. container:: verbose | |
2893 |
|
2896 | |||
2894 | Examples: |
|
2897 | Examples: | |
2895 |
|
2898 | |||
2896 | - forget newly-added binary files:: |
|
2899 | - forget newly-added binary files:: | |
2897 |
|
2900 | |||
2898 | hg forget "set:added() and binary()" |
|
2901 | hg forget "set:added() and binary()" | |
2899 |
|
2902 | |||
2900 | - forget files that would be excluded by .hgignore:: |
|
2903 | - forget files that would be excluded by .hgignore:: | |
2901 |
|
2904 | |||
2902 | hg forget "set:hgignore()" |
|
2905 | hg forget "set:hgignore()" | |
2903 |
|
2906 | |||
2904 | Returns 0 on success. |
|
2907 | Returns 0 on success. | |
2905 | """ |
|
2908 | """ | |
2906 |
|
2909 | |||
2907 | if not pats: |
|
2910 | if not pats: | |
2908 | raise util.Abort(_('no files specified')) |
|
2911 | raise util.Abort(_('no files specified')) | |
2909 |
|
2912 | |||
2910 | m = scmutil.match(repo[None], pats, opts) |
|
2913 | m = scmutil.match(repo[None], pats, opts) | |
2911 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
2914 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] | |
2912 | return rejected and 1 or 0 |
|
2915 | return rejected and 1 or 0 | |
2913 |
|
2916 | |||
2914 | @command( |
|
2917 | @command( | |
2915 | 'graft', |
|
2918 | 'graft', | |
2916 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
2919 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
2917 | ('c', 'continue', False, _('resume interrupted graft')), |
|
2920 | ('c', 'continue', False, _('resume interrupted graft')), | |
2918 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2921 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2919 | ('', 'log', None, _('append graft info to log message')), |
|
2922 | ('', 'log', None, _('append graft info to log message')), | |
2920 | ('D', 'currentdate', False, |
|
2923 | ('D', 'currentdate', False, | |
2921 | _('record the current date as commit date')), |
|
2924 | _('record the current date as commit date')), | |
2922 | ('U', 'currentuser', False, |
|
2925 | ('U', 'currentuser', False, | |
2923 | _('record the current user as committer'), _('DATE'))] |
|
2926 | _('record the current user as committer'), _('DATE'))] | |
2924 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2927 | + commitopts2 + mergetoolopts + dryrunopts, | |
2925 | _('[OPTION]... [-r] REV...')) |
|
2928 | _('[OPTION]... [-r] REV...')) | |
2926 | def graft(ui, repo, *revs, **opts): |
|
2929 | def graft(ui, repo, *revs, **opts): | |
2927 | '''copy changes from other branches onto the current branch |
|
2930 | '''copy changes from other branches onto the current branch | |
2928 |
|
2931 | |||
2929 | This command uses Mercurial's merge logic to copy individual |
|
2932 | This command uses Mercurial's merge logic to copy individual | |
2930 | changes from other branches without merging branches in the |
|
2933 | changes from other branches without merging branches in the | |
2931 | history graph. This is sometimes known as 'backporting' or |
|
2934 | history graph. This is sometimes known as 'backporting' or | |
2932 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2935 | 'cherry-picking'. By default, graft will copy user, date, and | |
2933 | description from the source changesets. |
|
2936 | description from the source changesets. | |
2934 |
|
2937 | |||
2935 | Changesets that are ancestors of the current revision, that have |
|
2938 | Changesets that are ancestors of the current revision, that have | |
2936 | already been grafted, or that are merges will be skipped. |
|
2939 | already been grafted, or that are merges will be skipped. | |
2937 |
|
2940 | |||
2938 | If --log is specified, log messages will have a comment appended |
|
2941 | If --log is specified, log messages will have a comment appended | |
2939 | of the form:: |
|
2942 | of the form:: | |
2940 |
|
2943 | |||
2941 | (grafted from CHANGESETHASH) |
|
2944 | (grafted from CHANGESETHASH) | |
2942 |
|
2945 | |||
2943 | If a graft merge results in conflicts, the graft process is |
|
2946 | If a graft merge results in conflicts, the graft process is | |
2944 | interrupted so that the current merge can be manually resolved. |
|
2947 | interrupted so that the current merge can be manually resolved. | |
2945 | Once all conflicts are addressed, the graft process can be |
|
2948 | Once all conflicts are addressed, the graft process can be | |
2946 | continued with the -c/--continue option. |
|
2949 | continued with the -c/--continue option. | |
2947 |
|
2950 | |||
2948 | .. note:: |
|
2951 | .. note:: | |
2949 |
|
2952 | |||
2950 | The -c/--continue option does not reapply earlier options. |
|
2953 | The -c/--continue option does not reapply earlier options. | |
2951 |
|
2954 | |||
2952 | .. container:: verbose |
|
2955 | .. container:: verbose | |
2953 |
|
2956 | |||
2954 | Examples: |
|
2957 | Examples: | |
2955 |
|
2958 | |||
2956 | - copy a single change to the stable branch and edit its description:: |
|
2959 | - copy a single change to the stable branch and edit its description:: | |
2957 |
|
2960 | |||
2958 | hg update stable |
|
2961 | hg update stable | |
2959 | hg graft --edit 9393 |
|
2962 | hg graft --edit 9393 | |
2960 |
|
2963 | |||
2961 | - graft a range of changesets with one exception, updating dates:: |
|
2964 | - graft a range of changesets with one exception, updating dates:: | |
2962 |
|
2965 | |||
2963 | hg graft -D "2085::2093 and not 2091" |
|
2966 | hg graft -D "2085::2093 and not 2091" | |
2964 |
|
2967 | |||
2965 | - continue a graft after resolving conflicts:: |
|
2968 | - continue a graft after resolving conflicts:: | |
2966 |
|
2969 | |||
2967 | hg graft -c |
|
2970 | hg graft -c | |
2968 |
|
2971 | |||
2969 | - show the source of a grafted changeset:: |
|
2972 | - show the source of a grafted changeset:: | |
2970 |
|
2973 | |||
2971 | hg log --debug -r . |
|
2974 | hg log --debug -r . | |
2972 |
|
2975 | |||
2973 | Returns 0 on successful completion. |
|
2976 | Returns 0 on successful completion. | |
2974 | ''' |
|
2977 | ''' | |
2975 |
|
2978 | |||
2976 | revs = list(revs) |
|
2979 | revs = list(revs) | |
2977 | revs.extend(opts['rev']) |
|
2980 | revs.extend(opts['rev']) | |
2978 |
|
2981 | |||
2979 | if not opts.get('user') and opts.get('currentuser'): |
|
2982 | if not opts.get('user') and opts.get('currentuser'): | |
2980 | opts['user'] = ui.username() |
|
2983 | opts['user'] = ui.username() | |
2981 | if not opts.get('date') and opts.get('currentdate'): |
|
2984 | if not opts.get('date') and opts.get('currentdate'): | |
2982 | opts['date'] = "%d %d" % util.makedate() |
|
2985 | opts['date'] = "%d %d" % util.makedate() | |
2983 |
|
2986 | |||
2984 | editor = None |
|
2987 | editor = None | |
2985 | if opts.get('edit'): |
|
2988 | if opts.get('edit'): | |
2986 | editor = cmdutil.commitforceeditor |
|
2989 | editor = cmdutil.commitforceeditor | |
2987 |
|
2990 | |||
2988 | cont = False |
|
2991 | cont = False | |
2989 | if opts['continue']: |
|
2992 | if opts['continue']: | |
2990 | cont = True |
|
2993 | cont = True | |
2991 | if revs: |
|
2994 | if revs: | |
2992 | raise util.Abort(_("can't specify --continue and revisions")) |
|
2995 | raise util.Abort(_("can't specify --continue and revisions")) | |
2993 | # read in unfinished revisions |
|
2996 | # read in unfinished revisions | |
2994 | try: |
|
2997 | try: | |
2995 | nodes = repo.opener.read('graftstate').splitlines() |
|
2998 | nodes = repo.opener.read('graftstate').splitlines() | |
2996 | revs = [repo[node].rev() for node in nodes] |
|
2999 | revs = [repo[node].rev() for node in nodes] | |
2997 | except IOError, inst: |
|
3000 | except IOError, inst: | |
2998 | if inst.errno != errno.ENOENT: |
|
3001 | if inst.errno != errno.ENOENT: | |
2999 | raise |
|
3002 | raise | |
3000 | raise util.Abort(_("no graft state found, can't continue")) |
|
3003 | raise util.Abort(_("no graft state found, can't continue")) | |
3001 | else: |
|
3004 | else: | |
3002 | cmdutil.checkunfinished(repo) |
|
3005 | cmdutil.checkunfinished(repo) | |
3003 | cmdutil.bailifchanged(repo) |
|
3006 | cmdutil.bailifchanged(repo) | |
3004 | if not revs: |
|
3007 | if not revs: | |
3005 | raise util.Abort(_('no revisions specified')) |
|
3008 | raise util.Abort(_('no revisions specified')) | |
3006 | revs = scmutil.revrange(repo, revs) |
|
3009 | revs = scmutil.revrange(repo, revs) | |
3007 |
|
3010 | |||
3008 | # check for merges |
|
3011 | # check for merges | |
3009 | for rev in repo.revs('%ld and merge()', revs): |
|
3012 | for rev in repo.revs('%ld and merge()', revs): | |
3010 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) |
|
3013 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) | |
3011 | revs.remove(rev) |
|
3014 | revs.remove(rev) | |
3012 | if not revs: |
|
3015 | if not revs: | |
3013 | return -1 |
|
3016 | return -1 | |
3014 |
|
3017 | |||
3015 | # check for ancestors of dest branch |
|
3018 | # check for ancestors of dest branch | |
3016 | crev = repo['.'].rev() |
|
3019 | crev = repo['.'].rev() | |
3017 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
3020 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
3018 | # don't mutate while iterating, create a copy |
|
3021 | # don't mutate while iterating, create a copy | |
3019 | for rev in list(revs): |
|
3022 | for rev in list(revs): | |
3020 | if rev in ancestors: |
|
3023 | if rev in ancestors: | |
3021 | ui.warn(_('skipping ancestor revision %s\n') % rev) |
|
3024 | ui.warn(_('skipping ancestor revision %s\n') % rev) | |
3022 | revs.remove(rev) |
|
3025 | revs.remove(rev) | |
3023 | if not revs: |
|
3026 | if not revs: | |
3024 | return -1 |
|
3027 | return -1 | |
3025 |
|
3028 | |||
3026 | # analyze revs for earlier grafts |
|
3029 | # analyze revs for earlier grafts | |
3027 | ids = {} |
|
3030 | ids = {} | |
3028 | for ctx in repo.set("%ld", revs): |
|
3031 | for ctx in repo.set("%ld", revs): | |
3029 | ids[ctx.hex()] = ctx.rev() |
|
3032 | ids[ctx.hex()] = ctx.rev() | |
3030 | n = ctx.extra().get('source') |
|
3033 | n = ctx.extra().get('source') | |
3031 | if n: |
|
3034 | if n: | |
3032 | ids[n] = ctx.rev() |
|
3035 | ids[n] = ctx.rev() | |
3033 |
|
3036 | |||
3034 | # check ancestors for earlier grafts |
|
3037 | # check ancestors for earlier grafts | |
3035 | ui.debug('scanning for duplicate grafts\n') |
|
3038 | ui.debug('scanning for duplicate grafts\n') | |
3036 |
|
3039 | |||
3037 | for rev in repo.changelog.findmissingrevs(revs, [crev]): |
|
3040 | for rev in repo.changelog.findmissingrevs(revs, [crev]): | |
3038 | ctx = repo[rev] |
|
3041 | ctx = repo[rev] | |
3039 | n = ctx.extra().get('source') |
|
3042 | n = ctx.extra().get('source') | |
3040 | if n in ids: |
|
3043 | if n in ids: | |
3041 | r = repo[n].rev() |
|
3044 | r = repo[n].rev() | |
3042 | if r in revs: |
|
3045 | if r in revs: | |
3043 | ui.warn(_('skipping revision %s (already grafted to %s)\n') |
|
3046 | ui.warn(_('skipping revision %s (already grafted to %s)\n') | |
3044 | % (r, rev)) |
|
3047 | % (r, rev)) | |
3045 | revs.remove(r) |
|
3048 | revs.remove(r) | |
3046 | elif ids[n] in revs: |
|
3049 | elif ids[n] in revs: | |
3047 | ui.warn(_('skipping already grafted revision %s ' |
|
3050 | ui.warn(_('skipping already grafted revision %s ' | |
3048 | '(%s also has origin %d)\n') % (ids[n], rev, r)) |
|
3051 | '(%s also has origin %d)\n') % (ids[n], rev, r)) | |
3049 | revs.remove(ids[n]) |
|
3052 | revs.remove(ids[n]) | |
3050 | elif ctx.hex() in ids: |
|
3053 | elif ctx.hex() in ids: | |
3051 | r = ids[ctx.hex()] |
|
3054 | r = ids[ctx.hex()] | |
3052 | ui.warn(_('skipping already grafted revision %s ' |
|
3055 | ui.warn(_('skipping already grafted revision %s ' | |
3053 | '(was grafted from %d)\n') % (r, rev)) |
|
3056 | '(was grafted from %d)\n') % (r, rev)) | |
3054 | revs.remove(r) |
|
3057 | revs.remove(r) | |
3055 | if not revs: |
|
3058 | if not revs: | |
3056 | return -1 |
|
3059 | return -1 | |
3057 |
|
3060 | |||
3058 | wlock = repo.wlock() |
|
3061 | wlock = repo.wlock() | |
3059 | try: |
|
3062 | try: | |
3060 | current = repo['.'] |
|
3063 | current = repo['.'] | |
3061 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
3064 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
3062 |
|
3065 | |||
3063 | ui.status(_('grafting revision %s\n') % ctx.rev()) |
|
3066 | ui.status(_('grafting revision %s\n') % ctx.rev()) | |
3064 | if opts.get('dry_run'): |
|
3067 | if opts.get('dry_run'): | |
3065 | continue |
|
3068 | continue | |
3066 |
|
3069 | |||
3067 | source = ctx.extra().get('source') |
|
3070 | source = ctx.extra().get('source') | |
3068 | if not source: |
|
3071 | if not source: | |
3069 | source = ctx.hex() |
|
3072 | source = ctx.hex() | |
3070 | extra = {'source': source} |
|
3073 | extra = {'source': source} | |
3071 | user = ctx.user() |
|
3074 | user = ctx.user() | |
3072 | if opts.get('user'): |
|
3075 | if opts.get('user'): | |
3073 | user = opts['user'] |
|
3076 | user = opts['user'] | |
3074 | date = ctx.date() |
|
3077 | date = ctx.date() | |
3075 | if opts.get('date'): |
|
3078 | if opts.get('date'): | |
3076 | date = opts['date'] |
|
3079 | date = opts['date'] | |
3077 | message = ctx.description() |
|
3080 | message = ctx.description() | |
3078 | if opts.get('log'): |
|
3081 | if opts.get('log'): | |
3079 | message += '\n(grafted from %s)' % ctx.hex() |
|
3082 | message += '\n(grafted from %s)' % ctx.hex() | |
3080 |
|
3083 | |||
3081 | # we don't merge the first commit when continuing |
|
3084 | # we don't merge the first commit when continuing | |
3082 | if not cont: |
|
3085 | if not cont: | |
3083 | # perform the graft merge with p1(rev) as 'ancestor' |
|
3086 | # perform the graft merge with p1(rev) as 'ancestor' | |
3084 | try: |
|
3087 | try: | |
3085 | # ui.forcemerge is an internal variable, do not document |
|
3088 | # ui.forcemerge is an internal variable, do not document | |
3086 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
3089 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
3087 | stats = mergemod.update(repo, ctx.node(), True, True, False, |
|
3090 | stats = mergemod.update(repo, ctx.node(), True, True, False, | |
3088 | ctx.p1().node()) |
|
3091 | ctx.p1().node()) | |
3089 | finally: |
|
3092 | finally: | |
3090 | repo.ui.setconfig('ui', 'forcemerge', '') |
|
3093 | repo.ui.setconfig('ui', 'forcemerge', '') | |
3091 | # report any conflicts |
|
3094 | # report any conflicts | |
3092 | if stats and stats[3] > 0: |
|
3095 | if stats and stats[3] > 0: | |
3093 | # write out state for --continue |
|
3096 | # write out state for --continue | |
3094 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
3097 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
3095 | repo.opener.write('graftstate', ''.join(nodelines)) |
|
3098 | repo.opener.write('graftstate', ''.join(nodelines)) | |
3096 | raise util.Abort( |
|
3099 | raise util.Abort( | |
3097 | _("unresolved conflicts, can't continue"), |
|
3100 | _("unresolved conflicts, can't continue"), | |
3098 | hint=_('use hg resolve and hg graft --continue')) |
|
3101 | hint=_('use hg resolve and hg graft --continue')) | |
3099 | else: |
|
3102 | else: | |
3100 | cont = False |
|
3103 | cont = False | |
3101 |
|
3104 | |||
3102 | # drop the second merge parent |
|
3105 | # drop the second merge parent | |
3103 | repo.setparents(current.node(), nullid) |
|
3106 | repo.setparents(current.node(), nullid) | |
3104 | repo.dirstate.write() |
|
3107 | repo.dirstate.write() | |
3105 | # fix up dirstate for copies and renames |
|
3108 | # fix up dirstate for copies and renames | |
3106 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) |
|
3109 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) | |
3107 |
|
3110 | |||
3108 | # commit |
|
3111 | # commit | |
3109 | node = repo.commit(text=message, user=user, |
|
3112 | node = repo.commit(text=message, user=user, | |
3110 | date=date, extra=extra, editor=editor) |
|
3113 | date=date, extra=extra, editor=editor) | |
3111 | if node is None: |
|
3114 | if node is None: | |
3112 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) |
|
3115 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) | |
3113 | else: |
|
3116 | else: | |
3114 | current = repo[node] |
|
3117 | current = repo[node] | |
3115 | finally: |
|
3118 | finally: | |
3116 | wlock.release() |
|
3119 | wlock.release() | |
3117 |
|
3120 | |||
3118 | # remove state when we complete successfully |
|
3121 | # remove state when we complete successfully | |
3119 | if not opts.get('dry_run'): |
|
3122 | if not opts.get('dry_run'): | |
3120 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
|
3123 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
3121 |
|
3124 | |||
3122 | return 0 |
|
3125 | return 0 | |
3123 |
|
3126 | |||
3124 | @command('grep', |
|
3127 | @command('grep', | |
3125 | [('0', 'print0', None, _('end fields with NUL')), |
|
3128 | [('0', 'print0', None, _('end fields with NUL')), | |
3126 | ('', 'all', None, _('print all revisions that match')), |
|
3129 | ('', 'all', None, _('print all revisions that match')), | |
3127 | ('a', 'text', None, _('treat all files as text')), |
|
3130 | ('a', 'text', None, _('treat all files as text')), | |
3128 | ('f', 'follow', None, |
|
3131 | ('f', 'follow', None, | |
3129 | _('follow changeset history,' |
|
3132 | _('follow changeset history,' | |
3130 | ' or file history across copies and renames')), |
|
3133 | ' or file history across copies and renames')), | |
3131 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
3134 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
3132 | ('l', 'files-with-matches', None, |
|
3135 | ('l', 'files-with-matches', None, | |
3133 | _('print only filenames and revisions that match')), |
|
3136 | _('print only filenames and revisions that match')), | |
3134 | ('n', 'line-number', None, _('print matching line numbers')), |
|
3137 | ('n', 'line-number', None, _('print matching line numbers')), | |
3135 | ('r', 'rev', [], |
|
3138 | ('r', 'rev', [], | |
3136 | _('only search files changed within revision range'), _('REV')), |
|
3139 | _('only search files changed within revision range'), _('REV')), | |
3137 | ('u', 'user', None, _('list the author (long with -v)')), |
|
3140 | ('u', 'user', None, _('list the author (long with -v)')), | |
3138 | ('d', 'date', None, _('list the date (short with -q)')), |
|
3141 | ('d', 'date', None, _('list the date (short with -q)')), | |
3139 | ] + walkopts, |
|
3142 | ] + walkopts, | |
3140 | _('[OPTION]... PATTERN [FILE]...')) |
|
3143 | _('[OPTION]... PATTERN [FILE]...')) | |
3141 | def grep(ui, repo, pattern, *pats, **opts): |
|
3144 | def grep(ui, repo, pattern, *pats, **opts): | |
3142 | """search for a pattern in specified files and revisions |
|
3145 | """search for a pattern in specified files and revisions | |
3143 |
|
3146 | |||
3144 | Search revisions of files for a regular expression. |
|
3147 | Search revisions of files for a regular expression. | |
3145 |
|
3148 | |||
3146 | This command behaves differently than Unix grep. It only accepts |
|
3149 | This command behaves differently than Unix grep. It only accepts | |
3147 | Python/Perl regexps. It searches repository history, not the |
|
3150 | Python/Perl regexps. It searches repository history, not the | |
3148 | working directory. It always prints the revision number in which a |
|
3151 | working directory. It always prints the revision number in which a | |
3149 | match appears. |
|
3152 | match appears. | |
3150 |
|
3153 | |||
3151 | By default, grep only prints output for the first revision of a |
|
3154 | By default, grep only prints output for the first revision of a | |
3152 | file in which it finds a match. To get it to print every revision |
|
3155 | file in which it finds a match. To get it to print every revision | |
3153 | that contains a change in match status ("-" for a match that |
|
3156 | that contains a change in match status ("-" for a match that | |
3154 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
3157 | becomes a non-match, or "+" for a non-match that becomes a match), | |
3155 | use the --all flag. |
|
3158 | use the --all flag. | |
3156 |
|
3159 | |||
3157 | Returns 0 if a match is found, 1 otherwise. |
|
3160 | Returns 0 if a match is found, 1 otherwise. | |
3158 | """ |
|
3161 | """ | |
3159 | reflags = re.M |
|
3162 | reflags = re.M | |
3160 | if opts.get('ignore_case'): |
|
3163 | if opts.get('ignore_case'): | |
3161 | reflags |= re.I |
|
3164 | reflags |= re.I | |
3162 | try: |
|
3165 | try: | |
3163 | regexp = util.compilere(pattern, reflags) |
|
3166 | regexp = util.compilere(pattern, reflags) | |
3164 | except re.error, inst: |
|
3167 | except re.error, inst: | |
3165 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
3168 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) | |
3166 | return 1 |
|
3169 | return 1 | |
3167 | sep, eol = ':', '\n' |
|
3170 | sep, eol = ':', '\n' | |
3168 | if opts.get('print0'): |
|
3171 | if opts.get('print0'): | |
3169 | sep = eol = '\0' |
|
3172 | sep = eol = '\0' | |
3170 |
|
3173 | |||
3171 | getfile = util.lrucachefunc(repo.file) |
|
3174 | getfile = util.lrucachefunc(repo.file) | |
3172 |
|
3175 | |||
3173 | def matchlines(body): |
|
3176 | def matchlines(body): | |
3174 | begin = 0 |
|
3177 | begin = 0 | |
3175 | linenum = 0 |
|
3178 | linenum = 0 | |
3176 | while begin < len(body): |
|
3179 | while begin < len(body): | |
3177 | match = regexp.search(body, begin) |
|
3180 | match = regexp.search(body, begin) | |
3178 | if not match: |
|
3181 | if not match: | |
3179 | break |
|
3182 | break | |
3180 | mstart, mend = match.span() |
|
3183 | mstart, mend = match.span() | |
3181 | linenum += body.count('\n', begin, mstart) + 1 |
|
3184 | linenum += body.count('\n', begin, mstart) + 1 | |
3182 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
3185 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
3183 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
3186 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
3184 | lend = begin - 1 |
|
3187 | lend = begin - 1 | |
3185 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
3188 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
3186 |
|
3189 | |||
3187 | class linestate(object): |
|
3190 | class linestate(object): | |
3188 | def __init__(self, line, linenum, colstart, colend): |
|
3191 | def __init__(self, line, linenum, colstart, colend): | |
3189 | self.line = line |
|
3192 | self.line = line | |
3190 | self.linenum = linenum |
|
3193 | self.linenum = linenum | |
3191 | self.colstart = colstart |
|
3194 | self.colstart = colstart | |
3192 | self.colend = colend |
|
3195 | self.colend = colend | |
3193 |
|
3196 | |||
3194 | def __hash__(self): |
|
3197 | def __hash__(self): | |
3195 | return hash((self.linenum, self.line)) |
|
3198 | return hash((self.linenum, self.line)) | |
3196 |
|
3199 | |||
3197 | def __eq__(self, other): |
|
3200 | def __eq__(self, other): | |
3198 | return self.line == other.line |
|
3201 | return self.line == other.line | |
3199 |
|
3202 | |||
3200 | matches = {} |
|
3203 | matches = {} | |
3201 | copies = {} |
|
3204 | copies = {} | |
3202 | def grepbody(fn, rev, body): |
|
3205 | def grepbody(fn, rev, body): | |
3203 | matches[rev].setdefault(fn, []) |
|
3206 | matches[rev].setdefault(fn, []) | |
3204 | m = matches[rev][fn] |
|
3207 | m = matches[rev][fn] | |
3205 | for lnum, cstart, cend, line in matchlines(body): |
|
3208 | for lnum, cstart, cend, line in matchlines(body): | |
3206 | s = linestate(line, lnum, cstart, cend) |
|
3209 | s = linestate(line, lnum, cstart, cend) | |
3207 | m.append(s) |
|
3210 | m.append(s) | |
3208 |
|
3211 | |||
3209 | def difflinestates(a, b): |
|
3212 | def difflinestates(a, b): | |
3210 | sm = difflib.SequenceMatcher(None, a, b) |
|
3213 | sm = difflib.SequenceMatcher(None, a, b) | |
3211 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
3214 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
3212 | if tag == 'insert': |
|
3215 | if tag == 'insert': | |
3213 | for i in xrange(blo, bhi): |
|
3216 | for i in xrange(blo, bhi): | |
3214 | yield ('+', b[i]) |
|
3217 | yield ('+', b[i]) | |
3215 | elif tag == 'delete': |
|
3218 | elif tag == 'delete': | |
3216 | for i in xrange(alo, ahi): |
|
3219 | for i in xrange(alo, ahi): | |
3217 | yield ('-', a[i]) |
|
3220 | yield ('-', a[i]) | |
3218 | elif tag == 'replace': |
|
3221 | elif tag == 'replace': | |
3219 | for i in xrange(alo, ahi): |
|
3222 | for i in xrange(alo, ahi): | |
3220 | yield ('-', a[i]) |
|
3223 | yield ('-', a[i]) | |
3221 | for i in xrange(blo, bhi): |
|
3224 | for i in xrange(blo, bhi): | |
3222 | yield ('+', b[i]) |
|
3225 | yield ('+', b[i]) | |
3223 |
|
3226 | |||
3224 | def display(fn, ctx, pstates, states): |
|
3227 | def display(fn, ctx, pstates, states): | |
3225 | rev = ctx.rev() |
|
3228 | rev = ctx.rev() | |
3226 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
3229 | datefunc = ui.quiet and util.shortdate or util.datestr | |
3227 | found = False |
|
3230 | found = False | |
3228 | filerevmatches = {} |
|
3231 | filerevmatches = {} | |
3229 | def binary(): |
|
3232 | def binary(): | |
3230 | flog = getfile(fn) |
|
3233 | flog = getfile(fn) | |
3231 | return util.binary(flog.read(ctx.filenode(fn))) |
|
3234 | return util.binary(flog.read(ctx.filenode(fn))) | |
3232 |
|
3235 | |||
3233 | if opts.get('all'): |
|
3236 | if opts.get('all'): | |
3234 | iter = difflinestates(pstates, states) |
|
3237 | iter = difflinestates(pstates, states) | |
3235 | else: |
|
3238 | else: | |
3236 | iter = [('', l) for l in states] |
|
3239 | iter = [('', l) for l in states] | |
3237 | for change, l in iter: |
|
3240 | for change, l in iter: | |
3238 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] |
|
3241 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] | |
3239 | before, match, after = None, None, None |
|
3242 | before, match, after = None, None, None | |
3240 |
|
3243 | |||
3241 | if opts.get('line_number'): |
|
3244 | if opts.get('line_number'): | |
3242 | cols.append((str(l.linenum), 'grep.linenumber')) |
|
3245 | cols.append((str(l.linenum), 'grep.linenumber')) | |
3243 | if opts.get('all'): |
|
3246 | if opts.get('all'): | |
3244 | cols.append((change, 'grep.change')) |
|
3247 | cols.append((change, 'grep.change')) | |
3245 | if opts.get('user'): |
|
3248 | if opts.get('user'): | |
3246 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) |
|
3249 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) | |
3247 | if opts.get('date'): |
|
3250 | if opts.get('date'): | |
3248 | cols.append((datefunc(ctx.date()), 'grep.date')) |
|
3251 | cols.append((datefunc(ctx.date()), 'grep.date')) | |
3249 | if opts.get('files_with_matches'): |
|
3252 | if opts.get('files_with_matches'): | |
3250 | c = (fn, rev) |
|
3253 | c = (fn, rev) | |
3251 | if c in filerevmatches: |
|
3254 | if c in filerevmatches: | |
3252 | continue |
|
3255 | continue | |
3253 | filerevmatches[c] = 1 |
|
3256 | filerevmatches[c] = 1 | |
3254 | else: |
|
3257 | else: | |
3255 | before = l.line[:l.colstart] |
|
3258 | before = l.line[:l.colstart] | |
3256 | match = l.line[l.colstart:l.colend] |
|
3259 | match = l.line[l.colstart:l.colend] | |
3257 | after = l.line[l.colend:] |
|
3260 | after = l.line[l.colend:] | |
3258 | for col, label in cols[:-1]: |
|
3261 | for col, label in cols[:-1]: | |
3259 | ui.write(col, label=label) |
|
3262 | ui.write(col, label=label) | |
3260 | ui.write(sep, label='grep.sep') |
|
3263 | ui.write(sep, label='grep.sep') | |
3261 | ui.write(cols[-1][0], label=cols[-1][1]) |
|
3264 | ui.write(cols[-1][0], label=cols[-1][1]) | |
3262 | if before is not None: |
|
3265 | if before is not None: | |
3263 | ui.write(sep, label='grep.sep') |
|
3266 | ui.write(sep, label='grep.sep') | |
3264 | if not opts.get('text') and binary(): |
|
3267 | if not opts.get('text') and binary(): | |
3265 | ui.write(" Binary file matches") |
|
3268 | ui.write(" Binary file matches") | |
3266 | else: |
|
3269 | else: | |
3267 | ui.write(before) |
|
3270 | ui.write(before) | |
3268 | ui.write(match, label='grep.match') |
|
3271 | ui.write(match, label='grep.match') | |
3269 | ui.write(after) |
|
3272 | ui.write(after) | |
3270 | ui.write(eol) |
|
3273 | ui.write(eol) | |
3271 | found = True |
|
3274 | found = True | |
3272 | return found |
|
3275 | return found | |
3273 |
|
3276 | |||
3274 | skip = {} |
|
3277 | skip = {} | |
3275 | revfiles = {} |
|
3278 | revfiles = {} | |
3276 | matchfn = scmutil.match(repo[None], pats, opts) |
|
3279 | matchfn = scmutil.match(repo[None], pats, opts) | |
3277 | found = False |
|
3280 | found = False | |
3278 | follow = opts.get('follow') |
|
3281 | follow = opts.get('follow') | |
3279 |
|
3282 | |||
3280 | def prep(ctx, fns): |
|
3283 | def prep(ctx, fns): | |
3281 | rev = ctx.rev() |
|
3284 | rev = ctx.rev() | |
3282 | pctx = ctx.p1() |
|
3285 | pctx = ctx.p1() | |
3283 | parent = pctx.rev() |
|
3286 | parent = pctx.rev() | |
3284 | matches.setdefault(rev, {}) |
|
3287 | matches.setdefault(rev, {}) | |
3285 | matches.setdefault(parent, {}) |
|
3288 | matches.setdefault(parent, {}) | |
3286 | files = revfiles.setdefault(rev, []) |
|
3289 | files = revfiles.setdefault(rev, []) | |
3287 | for fn in fns: |
|
3290 | for fn in fns: | |
3288 | flog = getfile(fn) |
|
3291 | flog = getfile(fn) | |
3289 | try: |
|
3292 | try: | |
3290 | fnode = ctx.filenode(fn) |
|
3293 | fnode = ctx.filenode(fn) | |
3291 | except error.LookupError: |
|
3294 | except error.LookupError: | |
3292 | continue |
|
3295 | continue | |
3293 |
|
3296 | |||
3294 | copied = flog.renamed(fnode) |
|
3297 | copied = flog.renamed(fnode) | |
3295 | copy = follow and copied and copied[0] |
|
3298 | copy = follow and copied and copied[0] | |
3296 | if copy: |
|
3299 | if copy: | |
3297 | copies.setdefault(rev, {})[fn] = copy |
|
3300 | copies.setdefault(rev, {})[fn] = copy | |
3298 | if fn in skip: |
|
3301 | if fn in skip: | |
3299 | if copy: |
|
3302 | if copy: | |
3300 | skip[copy] = True |
|
3303 | skip[copy] = True | |
3301 | continue |
|
3304 | continue | |
3302 | files.append(fn) |
|
3305 | files.append(fn) | |
3303 |
|
3306 | |||
3304 | if fn not in matches[rev]: |
|
3307 | if fn not in matches[rev]: | |
3305 | grepbody(fn, rev, flog.read(fnode)) |
|
3308 | grepbody(fn, rev, flog.read(fnode)) | |
3306 |
|
3309 | |||
3307 | pfn = copy or fn |
|
3310 | pfn = copy or fn | |
3308 | if pfn not in matches[parent]: |
|
3311 | if pfn not in matches[parent]: | |
3309 | try: |
|
3312 | try: | |
3310 | fnode = pctx.filenode(pfn) |
|
3313 | fnode = pctx.filenode(pfn) | |
3311 | grepbody(pfn, parent, flog.read(fnode)) |
|
3314 | grepbody(pfn, parent, flog.read(fnode)) | |
3312 | except error.LookupError: |
|
3315 | except error.LookupError: | |
3313 | pass |
|
3316 | pass | |
3314 |
|
3317 | |||
3315 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
3318 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
3316 | rev = ctx.rev() |
|
3319 | rev = ctx.rev() | |
3317 | parent = ctx.p1().rev() |
|
3320 | parent = ctx.p1().rev() | |
3318 | for fn in sorted(revfiles.get(rev, [])): |
|
3321 | for fn in sorted(revfiles.get(rev, [])): | |
3319 | states = matches[rev][fn] |
|
3322 | states = matches[rev][fn] | |
3320 | copy = copies.get(rev, {}).get(fn) |
|
3323 | copy = copies.get(rev, {}).get(fn) | |
3321 | if fn in skip: |
|
3324 | if fn in skip: | |
3322 | if copy: |
|
3325 | if copy: | |
3323 | skip[copy] = True |
|
3326 | skip[copy] = True | |
3324 | continue |
|
3327 | continue | |
3325 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
3328 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
3326 | if pstates or states: |
|
3329 | if pstates or states: | |
3327 | r = display(fn, ctx, pstates, states) |
|
3330 | r = display(fn, ctx, pstates, states) | |
3328 | found = found or r |
|
3331 | found = found or r | |
3329 | if r and not opts.get('all'): |
|
3332 | if r and not opts.get('all'): | |
3330 | skip[fn] = True |
|
3333 | skip[fn] = True | |
3331 | if copy: |
|
3334 | if copy: | |
3332 | skip[copy] = True |
|
3335 | skip[copy] = True | |
3333 | del matches[rev] |
|
3336 | del matches[rev] | |
3334 | del revfiles[rev] |
|
3337 | del revfiles[rev] | |
3335 |
|
3338 | |||
3336 | return not found |
|
3339 | return not found | |
3337 |
|
3340 | |||
3338 | @command('heads', |
|
3341 | @command('heads', | |
3339 | [('r', 'rev', '', |
|
3342 | [('r', 'rev', '', | |
3340 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
3343 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
3341 | ('t', 'topo', False, _('show topological heads only')), |
|
3344 | ('t', 'topo', False, _('show topological heads only')), | |
3342 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
3345 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
3343 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
3346 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
3344 | ] + templateopts, |
|
3347 | ] + templateopts, | |
3345 | _('[-ct] [-r STARTREV] [REV]...')) |
|
3348 | _('[-ct] [-r STARTREV] [REV]...')) | |
3346 | def heads(ui, repo, *branchrevs, **opts): |
|
3349 | def heads(ui, repo, *branchrevs, **opts): | |
3347 | """show branch heads |
|
3350 | """show branch heads | |
3348 |
|
3351 | |||
3349 | With no arguments, show all open branch heads in the repository. |
|
3352 | With no arguments, show all open branch heads in the repository. | |
3350 | Branch heads are changesets that have no descendants on the |
|
3353 | Branch heads are changesets that have no descendants on the | |
3351 | same branch. They are where development generally takes place and |
|
3354 | same branch. They are where development generally takes place and | |
3352 | are the usual targets for update and merge operations. |
|
3355 | are the usual targets for update and merge operations. | |
3353 |
|
3356 | |||
3354 | If one or more REVs are given, only open branch heads on the |
|
3357 | If one or more REVs are given, only open branch heads on the | |
3355 | branches associated with the specified changesets are shown. This |
|
3358 | branches associated with the specified changesets are shown. This | |
3356 | means that you can use :hg:`heads .` to see the heads on the |
|
3359 | means that you can use :hg:`heads .` to see the heads on the | |
3357 | currently checked-out branch. |
|
3360 | currently checked-out branch. | |
3358 |
|
3361 | |||
3359 | If -c/--closed is specified, also show branch heads marked closed |
|
3362 | If -c/--closed is specified, also show branch heads marked closed | |
3360 | (see :hg:`commit --close-branch`). |
|
3363 | (see :hg:`commit --close-branch`). | |
3361 |
|
3364 | |||
3362 | If STARTREV is specified, only those heads that are descendants of |
|
3365 | If STARTREV is specified, only those heads that are descendants of | |
3363 | STARTREV will be displayed. |
|
3366 | STARTREV will be displayed. | |
3364 |
|
3367 | |||
3365 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
3368 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
3366 | topological heads (changesets with no children) will be shown. |
|
3369 | topological heads (changesets with no children) will be shown. | |
3367 |
|
3370 | |||
3368 | Returns 0 if matching heads are found, 1 if not. |
|
3371 | Returns 0 if matching heads are found, 1 if not. | |
3369 | """ |
|
3372 | """ | |
3370 |
|
3373 | |||
3371 | start = None |
|
3374 | start = None | |
3372 | if 'rev' in opts: |
|
3375 | if 'rev' in opts: | |
3373 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
3376 | start = scmutil.revsingle(repo, opts['rev'], None).node() | |
3374 |
|
3377 | |||
3375 | if opts.get('topo'): |
|
3378 | if opts.get('topo'): | |
3376 | heads = [repo[h] for h in repo.heads(start)] |
|
3379 | heads = [repo[h] for h in repo.heads(start)] | |
3377 | else: |
|
3380 | else: | |
3378 | heads = [] |
|
3381 | heads = [] | |
3379 | for branch in repo.branchmap(): |
|
3382 | for branch in repo.branchmap(): | |
3380 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
3383 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
3381 | heads = [repo[h] for h in heads] |
|
3384 | heads = [repo[h] for h in heads] | |
3382 |
|
3385 | |||
3383 | if branchrevs: |
|
3386 | if branchrevs: | |
3384 | branches = set(repo[br].branch() for br in branchrevs) |
|
3387 | branches = set(repo[br].branch() for br in branchrevs) | |
3385 | heads = [h for h in heads if h.branch() in branches] |
|
3388 | heads = [h for h in heads if h.branch() in branches] | |
3386 |
|
3389 | |||
3387 | if opts.get('active') and branchrevs: |
|
3390 | if opts.get('active') and branchrevs: | |
3388 | dagheads = repo.heads(start) |
|
3391 | dagheads = repo.heads(start) | |
3389 | heads = [h for h in heads if h.node() in dagheads] |
|
3392 | heads = [h for h in heads if h.node() in dagheads] | |
3390 |
|
3393 | |||
3391 | if branchrevs: |
|
3394 | if branchrevs: | |
3392 | haveheads = set(h.branch() for h in heads) |
|
3395 | haveheads = set(h.branch() for h in heads) | |
3393 | if branches - haveheads: |
|
3396 | if branches - haveheads: | |
3394 | headless = ', '.join(b for b in branches - haveheads) |
|
3397 | headless = ', '.join(b for b in branches - haveheads) | |
3395 | msg = _('no open branch heads found on branches %s') |
|
3398 | msg = _('no open branch heads found on branches %s') | |
3396 | if opts.get('rev'): |
|
3399 | if opts.get('rev'): | |
3397 | msg += _(' (started at %s)') % opts['rev'] |
|
3400 | msg += _(' (started at %s)') % opts['rev'] | |
3398 | ui.warn((msg + '\n') % headless) |
|
3401 | ui.warn((msg + '\n') % headless) | |
3399 |
|
3402 | |||
3400 | if not heads: |
|
3403 | if not heads: | |
3401 | return 1 |
|
3404 | return 1 | |
3402 |
|
3405 | |||
3403 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
3406 | heads = sorted(heads, key=lambda x: -x.rev()) | |
3404 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3407 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3405 | for ctx in heads: |
|
3408 | for ctx in heads: | |
3406 | displayer.show(ctx) |
|
3409 | displayer.show(ctx) | |
3407 | displayer.close() |
|
3410 | displayer.close() | |
3408 |
|
3411 | |||
3409 | @command('help', |
|
3412 | @command('help', | |
3410 | [('e', 'extension', None, _('show only help for extensions')), |
|
3413 | [('e', 'extension', None, _('show only help for extensions')), | |
3411 | ('c', 'command', None, _('show only help for commands')), |
|
3414 | ('c', 'command', None, _('show only help for commands')), | |
3412 | ('k', 'keyword', '', _('show topics matching keyword')), |
|
3415 | ('k', 'keyword', '', _('show topics matching keyword')), | |
3413 | ], |
|
3416 | ], | |
3414 | _('[-ec] [TOPIC]')) |
|
3417 | _('[-ec] [TOPIC]')) | |
3415 | def help_(ui, name=None, **opts): |
|
3418 | def help_(ui, name=None, **opts): | |
3416 | """show help for a given topic or a help overview |
|
3419 | """show help for a given topic or a help overview | |
3417 |
|
3420 | |||
3418 | With no arguments, print a list of commands with short help messages. |
|
3421 | With no arguments, print a list of commands with short help messages. | |
3419 |
|
3422 | |||
3420 | Given a topic, extension, or command name, print help for that |
|
3423 | Given a topic, extension, or command name, print help for that | |
3421 | topic. |
|
3424 | topic. | |
3422 |
|
3425 | |||
3423 | Returns 0 if successful. |
|
3426 | Returns 0 if successful. | |
3424 | """ |
|
3427 | """ | |
3425 |
|
3428 | |||
3426 | textwidth = min(ui.termwidth(), 80) - 2 |
|
3429 | textwidth = min(ui.termwidth(), 80) - 2 | |
3427 |
|
3430 | |||
3428 | keep = ui.verbose and ['verbose'] or [] |
|
3431 | keep = ui.verbose and ['verbose'] or [] | |
3429 | text = help.help_(ui, name, **opts) |
|
3432 | text = help.help_(ui, name, **opts) | |
3430 |
|
3433 | |||
3431 | formatted, pruned = minirst.format(text, textwidth, keep=keep) |
|
3434 | formatted, pruned = minirst.format(text, textwidth, keep=keep) | |
3432 | if 'verbose' in pruned: |
|
3435 | if 'verbose' in pruned: | |
3433 | keep.append('omitted') |
|
3436 | keep.append('omitted') | |
3434 | else: |
|
3437 | else: | |
3435 | keep.append('notomitted') |
|
3438 | keep.append('notomitted') | |
3436 | formatted, pruned = minirst.format(text, textwidth, keep=keep) |
|
3439 | formatted, pruned = minirst.format(text, textwidth, keep=keep) | |
3437 | ui.write(formatted) |
|
3440 | ui.write(formatted) | |
3438 |
|
3441 | |||
3439 |
|
3442 | |||
3440 | @command('identify|id', |
|
3443 | @command('identify|id', | |
3441 | [('r', 'rev', '', |
|
3444 | [('r', 'rev', '', | |
3442 | _('identify the specified revision'), _('REV')), |
|
3445 | _('identify the specified revision'), _('REV')), | |
3443 | ('n', 'num', None, _('show local revision number')), |
|
3446 | ('n', 'num', None, _('show local revision number')), | |
3444 | ('i', 'id', None, _('show global revision id')), |
|
3447 | ('i', 'id', None, _('show global revision id')), | |
3445 | ('b', 'branch', None, _('show branch')), |
|
3448 | ('b', 'branch', None, _('show branch')), | |
3446 | ('t', 'tags', None, _('show tags')), |
|
3449 | ('t', 'tags', None, _('show tags')), | |
3447 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
3450 | ('B', 'bookmarks', None, _('show bookmarks')), | |
3448 | ] + remoteopts, |
|
3451 | ] + remoteopts, | |
3449 | _('[-nibtB] [-r REV] [SOURCE]')) |
|
3452 | _('[-nibtB] [-r REV] [SOURCE]')) | |
3450 | def identify(ui, repo, source=None, rev=None, |
|
3453 | def identify(ui, repo, source=None, rev=None, | |
3451 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
3454 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
3452 | """identify the working copy or specified revision |
|
3455 | """identify the working copy or specified revision | |
3453 |
|
3456 | |||
3454 | Print a summary identifying the repository state at REV using one or |
|
3457 | Print a summary identifying the repository state at REV using one or | |
3455 | two parent hash identifiers, followed by a "+" if the working |
|
3458 | two parent hash identifiers, followed by a "+" if the working | |
3456 | directory has uncommitted changes, the branch name (if not default), |
|
3459 | directory has uncommitted changes, the branch name (if not default), | |
3457 | a list of tags, and a list of bookmarks. |
|
3460 | a list of tags, and a list of bookmarks. | |
3458 |
|
3461 | |||
3459 | When REV is not given, print a summary of the current state of the |
|
3462 | When REV is not given, print a summary of the current state of the | |
3460 | repository. |
|
3463 | repository. | |
3461 |
|
3464 | |||
3462 | Specifying a path to a repository root or Mercurial bundle will |
|
3465 | Specifying a path to a repository root or Mercurial bundle will | |
3463 | cause lookup to operate on that repository/bundle. |
|
3466 | cause lookup to operate on that repository/bundle. | |
3464 |
|
3467 | |||
3465 | .. container:: verbose |
|
3468 | .. container:: verbose | |
3466 |
|
3469 | |||
3467 | Examples: |
|
3470 | Examples: | |
3468 |
|
3471 | |||
3469 | - generate a build identifier for the working directory:: |
|
3472 | - generate a build identifier for the working directory:: | |
3470 |
|
3473 | |||
3471 | hg id --id > build-id.dat |
|
3474 | hg id --id > build-id.dat | |
3472 |
|
3475 | |||
3473 | - find the revision corresponding to a tag:: |
|
3476 | - find the revision corresponding to a tag:: | |
3474 |
|
3477 | |||
3475 | hg id -n -r 1.3 |
|
3478 | hg id -n -r 1.3 | |
3476 |
|
3479 | |||
3477 | - check the most recent revision of a remote repository:: |
|
3480 | - check the most recent revision of a remote repository:: | |
3478 |
|
3481 | |||
3479 | hg id -r tip http://selenic.com/hg/ |
|
3482 | hg id -r tip http://selenic.com/hg/ | |
3480 |
|
3483 | |||
3481 | Returns 0 if successful. |
|
3484 | Returns 0 if successful. | |
3482 | """ |
|
3485 | """ | |
3483 |
|
3486 | |||
3484 | if not repo and not source: |
|
3487 | if not repo and not source: | |
3485 | raise util.Abort(_("there is no Mercurial repository here " |
|
3488 | raise util.Abort(_("there is no Mercurial repository here " | |
3486 | "(.hg not found)")) |
|
3489 | "(.hg not found)")) | |
3487 |
|
3490 | |||
3488 | hexfunc = ui.debugflag and hex or short |
|
3491 | hexfunc = ui.debugflag and hex or short | |
3489 | default = not (num or id or branch or tags or bookmarks) |
|
3492 | default = not (num or id or branch or tags or bookmarks) | |
3490 | output = [] |
|
3493 | output = [] | |
3491 | revs = [] |
|
3494 | revs = [] | |
3492 |
|
3495 | |||
3493 | if source: |
|
3496 | if source: | |
3494 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
3497 | source, branches = hg.parseurl(ui.expandpath(source)) | |
3495 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
3498 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
3496 | repo = peer.local() |
|
3499 | repo = peer.local() | |
3497 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
3500 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
3498 |
|
3501 | |||
3499 | if not repo: |
|
3502 | if not repo: | |
3500 | if num or branch or tags: |
|
3503 | if num or branch or tags: | |
3501 | raise util.Abort( |
|
3504 | raise util.Abort( | |
3502 | _("can't query remote revision number, branch, or tags")) |
|
3505 | _("can't query remote revision number, branch, or tags")) | |
3503 | if not rev and revs: |
|
3506 | if not rev and revs: | |
3504 | rev = revs[0] |
|
3507 | rev = revs[0] | |
3505 | if not rev: |
|
3508 | if not rev: | |
3506 | rev = "tip" |
|
3509 | rev = "tip" | |
3507 |
|
3510 | |||
3508 | remoterev = peer.lookup(rev) |
|
3511 | remoterev = peer.lookup(rev) | |
3509 | if default or id: |
|
3512 | if default or id: | |
3510 | output = [hexfunc(remoterev)] |
|
3513 | output = [hexfunc(remoterev)] | |
3511 |
|
3514 | |||
3512 | def getbms(): |
|
3515 | def getbms(): | |
3513 | bms = [] |
|
3516 | bms = [] | |
3514 |
|
3517 | |||
3515 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
3518 | if 'bookmarks' in peer.listkeys('namespaces'): | |
3516 | hexremoterev = hex(remoterev) |
|
3519 | hexremoterev = hex(remoterev) | |
3517 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
3520 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
3518 | if bmr == hexremoterev] |
|
3521 | if bmr == hexremoterev] | |
3519 |
|
3522 | |||
3520 | return sorted(bms) |
|
3523 | return sorted(bms) | |
3521 |
|
3524 | |||
3522 | if bookmarks: |
|
3525 | if bookmarks: | |
3523 | output.extend(getbms()) |
|
3526 | output.extend(getbms()) | |
3524 | elif default and not ui.quiet: |
|
3527 | elif default and not ui.quiet: | |
3525 | # multiple bookmarks for a single parent separated by '/' |
|
3528 | # multiple bookmarks for a single parent separated by '/' | |
3526 | bm = '/'.join(getbms()) |
|
3529 | bm = '/'.join(getbms()) | |
3527 | if bm: |
|
3530 | if bm: | |
3528 | output.append(bm) |
|
3531 | output.append(bm) | |
3529 | else: |
|
3532 | else: | |
3530 | if not rev: |
|
3533 | if not rev: | |
3531 | ctx = repo[None] |
|
3534 | ctx = repo[None] | |
3532 | parents = ctx.parents() |
|
3535 | parents = ctx.parents() | |
3533 | changed = "" |
|
3536 | changed = "" | |
3534 | if default or id or num: |
|
3537 | if default or id or num: | |
3535 | if (util.any(repo.status()) |
|
3538 | if (util.any(repo.status()) | |
3536 | or util.any(ctx.sub(s).dirty() for s in ctx.substate)): |
|
3539 | or util.any(ctx.sub(s).dirty() for s in ctx.substate)): | |
3537 | changed = '+' |
|
3540 | changed = '+' | |
3538 | if default or id: |
|
3541 | if default or id: | |
3539 | output = ["%s%s" % |
|
3542 | output = ["%s%s" % | |
3540 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
|
3543 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] | |
3541 | if num: |
|
3544 | if num: | |
3542 | output.append("%s%s" % |
|
3545 | output.append("%s%s" % | |
3543 | ('+'.join([str(p.rev()) for p in parents]), changed)) |
|
3546 | ('+'.join([str(p.rev()) for p in parents]), changed)) | |
3544 | else: |
|
3547 | else: | |
3545 | ctx = scmutil.revsingle(repo, rev) |
|
3548 | ctx = scmutil.revsingle(repo, rev) | |
3546 | if default or id: |
|
3549 | if default or id: | |
3547 | output = [hexfunc(ctx.node())] |
|
3550 | output = [hexfunc(ctx.node())] | |
3548 | if num: |
|
3551 | if num: | |
3549 | output.append(str(ctx.rev())) |
|
3552 | output.append(str(ctx.rev())) | |
3550 |
|
3553 | |||
3551 | if default and not ui.quiet: |
|
3554 | if default and not ui.quiet: | |
3552 | b = ctx.branch() |
|
3555 | b = ctx.branch() | |
3553 | if b != 'default': |
|
3556 | if b != 'default': | |
3554 | output.append("(%s)" % b) |
|
3557 | output.append("(%s)" % b) | |
3555 |
|
3558 | |||
3556 | # multiple tags for a single parent separated by '/' |
|
3559 | # multiple tags for a single parent separated by '/' | |
3557 | t = '/'.join(ctx.tags()) |
|
3560 | t = '/'.join(ctx.tags()) | |
3558 | if t: |
|
3561 | if t: | |
3559 | output.append(t) |
|
3562 | output.append(t) | |
3560 |
|
3563 | |||
3561 | # multiple bookmarks for a single parent separated by '/' |
|
3564 | # multiple bookmarks for a single parent separated by '/' | |
3562 | bm = '/'.join(ctx.bookmarks()) |
|
3565 | bm = '/'.join(ctx.bookmarks()) | |
3563 | if bm: |
|
3566 | if bm: | |
3564 | output.append(bm) |
|
3567 | output.append(bm) | |
3565 | else: |
|
3568 | else: | |
3566 | if branch: |
|
3569 | if branch: | |
3567 | output.append(ctx.branch()) |
|
3570 | output.append(ctx.branch()) | |
3568 |
|
3571 | |||
3569 | if tags: |
|
3572 | if tags: | |
3570 | output.extend(ctx.tags()) |
|
3573 | output.extend(ctx.tags()) | |
3571 |
|
3574 | |||
3572 | if bookmarks: |
|
3575 | if bookmarks: | |
3573 | output.extend(ctx.bookmarks()) |
|
3576 | output.extend(ctx.bookmarks()) | |
3574 |
|
3577 | |||
3575 | ui.write("%s\n" % ' '.join(output)) |
|
3578 | ui.write("%s\n" % ' '.join(output)) | |
3576 |
|
3579 | |||
3577 | @command('import|patch', |
|
3580 | @command('import|patch', | |
3578 | [('p', 'strip', 1, |
|
3581 | [('p', 'strip', 1, | |
3579 | _('directory strip option for patch. This has the same ' |
|
3582 | _('directory strip option for patch. This has the same ' | |
3580 | 'meaning as the corresponding patch option'), _('NUM')), |
|
3583 | 'meaning as the corresponding patch option'), _('NUM')), | |
3581 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
3584 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
3582 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3585 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
3583 | ('f', 'force', None, |
|
3586 | ('f', 'force', None, | |
3584 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
3587 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
3585 | ('', 'no-commit', None, |
|
3588 | ('', 'no-commit', None, | |
3586 | _("don't commit, just update the working directory")), |
|
3589 | _("don't commit, just update the working directory")), | |
3587 | ('', 'bypass', None, |
|
3590 | ('', 'bypass', None, | |
3588 | _("apply patch without touching the working directory")), |
|
3591 | _("apply patch without touching the working directory")), | |
3589 | ('', 'exact', None, |
|
3592 | ('', 'exact', None, | |
3590 | _('apply patch to the nodes from which it was generated')), |
|
3593 | _('apply patch to the nodes from which it was generated')), | |
3591 | ('', 'import-branch', None, |
|
3594 | ('', 'import-branch', None, | |
3592 | _('use any branch information in patch (implied by --exact)'))] + |
|
3595 | _('use any branch information in patch (implied by --exact)'))] + | |
3593 | commitopts + commitopts2 + similarityopts, |
|
3596 | commitopts + commitopts2 + similarityopts, | |
3594 | _('[OPTION]... PATCH...')) |
|
3597 | _('[OPTION]... PATCH...')) | |
3595 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
3598 | def import_(ui, repo, patch1=None, *patches, **opts): | |
3596 | """import an ordered set of patches |
|
3599 | """import an ordered set of patches | |
3597 |
|
3600 | |||
3598 | Import a list of patches and commit them individually (unless |
|
3601 | Import a list of patches and commit them individually (unless | |
3599 | --no-commit is specified). |
|
3602 | --no-commit is specified). | |
3600 |
|
3603 | |||
3601 | Because import first applies changes to the working directory, |
|
3604 | Because import first applies changes to the working directory, | |
3602 | import will abort if there are outstanding changes. |
|
3605 | import will abort if there are outstanding changes. | |
3603 |
|
3606 | |||
3604 | You can import a patch straight from a mail message. Even patches |
|
3607 | You can import a patch straight from a mail message. Even patches | |
3605 | as attachments work (to use the body part, it must have type |
|
3608 | as attachments work (to use the body part, it must have type | |
3606 | text/plain or text/x-patch). From and Subject headers of email |
|
3609 | text/plain or text/x-patch). From and Subject headers of email | |
3607 | message are used as default committer and commit message. All |
|
3610 | message are used as default committer and commit message. All | |
3608 | text/plain body parts before first diff are added to commit |
|
3611 | text/plain body parts before first diff are added to commit | |
3609 | message. |
|
3612 | message. | |
3610 |
|
3613 | |||
3611 | If the imported patch was generated by :hg:`export`, user and |
|
3614 | If the imported patch was generated by :hg:`export`, user and | |
3612 | description from patch override values from message headers and |
|
3615 | description from patch override values from message headers and | |
3613 | body. Values given on command line with -m/--message and -u/--user |
|
3616 | body. Values given on command line with -m/--message and -u/--user | |
3614 | override these. |
|
3617 | override these. | |
3615 |
|
3618 | |||
3616 | If --exact is specified, import will set the working directory to |
|
3619 | If --exact is specified, import will set the working directory to | |
3617 | the parent of each patch before applying it, and will abort if the |
|
3620 | the parent of each patch before applying it, and will abort if the | |
3618 | resulting changeset has a different ID than the one recorded in |
|
3621 | resulting changeset has a different ID than the one recorded in | |
3619 | the patch. This may happen due to character set problems or other |
|
3622 | the patch. This may happen due to character set problems or other | |
3620 | deficiencies in the text patch format. |
|
3623 | deficiencies in the text patch format. | |
3621 |
|
3624 | |||
3622 | Use --bypass to apply and commit patches directly to the |
|
3625 | Use --bypass to apply and commit patches directly to the | |
3623 | repository, not touching the working directory. Without --exact, |
|
3626 | repository, not touching the working directory. Without --exact, | |
3624 | patches will be applied on top of the working directory parent |
|
3627 | patches will be applied on top of the working directory parent | |
3625 | revision. |
|
3628 | revision. | |
3626 |
|
3629 | |||
3627 | With -s/--similarity, hg will attempt to discover renames and |
|
3630 | With -s/--similarity, hg will attempt to discover renames and | |
3628 | copies in the patch in the same way as :hg:`addremove`. |
|
3631 | copies in the patch in the same way as :hg:`addremove`. | |
3629 |
|
3632 | |||
3630 | To read a patch from standard input, use "-" as the patch name. If |
|
3633 | To read a patch from standard input, use "-" as the patch name. If | |
3631 | a URL is specified, the patch will be downloaded from it. |
|
3634 | a URL is specified, the patch will be downloaded from it. | |
3632 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3635 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3633 |
|
3636 | |||
3634 | .. container:: verbose |
|
3637 | .. container:: verbose | |
3635 |
|
3638 | |||
3636 | Examples: |
|
3639 | Examples: | |
3637 |
|
3640 | |||
3638 | - import a traditional patch from a website and detect renames:: |
|
3641 | - import a traditional patch from a website and detect renames:: | |
3639 |
|
3642 | |||
3640 | hg import -s 80 http://example.com/bugfix.patch |
|
3643 | hg import -s 80 http://example.com/bugfix.patch | |
3641 |
|
3644 | |||
3642 | - import a changeset from an hgweb server:: |
|
3645 | - import a changeset from an hgweb server:: | |
3643 |
|
3646 | |||
3644 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa |
|
3647 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa | |
3645 |
|
3648 | |||
3646 | - import all the patches in an Unix-style mbox:: |
|
3649 | - import all the patches in an Unix-style mbox:: | |
3647 |
|
3650 | |||
3648 | hg import incoming-patches.mbox |
|
3651 | hg import incoming-patches.mbox | |
3649 |
|
3652 | |||
3650 | - attempt to exactly restore an exported changeset (not always |
|
3653 | - attempt to exactly restore an exported changeset (not always | |
3651 | possible):: |
|
3654 | possible):: | |
3652 |
|
3655 | |||
3653 | hg import --exact proposed-fix.patch |
|
3656 | hg import --exact proposed-fix.patch | |
3654 |
|
3657 | |||
3655 | Returns 0 on success. |
|
3658 | Returns 0 on success. | |
3656 | """ |
|
3659 | """ | |
3657 |
|
3660 | |||
3658 | if not patch1: |
|
3661 | if not patch1: | |
3659 | raise util.Abort(_('need at least one patch to import')) |
|
3662 | raise util.Abort(_('need at least one patch to import')) | |
3660 |
|
3663 | |||
3661 | patches = (patch1,) + patches |
|
3664 | patches = (patch1,) + patches | |
3662 |
|
3665 | |||
3663 | date = opts.get('date') |
|
3666 | date = opts.get('date') | |
3664 | if date: |
|
3667 | if date: | |
3665 | opts['date'] = util.parsedate(date) |
|
3668 | opts['date'] = util.parsedate(date) | |
3666 |
|
3669 | |||
3667 | editor = cmdutil.commiteditor |
|
3670 | editor = cmdutil.commiteditor | |
3668 | if opts.get('edit'): |
|
3671 | if opts.get('edit'): | |
3669 | editor = cmdutil.commitforceeditor |
|
3672 | editor = cmdutil.commitforceeditor | |
3670 |
|
3673 | |||
3671 | update = not opts.get('bypass') |
|
3674 | update = not opts.get('bypass') | |
3672 | if not update and opts.get('no_commit'): |
|
3675 | if not update and opts.get('no_commit'): | |
3673 | raise util.Abort(_('cannot use --no-commit with --bypass')) |
|
3676 | raise util.Abort(_('cannot use --no-commit with --bypass')) | |
3674 | try: |
|
3677 | try: | |
3675 | sim = float(opts.get('similarity') or 0) |
|
3678 | sim = float(opts.get('similarity') or 0) | |
3676 | except ValueError: |
|
3679 | except ValueError: | |
3677 | raise util.Abort(_('similarity must be a number')) |
|
3680 | raise util.Abort(_('similarity must be a number')) | |
3678 | if sim < 0 or sim > 100: |
|
3681 | if sim < 0 or sim > 100: | |
3679 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
3682 | raise util.Abort(_('similarity must be between 0 and 100')) | |
3680 | if sim and not update: |
|
3683 | if sim and not update: | |
3681 | raise util.Abort(_('cannot use --similarity with --bypass')) |
|
3684 | raise util.Abort(_('cannot use --similarity with --bypass')) | |
3682 |
|
3685 | |||
3683 | if update: |
|
3686 | if update: | |
3684 | cmdutil.checkunfinished(repo) |
|
3687 | cmdutil.checkunfinished(repo) | |
3685 | if (opts.get('exact') or not opts.get('force')) and update: |
|
3688 | if (opts.get('exact') or not opts.get('force')) and update: | |
3686 | cmdutil.bailifchanged(repo) |
|
3689 | cmdutil.bailifchanged(repo) | |
3687 |
|
3690 | |||
3688 | base = opts["base"] |
|
3691 | base = opts["base"] | |
3689 | strip = opts["strip"] |
|
3692 | strip = opts["strip"] | |
3690 | wlock = lock = tr = None |
|
3693 | wlock = lock = tr = None | |
3691 | msgs = [] |
|
3694 | msgs = [] | |
3692 |
|
3695 | |||
3693 | def tryone(ui, hunk, parents): |
|
3696 | def tryone(ui, hunk, parents): | |
3694 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
3697 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
3695 | patch.extract(ui, hunk) |
|
3698 | patch.extract(ui, hunk) | |
3696 |
|
3699 | |||
3697 | if not tmpname: |
|
3700 | if not tmpname: | |
3698 | return (None, None) |
|
3701 | return (None, None) | |
3699 | msg = _('applied to working directory') |
|
3702 | msg = _('applied to working directory') | |
3700 |
|
3703 | |||
3701 | try: |
|
3704 | try: | |
3702 | cmdline_message = cmdutil.logmessage(ui, opts) |
|
3705 | cmdline_message = cmdutil.logmessage(ui, opts) | |
3703 | if cmdline_message: |
|
3706 | if cmdline_message: | |
3704 | # pickup the cmdline msg |
|
3707 | # pickup the cmdline msg | |
3705 | message = cmdline_message |
|
3708 | message = cmdline_message | |
3706 | elif message: |
|
3709 | elif message: | |
3707 | # pickup the patch msg |
|
3710 | # pickup the patch msg | |
3708 | message = message.strip() |
|
3711 | message = message.strip() | |
3709 | else: |
|
3712 | else: | |
3710 | # launch the editor |
|
3713 | # launch the editor | |
3711 | message = None |
|
3714 | message = None | |
3712 | ui.debug('message:\n%s\n' % message) |
|
3715 | ui.debug('message:\n%s\n' % message) | |
3713 |
|
3716 | |||
3714 | if len(parents) == 1: |
|
3717 | if len(parents) == 1: | |
3715 | parents.append(repo[nullid]) |
|
3718 | parents.append(repo[nullid]) | |
3716 | if opts.get('exact'): |
|
3719 | if opts.get('exact'): | |
3717 | if not nodeid or not p1: |
|
3720 | if not nodeid or not p1: | |
3718 | raise util.Abort(_('not a Mercurial patch')) |
|
3721 | raise util.Abort(_('not a Mercurial patch')) | |
3719 | p1 = repo[p1] |
|
3722 | p1 = repo[p1] | |
3720 | p2 = repo[p2 or nullid] |
|
3723 | p2 = repo[p2 or nullid] | |
3721 | elif p2: |
|
3724 | elif p2: | |
3722 | try: |
|
3725 | try: | |
3723 | p1 = repo[p1] |
|
3726 | p1 = repo[p1] | |
3724 | p2 = repo[p2] |
|
3727 | p2 = repo[p2] | |
3725 | # Without any options, consider p2 only if the |
|
3728 | # Without any options, consider p2 only if the | |
3726 | # patch is being applied on top of the recorded |
|
3729 | # patch is being applied on top of the recorded | |
3727 | # first parent. |
|
3730 | # first parent. | |
3728 | if p1 != parents[0]: |
|
3731 | if p1 != parents[0]: | |
3729 | p1 = parents[0] |
|
3732 | p1 = parents[0] | |
3730 | p2 = repo[nullid] |
|
3733 | p2 = repo[nullid] | |
3731 | except error.RepoError: |
|
3734 | except error.RepoError: | |
3732 | p1, p2 = parents |
|
3735 | p1, p2 = parents | |
3733 | else: |
|
3736 | else: | |
3734 | p1, p2 = parents |
|
3737 | p1, p2 = parents | |
3735 |
|
3738 | |||
3736 | n = None |
|
3739 | n = None | |
3737 | if update: |
|
3740 | if update: | |
3738 | if p1 != parents[0]: |
|
3741 | if p1 != parents[0]: | |
3739 | hg.clean(repo, p1.node()) |
|
3742 | hg.clean(repo, p1.node()) | |
3740 | if p2 != parents[1]: |
|
3743 | if p2 != parents[1]: | |
3741 | repo.setparents(p1.node(), p2.node()) |
|
3744 | repo.setparents(p1.node(), p2.node()) | |
3742 |
|
3745 | |||
3743 | if opts.get('exact') or opts.get('import_branch'): |
|
3746 | if opts.get('exact') or opts.get('import_branch'): | |
3744 | repo.dirstate.setbranch(branch or 'default') |
|
3747 | repo.dirstate.setbranch(branch or 'default') | |
3745 |
|
3748 | |||
3746 | files = set() |
|
3749 | files = set() | |
3747 | patch.patch(ui, repo, tmpname, strip=strip, files=files, |
|
3750 | patch.patch(ui, repo, tmpname, strip=strip, files=files, | |
3748 | eolmode=None, similarity=sim / 100.0) |
|
3751 | eolmode=None, similarity=sim / 100.0) | |
3749 | files = list(files) |
|
3752 | files = list(files) | |
3750 | if opts.get('no_commit'): |
|
3753 | if opts.get('no_commit'): | |
3751 | if message: |
|
3754 | if message: | |
3752 | msgs.append(message) |
|
3755 | msgs.append(message) | |
3753 | else: |
|
3756 | else: | |
3754 | if opts.get('exact') or p2: |
|
3757 | if opts.get('exact') or p2: | |
3755 | # If you got here, you either use --force and know what |
|
3758 | # If you got here, you either use --force and know what | |
3756 | # you are doing or used --exact or a merge patch while |
|
3759 | # you are doing or used --exact or a merge patch while | |
3757 | # being updated to its first parent. |
|
3760 | # being updated to its first parent. | |
3758 | m = None |
|
3761 | m = None | |
3759 | else: |
|
3762 | else: | |
3760 | m = scmutil.matchfiles(repo, files or []) |
|
3763 | m = scmutil.matchfiles(repo, files or []) | |
3761 | n = repo.commit(message, opts.get('user') or user, |
|
3764 | n = repo.commit(message, opts.get('user') or user, | |
3762 | opts.get('date') or date, match=m, |
|
3765 | opts.get('date') or date, match=m, | |
3763 | editor=editor) |
|
3766 | editor=editor) | |
3764 | else: |
|
3767 | else: | |
3765 | if opts.get('exact') or opts.get('import_branch'): |
|
3768 | if opts.get('exact') or opts.get('import_branch'): | |
3766 | branch = branch or 'default' |
|
3769 | branch = branch or 'default' | |
3767 | else: |
|
3770 | else: | |
3768 | branch = p1.branch() |
|
3771 | branch = p1.branch() | |
3769 | store = patch.filestore() |
|
3772 | store = patch.filestore() | |
3770 | try: |
|
3773 | try: | |
3771 | files = set() |
|
3774 | files = set() | |
3772 | try: |
|
3775 | try: | |
3773 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, |
|
3776 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, | |
3774 | files, eolmode=None) |
|
3777 | files, eolmode=None) | |
3775 | except patch.PatchError, e: |
|
3778 | except patch.PatchError, e: | |
3776 | raise util.Abort(str(e)) |
|
3779 | raise util.Abort(str(e)) | |
3777 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
3780 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | |
3778 | message, |
|
3781 | message, | |
3779 | opts.get('user') or user, |
|
3782 | opts.get('user') or user, | |
3780 | opts.get('date') or date, |
|
3783 | opts.get('date') or date, | |
3781 | branch, files, store, |
|
3784 | branch, files, store, | |
3782 | editor=cmdutil.commiteditor) |
|
3785 | editor=cmdutil.commiteditor) | |
3783 | repo.savecommitmessage(memctx.description()) |
|
3786 | repo.savecommitmessage(memctx.description()) | |
3784 | n = memctx.commit() |
|
3787 | n = memctx.commit() | |
3785 | finally: |
|
3788 | finally: | |
3786 | store.close() |
|
3789 | store.close() | |
3787 | if opts.get('exact') and hex(n) != nodeid: |
|
3790 | if opts.get('exact') and hex(n) != nodeid: | |
3788 | raise util.Abort(_('patch is damaged or loses information')) |
|
3791 | raise util.Abort(_('patch is damaged or loses information')) | |
3789 | if n: |
|
3792 | if n: | |
3790 | # i18n: refers to a short changeset id |
|
3793 | # i18n: refers to a short changeset id | |
3791 | msg = _('created %s') % short(n) |
|
3794 | msg = _('created %s') % short(n) | |
3792 | return (msg, n) |
|
3795 | return (msg, n) | |
3793 | finally: |
|
3796 | finally: | |
3794 | os.unlink(tmpname) |
|
3797 | os.unlink(tmpname) | |
3795 |
|
3798 | |||
3796 | try: |
|
3799 | try: | |
3797 | try: |
|
3800 | try: | |
3798 | wlock = repo.wlock() |
|
3801 | wlock = repo.wlock() | |
3799 | if not opts.get('no_commit'): |
|
3802 | if not opts.get('no_commit'): | |
3800 | lock = repo.lock() |
|
3803 | lock = repo.lock() | |
3801 | tr = repo.transaction('import') |
|
3804 | tr = repo.transaction('import') | |
3802 | parents = repo.parents() |
|
3805 | parents = repo.parents() | |
3803 | for patchurl in patches: |
|
3806 | for patchurl in patches: | |
3804 | if patchurl == '-': |
|
3807 | if patchurl == '-': | |
3805 | ui.status(_('applying patch from stdin\n')) |
|
3808 | ui.status(_('applying patch from stdin\n')) | |
3806 | patchfile = ui.fin |
|
3809 | patchfile = ui.fin | |
3807 | patchurl = 'stdin' # for error message |
|
3810 | patchurl = 'stdin' # for error message | |
3808 | else: |
|
3811 | else: | |
3809 | patchurl = os.path.join(base, patchurl) |
|
3812 | patchurl = os.path.join(base, patchurl) | |
3810 | ui.status(_('applying %s\n') % patchurl) |
|
3813 | ui.status(_('applying %s\n') % patchurl) | |
3811 | patchfile = hg.openpath(ui, patchurl) |
|
3814 | patchfile = hg.openpath(ui, patchurl) | |
3812 |
|
3815 | |||
3813 | haspatch = False |
|
3816 | haspatch = False | |
3814 | for hunk in patch.split(patchfile): |
|
3817 | for hunk in patch.split(patchfile): | |
3815 | (msg, node) = tryone(ui, hunk, parents) |
|
3818 | (msg, node) = tryone(ui, hunk, parents) | |
3816 | if msg: |
|
3819 | if msg: | |
3817 | haspatch = True |
|
3820 | haspatch = True | |
3818 | ui.note(msg + '\n') |
|
3821 | ui.note(msg + '\n') | |
3819 | if update or opts.get('exact'): |
|
3822 | if update or opts.get('exact'): | |
3820 | parents = repo.parents() |
|
3823 | parents = repo.parents() | |
3821 | else: |
|
3824 | else: | |
3822 | parents = [repo[node]] |
|
3825 | parents = [repo[node]] | |
3823 |
|
3826 | |||
3824 | if not haspatch: |
|
3827 | if not haspatch: | |
3825 | raise util.Abort(_('%s: no diffs found') % patchurl) |
|
3828 | raise util.Abort(_('%s: no diffs found') % patchurl) | |
3826 |
|
3829 | |||
3827 | if tr: |
|
3830 | if tr: | |
3828 | tr.close() |
|
3831 | tr.close() | |
3829 | if msgs: |
|
3832 | if msgs: | |
3830 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3833 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
3831 | except: # re-raises |
|
3834 | except: # re-raises | |
3832 | # wlock.release() indirectly calls dirstate.write(): since |
|
3835 | # wlock.release() indirectly calls dirstate.write(): since | |
3833 | # we're crashing, we do not want to change the working dir |
|
3836 | # we're crashing, we do not want to change the working dir | |
3834 | # parent after all, so make sure it writes nothing |
|
3837 | # parent after all, so make sure it writes nothing | |
3835 | repo.dirstate.invalidate() |
|
3838 | repo.dirstate.invalidate() | |
3836 | raise |
|
3839 | raise | |
3837 | finally: |
|
3840 | finally: | |
3838 | if tr: |
|
3841 | if tr: | |
3839 | tr.release() |
|
3842 | tr.release() | |
3840 | release(lock, wlock) |
|
3843 | release(lock, wlock) | |
3841 |
|
3844 | |||
3842 | @command('incoming|in', |
|
3845 | @command('incoming|in', | |
3843 | [('f', 'force', None, |
|
3846 | [('f', 'force', None, | |
3844 | _('run even if remote repository is unrelated')), |
|
3847 | _('run even if remote repository is unrelated')), | |
3845 | ('n', 'newest-first', None, _('show newest record first')), |
|
3848 | ('n', 'newest-first', None, _('show newest record first')), | |
3846 | ('', 'bundle', '', |
|
3849 | ('', 'bundle', '', | |
3847 | _('file to store the bundles into'), _('FILE')), |
|
3850 | _('file to store the bundles into'), _('FILE')), | |
3848 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3851 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3849 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3852 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
3850 | ('b', 'branch', [], |
|
3853 | ('b', 'branch', [], | |
3851 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3854 | _('a specific branch you would like to pull'), _('BRANCH')), | |
3852 | ] + logopts + remoteopts + subrepoopts, |
|
3855 | ] + logopts + remoteopts + subrepoopts, | |
3853 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3856 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
3854 | def incoming(ui, repo, source="default", **opts): |
|
3857 | def incoming(ui, repo, source="default", **opts): | |
3855 | """show new changesets found in source |
|
3858 | """show new changesets found in source | |
3856 |
|
3859 | |||
3857 | Show new changesets found in the specified path/URL or the default |
|
3860 | Show new changesets found in the specified path/URL or the default | |
3858 | pull location. These are the changesets that would have been pulled |
|
3861 | pull location. These are the changesets that would have been pulled | |
3859 | if a pull at the time you issued this command. |
|
3862 | if a pull at the time you issued this command. | |
3860 |
|
3863 | |||
3861 | For remote repository, using --bundle avoids downloading the |
|
3864 | For remote repository, using --bundle avoids downloading the | |
3862 | changesets twice if the incoming is followed by a pull. |
|
3865 | changesets twice if the incoming is followed by a pull. | |
3863 |
|
3866 | |||
3864 | See pull for valid source format details. |
|
3867 | See pull for valid source format details. | |
3865 |
|
3868 | |||
3866 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3869 | Returns 0 if there are incoming changes, 1 otherwise. | |
3867 | """ |
|
3870 | """ | |
3868 | if opts.get('graph'): |
|
3871 | if opts.get('graph'): | |
3869 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3872 | cmdutil.checkunsupportedgraphflags([], opts) | |
3870 | def display(other, chlist, displayer): |
|
3873 | def display(other, chlist, displayer): | |
3871 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
3874 | revdag = cmdutil.graphrevs(other, chlist, opts) | |
3872 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
3875 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
3873 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
3876 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
3874 | graphmod.asciiedges) |
|
3877 | graphmod.asciiedges) | |
3875 |
|
3878 | |||
3876 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3879 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
3877 | return 0 |
|
3880 | return 0 | |
3878 |
|
3881 | |||
3879 | if opts.get('bundle') and opts.get('subrepos'): |
|
3882 | if opts.get('bundle') and opts.get('subrepos'): | |
3880 | raise util.Abort(_('cannot combine --bundle and --subrepos')) |
|
3883 | raise util.Abort(_('cannot combine --bundle and --subrepos')) | |
3881 |
|
3884 | |||
3882 | if opts.get('bookmarks'): |
|
3885 | if opts.get('bookmarks'): | |
3883 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3886 | source, branches = hg.parseurl(ui.expandpath(source), | |
3884 | opts.get('branch')) |
|
3887 | opts.get('branch')) | |
3885 | other = hg.peer(repo, opts, source) |
|
3888 | other = hg.peer(repo, opts, source) | |
3886 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3889 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3887 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3890 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3888 | return 0 |
|
3891 | return 0 | |
3889 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3892 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
3890 | return bookmarks.diff(ui, repo, other) |
|
3893 | return bookmarks.diff(ui, repo, other) | |
3891 |
|
3894 | |||
3892 | repo._subtoppath = ui.expandpath(source) |
|
3895 | repo._subtoppath = ui.expandpath(source) | |
3893 | try: |
|
3896 | try: | |
3894 | return hg.incoming(ui, repo, source, opts) |
|
3897 | return hg.incoming(ui, repo, source, opts) | |
3895 | finally: |
|
3898 | finally: | |
3896 | del repo._subtoppath |
|
3899 | del repo._subtoppath | |
3897 |
|
3900 | |||
3898 |
|
3901 | |||
3899 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) |
|
3902 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) | |
3900 | def init(ui, dest=".", **opts): |
|
3903 | def init(ui, dest=".", **opts): | |
3901 | """create a new repository in the given directory |
|
3904 | """create a new repository in the given directory | |
3902 |
|
3905 | |||
3903 | Initialize a new repository in the given directory. If the given |
|
3906 | Initialize a new repository in the given directory. If the given | |
3904 | directory does not exist, it will be created. |
|
3907 | directory does not exist, it will be created. | |
3905 |
|
3908 | |||
3906 | If no directory is given, the current directory is used. |
|
3909 | If no directory is given, the current directory is used. | |
3907 |
|
3910 | |||
3908 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3911 | It is possible to specify an ``ssh://`` URL as the destination. | |
3909 | See :hg:`help urls` for more information. |
|
3912 | See :hg:`help urls` for more information. | |
3910 |
|
3913 | |||
3911 | Returns 0 on success. |
|
3914 | Returns 0 on success. | |
3912 | """ |
|
3915 | """ | |
3913 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3916 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
3914 |
|
3917 | |||
3915 | @command('locate', |
|
3918 | @command('locate', | |
3916 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3919 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3917 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3920 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3918 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3921 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
3919 | ] + walkopts, |
|
3922 | ] + walkopts, | |
3920 | _('[OPTION]... [PATTERN]...')) |
|
3923 | _('[OPTION]... [PATTERN]...')) | |
3921 | def locate(ui, repo, *pats, **opts): |
|
3924 | def locate(ui, repo, *pats, **opts): | |
3922 | """locate files matching specific patterns |
|
3925 | """locate files matching specific patterns | |
3923 |
|
3926 | |||
3924 | Print files under Mercurial control in the working directory whose |
|
3927 | Print files under Mercurial control in the working directory whose | |
3925 | names match the given patterns. |
|
3928 | names match the given patterns. | |
3926 |
|
3929 | |||
3927 | By default, this command searches all directories in the working |
|
3930 | By default, this command searches all directories in the working | |
3928 | directory. To search just the current directory and its |
|
3931 | directory. To search just the current directory and its | |
3929 | subdirectories, use "--include .". |
|
3932 | subdirectories, use "--include .". | |
3930 |
|
3933 | |||
3931 | If no patterns are given to match, this command prints the names |
|
3934 | If no patterns are given to match, this command prints the names | |
3932 | of all files under Mercurial control in the working directory. |
|
3935 | of all files under Mercurial control in the working directory. | |
3933 |
|
3936 | |||
3934 | If you want to feed the output of this command into the "xargs" |
|
3937 | If you want to feed the output of this command into the "xargs" | |
3935 | command, use the -0 option to both this command and "xargs". This |
|
3938 | command, use the -0 option to both this command and "xargs". This | |
3936 | will avoid the problem of "xargs" treating single filenames that |
|
3939 | will avoid the problem of "xargs" treating single filenames that | |
3937 | contain whitespace as multiple filenames. |
|
3940 | contain whitespace as multiple filenames. | |
3938 |
|
3941 | |||
3939 | Returns 0 if a match is found, 1 otherwise. |
|
3942 | Returns 0 if a match is found, 1 otherwise. | |
3940 | """ |
|
3943 | """ | |
3941 | end = opts.get('print0') and '\0' or '\n' |
|
3944 | end = opts.get('print0') and '\0' or '\n' | |
3942 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3945 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() | |
3943 |
|
3946 | |||
3944 | ret = 1 |
|
3947 | ret = 1 | |
3945 | m = scmutil.match(repo[rev], pats, opts, default='relglob') |
|
3948 | m = scmutil.match(repo[rev], pats, opts, default='relglob') | |
3946 | m.bad = lambda x, y: False |
|
3949 | m.bad = lambda x, y: False | |
3947 | for abs in repo[rev].walk(m): |
|
3950 | for abs in repo[rev].walk(m): | |
3948 | if not rev and abs not in repo.dirstate: |
|
3951 | if not rev and abs not in repo.dirstate: | |
3949 | continue |
|
3952 | continue | |
3950 | if opts.get('fullpath'): |
|
3953 | if opts.get('fullpath'): | |
3951 | ui.write(repo.wjoin(abs), end) |
|
3954 | ui.write(repo.wjoin(abs), end) | |
3952 | else: |
|
3955 | else: | |
3953 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3956 | ui.write(((pats and m.rel(abs)) or abs), end) | |
3954 | ret = 0 |
|
3957 | ret = 0 | |
3955 |
|
3958 | |||
3956 | return ret |
|
3959 | return ret | |
3957 |
|
3960 | |||
3958 | @command('^log|history', |
|
3961 | @command('^log|history', | |
3959 | [('f', 'follow', None, |
|
3962 | [('f', 'follow', None, | |
3960 | _('follow changeset history, or file history across copies and renames')), |
|
3963 | _('follow changeset history, or file history across copies and renames')), | |
3961 | ('', 'follow-first', None, |
|
3964 | ('', 'follow-first', None, | |
3962 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3965 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
3963 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3966 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
3964 | ('C', 'copies', None, _('show copied files')), |
|
3967 | ('C', 'copies', None, _('show copied files')), | |
3965 | ('k', 'keyword', [], |
|
3968 | ('k', 'keyword', [], | |
3966 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3969 | _('do case-insensitive search for a given text'), _('TEXT')), | |
3967 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), |
|
3970 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), | |
3968 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3971 | ('', 'removed', None, _('include revisions where files were removed')), | |
3969 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3972 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
3970 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3973 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
3971 | ('', 'only-branch', [], |
|
3974 | ('', 'only-branch', [], | |
3972 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3975 | _('show only changesets within the given named branch (DEPRECATED)'), | |
3973 | _('BRANCH')), |
|
3976 | _('BRANCH')), | |
3974 | ('b', 'branch', [], |
|
3977 | ('b', 'branch', [], | |
3975 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3978 | _('show changesets within the given named branch'), _('BRANCH')), | |
3976 | ('P', 'prune', [], |
|
3979 | ('P', 'prune', [], | |
3977 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3980 | _('do not display revision or any of its ancestors'), _('REV')), | |
3978 | ] + logopts + walkopts, |
|
3981 | ] + logopts + walkopts, | |
3979 | _('[OPTION]... [FILE]')) |
|
3982 | _('[OPTION]... [FILE]')) | |
3980 | def log(ui, repo, *pats, **opts): |
|
3983 | def log(ui, repo, *pats, **opts): | |
3981 | """show revision history of entire repository or files |
|
3984 | """show revision history of entire repository or files | |
3982 |
|
3985 | |||
3983 | Print the revision history of the specified files or the entire |
|
3986 | Print the revision history of the specified files or the entire | |
3984 | project. |
|
3987 | project. | |
3985 |
|
3988 | |||
3986 | If no revision range is specified, the default is ``tip:0`` unless |
|
3989 | If no revision range is specified, the default is ``tip:0`` unless | |
3987 | --follow is set, in which case the working directory parent is |
|
3990 | --follow is set, in which case the working directory parent is | |
3988 | used as the starting revision. |
|
3991 | used as the starting revision. | |
3989 |
|
3992 | |||
3990 | File history is shown without following rename or copy history of |
|
3993 | File history is shown without following rename or copy history of | |
3991 | files. Use -f/--follow with a filename to follow history across |
|
3994 | files. Use -f/--follow with a filename to follow history across | |
3992 | renames and copies. --follow without a filename will only show |
|
3995 | renames and copies. --follow without a filename will only show | |
3993 | ancestors or descendants of the starting revision. |
|
3996 | ancestors or descendants of the starting revision. | |
3994 |
|
3997 | |||
3995 | By default this command prints revision number and changeset id, |
|
3998 | By default this command prints revision number and changeset id, | |
3996 | tags, non-trivial parents, user, date and time, and a summary for |
|
3999 | tags, non-trivial parents, user, date and time, and a summary for | |
3997 | each commit. When the -v/--verbose switch is used, the list of |
|
4000 | each commit. When the -v/--verbose switch is used, the list of | |
3998 | changed files and full commit message are shown. |
|
4001 | changed files and full commit message are shown. | |
3999 |
|
4002 | |||
4000 | .. note:: |
|
4003 | .. note:: | |
4001 |
|
4004 | |||
4002 | log -p/--patch may generate unexpected diff output for merge |
|
4005 | log -p/--patch may generate unexpected diff output for merge | |
4003 | changesets, as it will only compare the merge changeset against |
|
4006 | changesets, as it will only compare the merge changeset against | |
4004 | its first parent. Also, only files different from BOTH parents |
|
4007 | its first parent. Also, only files different from BOTH parents | |
4005 | will appear in files:. |
|
4008 | will appear in files:. | |
4006 |
|
4009 | |||
4007 | .. note:: |
|
4010 | .. note:: | |
4008 |
|
4011 | |||
4009 | for performance reasons, log FILE may omit duplicate changes |
|
4012 | for performance reasons, log FILE may omit duplicate changes | |
4010 | made on branches and will not show deletions. To see all |
|
4013 | made on branches and will not show deletions. To see all | |
4011 | changes including duplicates and deletions, use the --removed |
|
4014 | changes including duplicates and deletions, use the --removed | |
4012 | switch. |
|
4015 | switch. | |
4013 |
|
4016 | |||
4014 | .. container:: verbose |
|
4017 | .. container:: verbose | |
4015 |
|
4018 | |||
4016 | Some examples: |
|
4019 | Some examples: | |
4017 |
|
4020 | |||
4018 | - changesets with full descriptions and file lists:: |
|
4021 | - changesets with full descriptions and file lists:: | |
4019 |
|
4022 | |||
4020 | hg log -v |
|
4023 | hg log -v | |
4021 |
|
4024 | |||
4022 | - changesets ancestral to the working directory:: |
|
4025 | - changesets ancestral to the working directory:: | |
4023 |
|
4026 | |||
4024 | hg log -f |
|
4027 | hg log -f | |
4025 |
|
4028 | |||
4026 | - last 10 commits on the current branch:: |
|
4029 | - last 10 commits on the current branch:: | |
4027 |
|
4030 | |||
4028 | hg log -l 10 -b . |
|
4031 | hg log -l 10 -b . | |
4029 |
|
4032 | |||
4030 | - changesets showing all modifications of a file, including removals:: |
|
4033 | - changesets showing all modifications of a file, including removals:: | |
4031 |
|
4034 | |||
4032 | hg log --removed file.c |
|
4035 | hg log --removed file.c | |
4033 |
|
4036 | |||
4034 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
4037 | - all changesets that touch a directory, with diffs, excluding merges:: | |
4035 |
|
4038 | |||
4036 | hg log -Mp lib/ |
|
4039 | hg log -Mp lib/ | |
4037 |
|
4040 | |||
4038 | - all revision numbers that match a keyword:: |
|
4041 | - all revision numbers that match a keyword:: | |
4039 |
|
4042 | |||
4040 | hg log -k bug --template "{rev}\\n" |
|
4043 | hg log -k bug --template "{rev}\\n" | |
4041 |
|
4044 | |||
4042 | - check if a given changeset is included is a tagged release:: |
|
4045 | - check if a given changeset is included is a tagged release:: | |
4043 |
|
4046 | |||
4044 | hg log -r "a21ccf and ancestor(1.9)" |
|
4047 | hg log -r "a21ccf and ancestor(1.9)" | |
4045 |
|
4048 | |||
4046 | - find all changesets by some user in a date range:: |
|
4049 | - find all changesets by some user in a date range:: | |
4047 |
|
4050 | |||
4048 | hg log -k alice -d "may 2008 to jul 2008" |
|
4051 | hg log -k alice -d "may 2008 to jul 2008" | |
4049 |
|
4052 | |||
4050 | - summary of all changesets after the last tag:: |
|
4053 | - summary of all changesets after the last tag:: | |
4051 |
|
4054 | |||
4052 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
4055 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
4053 |
|
4056 | |||
4054 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4057 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4055 |
|
4058 | |||
4056 | See :hg:`help revisions` and :hg:`help revsets` for more about |
|
4059 | See :hg:`help revisions` and :hg:`help revsets` for more about | |
4057 | specifying revisions. |
|
4060 | specifying revisions. | |
4058 |
|
4061 | |||
4059 | See :hg:`help templates` for more about pre-packaged styles and |
|
4062 | See :hg:`help templates` for more about pre-packaged styles and | |
4060 | specifying custom templates. |
|
4063 | specifying custom templates. | |
4061 |
|
4064 | |||
4062 | Returns 0 on success. |
|
4065 | Returns 0 on success. | |
4063 | """ |
|
4066 | """ | |
4064 | if opts.get('graph'): |
|
4067 | if opts.get('graph'): | |
4065 | return cmdutil.graphlog(ui, repo, *pats, **opts) |
|
4068 | return cmdutil.graphlog(ui, repo, *pats, **opts) | |
4066 |
|
4069 | |||
4067 | matchfn = scmutil.match(repo[None], pats, opts) |
|
4070 | matchfn = scmutil.match(repo[None], pats, opts) | |
4068 | limit = cmdutil.loglimit(opts) |
|
4071 | limit = cmdutil.loglimit(opts) | |
4069 | count = 0 |
|
4072 | count = 0 | |
4070 |
|
4073 | |||
4071 | getrenamed, endrev = None, None |
|
4074 | getrenamed, endrev = None, None | |
4072 | if opts.get('copies'): |
|
4075 | if opts.get('copies'): | |
4073 | if opts.get('rev'): |
|
4076 | if opts.get('rev'): | |
4074 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 |
|
4077 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 | |
4075 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
4078 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
4076 |
|
4079 | |||
4077 | df = False |
|
4080 | df = False | |
4078 | if opts.get("date"): |
|
4081 | if opts.get("date"): | |
4079 | df = util.matchdate(opts["date"]) |
|
4082 | df = util.matchdate(opts["date"]) | |
4080 |
|
4083 | |||
4081 | branches = opts.get('branch', []) + opts.get('only_branch', []) |
|
4084 | branches = opts.get('branch', []) + opts.get('only_branch', []) | |
4082 | opts['branch'] = [repo.lookupbranch(b) for b in branches] |
|
4085 | opts['branch'] = [repo.lookupbranch(b) for b in branches] | |
4083 |
|
4086 | |||
4084 | displayer = cmdutil.show_changeset(ui, repo, opts, True) |
|
4087 | displayer = cmdutil.show_changeset(ui, repo, opts, True) | |
4085 | def prep(ctx, fns): |
|
4088 | def prep(ctx, fns): | |
4086 | rev = ctx.rev() |
|
4089 | rev = ctx.rev() | |
4087 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
4090 | parents = [p for p in repo.changelog.parentrevs(rev) | |
4088 | if p != nullrev] |
|
4091 | if p != nullrev] | |
4089 | if opts.get('no_merges') and len(parents) == 2: |
|
4092 | if opts.get('no_merges') and len(parents) == 2: | |
4090 | return |
|
4093 | return | |
4091 | if opts.get('only_merges') and len(parents) != 2: |
|
4094 | if opts.get('only_merges') and len(parents) != 2: | |
4092 | return |
|
4095 | return | |
4093 | if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
4096 | if opts.get('branch') and ctx.branch() not in opts['branch']: | |
4094 | return |
|
4097 | return | |
4095 | if df and not df(ctx.date()[0]): |
|
4098 | if df and not df(ctx.date()[0]): | |
4096 | return |
|
4099 | return | |
4097 |
|
4100 | |||
4098 | lower = encoding.lower |
|
4101 | lower = encoding.lower | |
4099 | if opts.get('user'): |
|
4102 | if opts.get('user'): | |
4100 | luser = lower(ctx.user()) |
|
4103 | luser = lower(ctx.user()) | |
4101 | for k in [lower(x) for x in opts['user']]: |
|
4104 | for k in [lower(x) for x in opts['user']]: | |
4102 | if (k in luser): |
|
4105 | if (k in luser): | |
4103 | break |
|
4106 | break | |
4104 | else: |
|
4107 | else: | |
4105 | return |
|
4108 | return | |
4106 | if opts.get('keyword'): |
|
4109 | if opts.get('keyword'): | |
4107 | luser = lower(ctx.user()) |
|
4110 | luser = lower(ctx.user()) | |
4108 | ldesc = lower(ctx.description()) |
|
4111 | ldesc = lower(ctx.description()) | |
4109 | lfiles = lower(" ".join(ctx.files())) |
|
4112 | lfiles = lower(" ".join(ctx.files())) | |
4110 | for k in [lower(x) for x in opts['keyword']]: |
|
4113 | for k in [lower(x) for x in opts['keyword']]: | |
4111 | if (k in luser or k in ldesc or k in lfiles): |
|
4114 | if (k in luser or k in ldesc or k in lfiles): | |
4112 | break |
|
4115 | break | |
4113 | else: |
|
4116 | else: | |
4114 | return |
|
4117 | return | |
4115 |
|
4118 | |||
4116 | copies = None |
|
4119 | copies = None | |
4117 | if getrenamed is not None and rev: |
|
4120 | if getrenamed is not None and rev: | |
4118 | copies = [] |
|
4121 | copies = [] | |
4119 | for fn in ctx.files(): |
|
4122 | for fn in ctx.files(): | |
4120 | rename = getrenamed(fn, rev) |
|
4123 | rename = getrenamed(fn, rev) | |
4121 | if rename: |
|
4124 | if rename: | |
4122 | copies.append((fn, rename[0])) |
|
4125 | copies.append((fn, rename[0])) | |
4123 |
|
4126 | |||
4124 | revmatchfn = None |
|
4127 | revmatchfn = None | |
4125 | if opts.get('patch') or opts.get('stat'): |
|
4128 | if opts.get('patch') or opts.get('stat'): | |
4126 | if opts.get('follow') or opts.get('follow_first'): |
|
4129 | if opts.get('follow') or opts.get('follow_first'): | |
4127 | # note: this might be wrong when following through merges |
|
4130 | # note: this might be wrong when following through merges | |
4128 | revmatchfn = scmutil.match(repo[None], fns, default='path') |
|
4131 | revmatchfn = scmutil.match(repo[None], fns, default='path') | |
4129 | else: |
|
4132 | else: | |
4130 | revmatchfn = matchfn |
|
4133 | revmatchfn = matchfn | |
4131 |
|
4134 | |||
4132 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
4135 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
4133 |
|
4136 | |||
4134 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
4137 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
4135 | if displayer.flush(ctx.rev()): |
|
4138 | if displayer.flush(ctx.rev()): | |
4136 | count += 1 |
|
4139 | count += 1 | |
4137 | if count == limit: |
|
4140 | if count == limit: | |
4138 | break |
|
4141 | break | |
4139 | displayer.close() |
|
4142 | displayer.close() | |
4140 |
|
4143 | |||
4141 | @command('manifest', |
|
4144 | @command('manifest', | |
4142 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
4145 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
4143 | ('', 'all', False, _("list files from all revisions"))], |
|
4146 | ('', 'all', False, _("list files from all revisions"))], | |
4144 | _('[-r REV]')) |
|
4147 | _('[-r REV]')) | |
4145 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
4148 | def manifest(ui, repo, node=None, rev=None, **opts): | |
4146 | """output the current or given revision of the project manifest |
|
4149 | """output the current or given revision of the project manifest | |
4147 |
|
4150 | |||
4148 | Print a list of version controlled files for the given revision. |
|
4151 | Print a list of version controlled files for the given revision. | |
4149 | If no revision is given, the first parent of the working directory |
|
4152 | If no revision is given, the first parent of the working directory | |
4150 | is used, or the null revision if no revision is checked out. |
|
4153 | is used, or the null revision if no revision is checked out. | |
4151 |
|
4154 | |||
4152 | With -v, print file permissions, symlink and executable bits. |
|
4155 | With -v, print file permissions, symlink and executable bits. | |
4153 | With --debug, print file revision hashes. |
|
4156 | With --debug, print file revision hashes. | |
4154 |
|
4157 | |||
4155 | If option --all is specified, the list of all files from all revisions |
|
4158 | If option --all is specified, the list of all files from all revisions | |
4156 | is printed. This includes deleted and renamed files. |
|
4159 | is printed. This includes deleted and renamed files. | |
4157 |
|
4160 | |||
4158 | Returns 0 on success. |
|
4161 | Returns 0 on success. | |
4159 | """ |
|
4162 | """ | |
4160 |
|
4163 | |||
4161 | fm = ui.formatter('manifest', opts) |
|
4164 | fm = ui.formatter('manifest', opts) | |
4162 |
|
4165 | |||
4163 | if opts.get('all'): |
|
4166 | if opts.get('all'): | |
4164 | if rev or node: |
|
4167 | if rev or node: | |
4165 | raise util.Abort(_("can't specify a revision with --all")) |
|
4168 | raise util.Abort(_("can't specify a revision with --all")) | |
4166 |
|
4169 | |||
4167 | res = [] |
|
4170 | res = [] | |
4168 | prefix = "data/" |
|
4171 | prefix = "data/" | |
4169 | suffix = ".i" |
|
4172 | suffix = ".i" | |
4170 | plen = len(prefix) |
|
4173 | plen = len(prefix) | |
4171 | slen = len(suffix) |
|
4174 | slen = len(suffix) | |
4172 | lock = repo.lock() |
|
4175 | lock = repo.lock() | |
4173 | try: |
|
4176 | try: | |
4174 | for fn, b, size in repo.store.datafiles(): |
|
4177 | for fn, b, size in repo.store.datafiles(): | |
4175 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
4178 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
4176 | res.append(fn[plen:-slen]) |
|
4179 | res.append(fn[plen:-slen]) | |
4177 | finally: |
|
4180 | finally: | |
4178 | lock.release() |
|
4181 | lock.release() | |
4179 | for f in res: |
|
4182 | for f in res: | |
4180 | fm.startitem() |
|
4183 | fm.startitem() | |
4181 | fm.write("path", '%s\n', f) |
|
4184 | fm.write("path", '%s\n', f) | |
4182 | fm.end() |
|
4185 | fm.end() | |
4183 | return |
|
4186 | return | |
4184 |
|
4187 | |||
4185 | if rev and node: |
|
4188 | if rev and node: | |
4186 | raise util.Abort(_("please specify just one revision")) |
|
4189 | raise util.Abort(_("please specify just one revision")) | |
4187 |
|
4190 | |||
4188 | if not node: |
|
4191 | if not node: | |
4189 | node = rev |
|
4192 | node = rev | |
4190 |
|
4193 | |||
4191 | char = {'l': '@', 'x': '*', '': ''} |
|
4194 | char = {'l': '@', 'x': '*', '': ''} | |
4192 | mode = {'l': '644', 'x': '755', '': '644'} |
|
4195 | mode = {'l': '644', 'x': '755', '': '644'} | |
4193 | ctx = scmutil.revsingle(repo, node) |
|
4196 | ctx = scmutil.revsingle(repo, node) | |
4194 | mf = ctx.manifest() |
|
4197 | mf = ctx.manifest() | |
4195 | for f in ctx: |
|
4198 | for f in ctx: | |
4196 | fm.startitem() |
|
4199 | fm.startitem() | |
4197 | fl = ctx[f].flags() |
|
4200 | fl = ctx[f].flags() | |
4198 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
4201 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
4199 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
4202 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
4200 | fm.write('path', '%s\n', f) |
|
4203 | fm.write('path', '%s\n', f) | |
4201 | fm.end() |
|
4204 | fm.end() | |
4202 |
|
4205 | |||
4203 | @command('^merge', |
|
4206 | @command('^merge', | |
4204 | [('f', 'force', None, |
|
4207 | [('f', 'force', None, | |
4205 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
4208 | _('force a merge including outstanding changes (DEPRECATED)')), | |
4206 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
4209 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
4207 | ('P', 'preview', None, |
|
4210 | ('P', 'preview', None, | |
4208 | _('review revisions to merge (no merge is performed)')) |
|
4211 | _('review revisions to merge (no merge is performed)')) | |
4209 | ] + mergetoolopts, |
|
4212 | ] + mergetoolopts, | |
4210 | _('[-P] [-f] [[-r] REV]')) |
|
4213 | _('[-P] [-f] [[-r] REV]')) | |
4211 | def merge(ui, repo, node=None, **opts): |
|
4214 | def merge(ui, repo, node=None, **opts): | |
4212 | """merge working directory with another revision |
|
4215 | """merge working directory with another revision | |
4213 |
|
4216 | |||
4214 | The current working directory is updated with all changes made in |
|
4217 | The current working directory is updated with all changes made in | |
4215 | the requested revision since the last common predecessor revision. |
|
4218 | the requested revision since the last common predecessor revision. | |
4216 |
|
4219 | |||
4217 | Files that changed between either parent are marked as changed for |
|
4220 | Files that changed between either parent are marked as changed for | |
4218 | the next commit and a commit must be performed before any further |
|
4221 | the next commit and a commit must be performed before any further | |
4219 | updates to the repository are allowed. The next commit will have |
|
4222 | updates to the repository are allowed. The next commit will have | |
4220 | two parents. |
|
4223 | two parents. | |
4221 |
|
4224 | |||
4222 | ``--tool`` can be used to specify the merge tool used for file |
|
4225 | ``--tool`` can be used to specify the merge tool used for file | |
4223 | merges. It overrides the HGMERGE environment variable and your |
|
4226 | merges. It overrides the HGMERGE environment variable and your | |
4224 | configuration files. See :hg:`help merge-tools` for options. |
|
4227 | configuration files. See :hg:`help merge-tools` for options. | |
4225 |
|
4228 | |||
4226 | If no revision is specified, the working directory's parent is a |
|
4229 | If no revision is specified, the working directory's parent is a | |
4227 | head revision, and the current branch contains exactly one other |
|
4230 | head revision, and the current branch contains exactly one other | |
4228 | head, the other head is merged with by default. Otherwise, an |
|
4231 | head, the other head is merged with by default. Otherwise, an | |
4229 | explicit revision with which to merge with must be provided. |
|
4232 | explicit revision with which to merge with must be provided. | |
4230 |
|
4233 | |||
4231 | :hg:`resolve` must be used to resolve unresolved files. |
|
4234 | :hg:`resolve` must be used to resolve unresolved files. | |
4232 |
|
4235 | |||
4233 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
4236 | To undo an uncommitted merge, use :hg:`update --clean .` which | |
4234 | will check out a clean copy of the original merge parent, losing |
|
4237 | will check out a clean copy of the original merge parent, losing | |
4235 | all changes. |
|
4238 | all changes. | |
4236 |
|
4239 | |||
4237 | Returns 0 on success, 1 if there are unresolved files. |
|
4240 | Returns 0 on success, 1 if there are unresolved files. | |
4238 | """ |
|
4241 | """ | |
4239 |
|
4242 | |||
4240 | if opts.get('rev') and node: |
|
4243 | if opts.get('rev') and node: | |
4241 | raise util.Abort(_("please specify just one revision")) |
|
4244 | raise util.Abort(_("please specify just one revision")) | |
4242 | if not node: |
|
4245 | if not node: | |
4243 | node = opts.get('rev') |
|
4246 | node = opts.get('rev') | |
4244 |
|
4247 | |||
4245 | if node: |
|
4248 | if node: | |
4246 | node = scmutil.revsingle(repo, node).node() |
|
4249 | node = scmutil.revsingle(repo, node).node() | |
4247 |
|
4250 | |||
4248 | if not node and repo._bookmarkcurrent: |
|
4251 | if not node and repo._bookmarkcurrent: | |
4249 | bmheads = repo.bookmarkheads(repo._bookmarkcurrent) |
|
4252 | bmheads = repo.bookmarkheads(repo._bookmarkcurrent) | |
4250 | curhead = repo[repo._bookmarkcurrent].node() |
|
4253 | curhead = repo[repo._bookmarkcurrent].node() | |
4251 | if len(bmheads) == 2: |
|
4254 | if len(bmheads) == 2: | |
4252 | if curhead == bmheads[0]: |
|
4255 | if curhead == bmheads[0]: | |
4253 | node = bmheads[1] |
|
4256 | node = bmheads[1] | |
4254 | else: |
|
4257 | else: | |
4255 | node = bmheads[0] |
|
4258 | node = bmheads[0] | |
4256 | elif len(bmheads) > 2: |
|
4259 | elif len(bmheads) > 2: | |
4257 | raise util.Abort(_("multiple matching bookmarks to merge - " |
|
4260 | raise util.Abort(_("multiple matching bookmarks to merge - " | |
4258 | "please merge with an explicit rev or bookmark"), |
|
4261 | "please merge with an explicit rev or bookmark"), | |
4259 | hint=_("run 'hg heads' to see all heads")) |
|
4262 | hint=_("run 'hg heads' to see all heads")) | |
4260 | elif len(bmheads) <= 1: |
|
4263 | elif len(bmheads) <= 1: | |
4261 | raise util.Abort(_("no matching bookmark to merge - " |
|
4264 | raise util.Abort(_("no matching bookmark to merge - " | |
4262 | "please merge with an explicit rev or bookmark"), |
|
4265 | "please merge with an explicit rev or bookmark"), | |
4263 | hint=_("run 'hg heads' to see all heads")) |
|
4266 | hint=_("run 'hg heads' to see all heads")) | |
4264 |
|
4267 | |||
4265 | if not node and not repo._bookmarkcurrent: |
|
4268 | if not node and not repo._bookmarkcurrent: | |
4266 | branch = repo[None].branch() |
|
4269 | branch = repo[None].branch() | |
4267 | bheads = repo.branchheads(branch) |
|
4270 | bheads = repo.branchheads(branch) | |
4268 | nbhs = [bh for bh in bheads if not repo[bh].bookmarks()] |
|
4271 | nbhs = [bh for bh in bheads if not repo[bh].bookmarks()] | |
4269 |
|
4272 | |||
4270 | if len(nbhs) > 2: |
|
4273 | if len(nbhs) > 2: | |
4271 | raise util.Abort(_("branch '%s' has %d heads - " |
|
4274 | raise util.Abort(_("branch '%s' has %d heads - " | |
4272 | "please merge with an explicit rev") |
|
4275 | "please merge with an explicit rev") | |
4273 | % (branch, len(bheads)), |
|
4276 | % (branch, len(bheads)), | |
4274 | hint=_("run 'hg heads .' to see heads")) |
|
4277 | hint=_("run 'hg heads .' to see heads")) | |
4275 |
|
4278 | |||
4276 | parent = repo.dirstate.p1() |
|
4279 | parent = repo.dirstate.p1() | |
4277 | if len(nbhs) <= 1: |
|
4280 | if len(nbhs) <= 1: | |
4278 | if len(bheads) > 1: |
|
4281 | if len(bheads) > 1: | |
4279 | raise util.Abort(_("heads are bookmarked - " |
|
4282 | raise util.Abort(_("heads are bookmarked - " | |
4280 | "please merge with an explicit rev"), |
|
4283 | "please merge with an explicit rev"), | |
4281 | hint=_("run 'hg heads' to see all heads")) |
|
4284 | hint=_("run 'hg heads' to see all heads")) | |
4282 | if len(repo.heads()) > 1: |
|
4285 | if len(repo.heads()) > 1: | |
4283 | raise util.Abort(_("branch '%s' has one head - " |
|
4286 | raise util.Abort(_("branch '%s' has one head - " | |
4284 | "please merge with an explicit rev") |
|
4287 | "please merge with an explicit rev") | |
4285 | % branch, |
|
4288 | % branch, | |
4286 | hint=_("run 'hg heads' to see all heads")) |
|
4289 | hint=_("run 'hg heads' to see all heads")) | |
4287 | msg, hint = _('nothing to merge'), None |
|
4290 | msg, hint = _('nothing to merge'), None | |
4288 | if parent != repo.lookup(branch): |
|
4291 | if parent != repo.lookup(branch): | |
4289 | hint = _("use 'hg update' instead") |
|
4292 | hint = _("use 'hg update' instead") | |
4290 | raise util.Abort(msg, hint=hint) |
|
4293 | raise util.Abort(msg, hint=hint) | |
4291 |
|
4294 | |||
4292 | if parent not in bheads: |
|
4295 | if parent not in bheads: | |
4293 | raise util.Abort(_('working directory not at a head revision'), |
|
4296 | raise util.Abort(_('working directory not at a head revision'), | |
4294 | hint=_("use 'hg update' or merge with an " |
|
4297 | hint=_("use 'hg update' or merge with an " | |
4295 | "explicit revision")) |
|
4298 | "explicit revision")) | |
4296 | if parent == nbhs[0]: |
|
4299 | if parent == nbhs[0]: | |
4297 | node = nbhs[-1] |
|
4300 | node = nbhs[-1] | |
4298 | else: |
|
4301 | else: | |
4299 | node = nbhs[0] |
|
4302 | node = nbhs[0] | |
4300 |
|
4303 | |||
4301 | if opts.get('preview'): |
|
4304 | if opts.get('preview'): | |
4302 | # find nodes that are ancestors of p2 but not of p1 |
|
4305 | # find nodes that are ancestors of p2 but not of p1 | |
4303 | p1 = repo.lookup('.') |
|
4306 | p1 = repo.lookup('.') | |
4304 | p2 = repo.lookup(node) |
|
4307 | p2 = repo.lookup(node) | |
4305 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
4308 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
4306 |
|
4309 | |||
4307 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4310 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4308 | for node in nodes: |
|
4311 | for node in nodes: | |
4309 | displayer.show(repo[node]) |
|
4312 | displayer.show(repo[node]) | |
4310 | displayer.close() |
|
4313 | displayer.close() | |
4311 | return 0 |
|
4314 | return 0 | |
4312 |
|
4315 | |||
4313 | try: |
|
4316 | try: | |
4314 | # ui.forcemerge is an internal variable, do not document |
|
4317 | # ui.forcemerge is an internal variable, do not document | |
4315 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
4318 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
4316 | return hg.merge(repo, node, force=opts.get('force')) |
|
4319 | return hg.merge(repo, node, force=opts.get('force')) | |
4317 | finally: |
|
4320 | finally: | |
4318 | ui.setconfig('ui', 'forcemerge', '') |
|
4321 | ui.setconfig('ui', 'forcemerge', '') | |
4319 |
|
4322 | |||
4320 | @command('outgoing|out', |
|
4323 | @command('outgoing|out', | |
4321 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
4324 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
4322 | ('r', 'rev', [], |
|
4325 | ('r', 'rev', [], | |
4323 | _('a changeset intended to be included in the destination'), _('REV')), |
|
4326 | _('a changeset intended to be included in the destination'), _('REV')), | |
4324 | ('n', 'newest-first', None, _('show newest record first')), |
|
4327 | ('n', 'newest-first', None, _('show newest record first')), | |
4325 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
4328 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
4326 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
4329 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
4327 | _('BRANCH')), |
|
4330 | _('BRANCH')), | |
4328 | ] + logopts + remoteopts + subrepoopts, |
|
4331 | ] + logopts + remoteopts + subrepoopts, | |
4329 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
4332 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
4330 | def outgoing(ui, repo, dest=None, **opts): |
|
4333 | def outgoing(ui, repo, dest=None, **opts): | |
4331 | """show changesets not found in the destination |
|
4334 | """show changesets not found in the destination | |
4332 |
|
4335 | |||
4333 | Show changesets not found in the specified destination repository |
|
4336 | Show changesets not found in the specified destination repository | |
4334 | or the default push location. These are the changesets that would |
|
4337 | or the default push location. These are the changesets that would | |
4335 | be pushed if a push was requested. |
|
4338 | be pushed if a push was requested. | |
4336 |
|
4339 | |||
4337 | See pull for details of valid destination formats. |
|
4340 | See pull for details of valid destination formats. | |
4338 |
|
4341 | |||
4339 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
4342 | Returns 0 if there are outgoing changes, 1 otherwise. | |
4340 | """ |
|
4343 | """ | |
4341 | if opts.get('graph'): |
|
4344 | if opts.get('graph'): | |
4342 | cmdutil.checkunsupportedgraphflags([], opts) |
|
4345 | cmdutil.checkunsupportedgraphflags([], opts) | |
4343 | o = hg._outgoing(ui, repo, dest, opts) |
|
4346 | o = hg._outgoing(ui, repo, dest, opts) | |
4344 | if o is None: |
|
4347 | if o is None: | |
4345 | return |
|
4348 | return | |
4346 |
|
4349 | |||
4347 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
4350 | revdag = cmdutil.graphrevs(repo, o, opts) | |
4348 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
4351 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
4349 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
4352 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
4350 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
4353 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
4351 | graphmod.asciiedges) |
|
4354 | graphmod.asciiedges) | |
4352 | return 0 |
|
4355 | return 0 | |
4353 |
|
4356 | |||
4354 | if opts.get('bookmarks'): |
|
4357 | if opts.get('bookmarks'): | |
4355 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4358 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
4356 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4359 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
4357 | other = hg.peer(repo, opts, dest) |
|
4360 | other = hg.peer(repo, opts, dest) | |
4358 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
4361 | if 'bookmarks' not in other.listkeys('namespaces'): | |
4359 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
4362 | ui.warn(_("remote doesn't support bookmarks\n")) | |
4360 | return 0 |
|
4363 | return 0 | |
4361 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
4364 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
4362 | return bookmarks.diff(ui, other, repo) |
|
4365 | return bookmarks.diff(ui, other, repo) | |
4363 |
|
4366 | |||
4364 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4367 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
4365 | try: |
|
4368 | try: | |
4366 | return hg.outgoing(ui, repo, dest, opts) |
|
4369 | return hg.outgoing(ui, repo, dest, opts) | |
4367 | finally: |
|
4370 | finally: | |
4368 | del repo._subtoppath |
|
4371 | del repo._subtoppath | |
4369 |
|
4372 | |||
4370 | @command('parents', |
|
4373 | @command('parents', | |
4371 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
4374 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
4372 | ] + templateopts, |
|
4375 | ] + templateopts, | |
4373 | _('[-r REV] [FILE]')) |
|
4376 | _('[-r REV] [FILE]')) | |
4374 | def parents(ui, repo, file_=None, **opts): |
|
4377 | def parents(ui, repo, file_=None, **opts): | |
4375 | """show the parents of the working directory or revision |
|
4378 | """show the parents of the working directory or revision | |
4376 |
|
4379 | |||
4377 | Print the working directory's parent revisions. If a revision is |
|
4380 | Print the working directory's parent revisions. If a revision is | |
4378 | given via -r/--rev, the parent of that revision will be printed. |
|
4381 | given via -r/--rev, the parent of that revision will be printed. | |
4379 | If a file argument is given, the revision in which the file was |
|
4382 | If a file argument is given, the revision in which the file was | |
4380 | last changed (before the working directory revision or the |
|
4383 | last changed (before the working directory revision or the | |
4381 | argument to --rev if given) is printed. |
|
4384 | argument to --rev if given) is printed. | |
4382 |
|
4385 | |||
4383 | Returns 0 on success. |
|
4386 | Returns 0 on success. | |
4384 | """ |
|
4387 | """ | |
4385 |
|
4388 | |||
4386 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
4389 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
4387 |
|
4390 | |||
4388 | if file_: |
|
4391 | if file_: | |
4389 | m = scmutil.match(ctx, (file_,), opts) |
|
4392 | m = scmutil.match(ctx, (file_,), opts) | |
4390 | if m.anypats() or len(m.files()) != 1: |
|
4393 | if m.anypats() or len(m.files()) != 1: | |
4391 | raise util.Abort(_('can only specify an explicit filename')) |
|
4394 | raise util.Abort(_('can only specify an explicit filename')) | |
4392 | file_ = m.files()[0] |
|
4395 | file_ = m.files()[0] | |
4393 | filenodes = [] |
|
4396 | filenodes = [] | |
4394 | for cp in ctx.parents(): |
|
4397 | for cp in ctx.parents(): | |
4395 | if not cp: |
|
4398 | if not cp: | |
4396 | continue |
|
4399 | continue | |
4397 | try: |
|
4400 | try: | |
4398 | filenodes.append(cp.filenode(file_)) |
|
4401 | filenodes.append(cp.filenode(file_)) | |
4399 | except error.LookupError: |
|
4402 | except error.LookupError: | |
4400 | pass |
|
4403 | pass | |
4401 | if not filenodes: |
|
4404 | if not filenodes: | |
4402 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
4405 | raise util.Abort(_("'%s' not found in manifest!") % file_) | |
4403 | p = [] |
|
4406 | p = [] | |
4404 | for fn in filenodes: |
|
4407 | for fn in filenodes: | |
4405 | fctx = repo.filectx(file_, fileid=fn) |
|
4408 | fctx = repo.filectx(file_, fileid=fn) | |
4406 | p.append(fctx.node()) |
|
4409 | p.append(fctx.node()) | |
4407 | else: |
|
4410 | else: | |
4408 | p = [cp.node() for cp in ctx.parents()] |
|
4411 | p = [cp.node() for cp in ctx.parents()] | |
4409 |
|
4412 | |||
4410 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4413 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4411 | for n in p: |
|
4414 | for n in p: | |
4412 | if n != nullid: |
|
4415 | if n != nullid: | |
4413 | displayer.show(repo[n]) |
|
4416 | displayer.show(repo[n]) | |
4414 | displayer.close() |
|
4417 | displayer.close() | |
4415 |
|
4418 | |||
4416 | @command('paths', [], _('[NAME]')) |
|
4419 | @command('paths', [], _('[NAME]')) | |
4417 | def paths(ui, repo, search=None): |
|
4420 | def paths(ui, repo, search=None): | |
4418 | """show aliases for remote repositories |
|
4421 | """show aliases for remote repositories | |
4419 |
|
4422 | |||
4420 | Show definition of symbolic path name NAME. If no name is given, |
|
4423 | Show definition of symbolic path name NAME. If no name is given, | |
4421 | show definition of all available names. |
|
4424 | show definition of all available names. | |
4422 |
|
4425 | |||
4423 | Option -q/--quiet suppresses all output when searching for NAME |
|
4426 | Option -q/--quiet suppresses all output when searching for NAME | |
4424 | and shows only the path names when listing all definitions. |
|
4427 | and shows only the path names when listing all definitions. | |
4425 |
|
4428 | |||
4426 | Path names are defined in the [paths] section of your |
|
4429 | Path names are defined in the [paths] section of your | |
4427 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
4430 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
4428 | repository, ``.hg/hgrc`` is used, too. |
|
4431 | repository, ``.hg/hgrc`` is used, too. | |
4429 |
|
4432 | |||
4430 | The path names ``default`` and ``default-push`` have a special |
|
4433 | The path names ``default`` and ``default-push`` have a special | |
4431 | meaning. When performing a push or pull operation, they are used |
|
4434 | meaning. When performing a push or pull operation, they are used | |
4432 | as fallbacks if no location is specified on the command-line. |
|
4435 | as fallbacks if no location is specified on the command-line. | |
4433 | When ``default-push`` is set, it will be used for push and |
|
4436 | When ``default-push`` is set, it will be used for push and | |
4434 | ``default`` will be used for pull; otherwise ``default`` is used |
|
4437 | ``default`` will be used for pull; otherwise ``default`` is used | |
4435 | as the fallback for both. When cloning a repository, the clone |
|
4438 | as the fallback for both. When cloning a repository, the clone | |
4436 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
4439 | source is written as ``default`` in ``.hg/hgrc``. Note that | |
4437 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
4440 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
4438 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
4441 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and | |
4439 | :hg:`bundle`) operations. |
|
4442 | :hg:`bundle`) operations. | |
4440 |
|
4443 | |||
4441 | See :hg:`help urls` for more information. |
|
4444 | See :hg:`help urls` for more information. | |
4442 |
|
4445 | |||
4443 | Returns 0 on success. |
|
4446 | Returns 0 on success. | |
4444 | """ |
|
4447 | """ | |
4445 | if search: |
|
4448 | if search: | |
4446 | for name, path in ui.configitems("paths"): |
|
4449 | for name, path in ui.configitems("paths"): | |
4447 | if name == search: |
|
4450 | if name == search: | |
4448 | ui.status("%s\n" % util.hidepassword(path)) |
|
4451 | ui.status("%s\n" % util.hidepassword(path)) | |
4449 | return |
|
4452 | return | |
4450 | if not ui.quiet: |
|
4453 | if not ui.quiet: | |
4451 | ui.warn(_("not found!\n")) |
|
4454 | ui.warn(_("not found!\n")) | |
4452 | return 1 |
|
4455 | return 1 | |
4453 | else: |
|
4456 | else: | |
4454 | for name, path in ui.configitems("paths"): |
|
4457 | for name, path in ui.configitems("paths"): | |
4455 | if ui.quiet: |
|
4458 | if ui.quiet: | |
4456 | ui.write("%s\n" % name) |
|
4459 | ui.write("%s\n" % name) | |
4457 | else: |
|
4460 | else: | |
4458 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) |
|
4461 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) | |
4459 |
|
4462 | |||
4460 | @command('phase', |
|
4463 | @command('phase', | |
4461 | [('p', 'public', False, _('set changeset phase to public')), |
|
4464 | [('p', 'public', False, _('set changeset phase to public')), | |
4462 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
4465 | ('d', 'draft', False, _('set changeset phase to draft')), | |
4463 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
4466 | ('s', 'secret', False, _('set changeset phase to secret')), | |
4464 | ('f', 'force', False, _('allow to move boundary backward')), |
|
4467 | ('f', 'force', False, _('allow to move boundary backward')), | |
4465 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
4468 | ('r', 'rev', [], _('target revision'), _('REV')), | |
4466 | ], |
|
4469 | ], | |
4467 | _('[-p|-d|-s] [-f] [-r] REV...')) |
|
4470 | _('[-p|-d|-s] [-f] [-r] REV...')) | |
4468 | def phase(ui, repo, *revs, **opts): |
|
4471 | def phase(ui, repo, *revs, **opts): | |
4469 | """set or show the current phase name |
|
4472 | """set or show the current phase name | |
4470 |
|
4473 | |||
4471 | With no argument, show the phase name of specified revisions. |
|
4474 | With no argument, show the phase name of specified revisions. | |
4472 |
|
4475 | |||
4473 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
4476 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
4474 | phase value of the specified revisions. |
|
4477 | phase value of the specified revisions. | |
4475 |
|
4478 | |||
4476 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
|
4479 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a | |
4477 | lower phase to an higher phase. Phases are ordered as follows:: |
|
4480 | lower phase to an higher phase. Phases are ordered as follows:: | |
4478 |
|
4481 | |||
4479 | public < draft < secret |
|
4482 | public < draft < secret | |
4480 |
|
4483 | |||
4481 | Returns 0 on success, 1 if no phases were changed or some could not |
|
4484 | Returns 0 on success, 1 if no phases were changed or some could not | |
4482 | be changed. |
|
4485 | be changed. | |
4483 | """ |
|
4486 | """ | |
4484 | # search for a unique phase argument |
|
4487 | # search for a unique phase argument | |
4485 | targetphase = None |
|
4488 | targetphase = None | |
4486 | for idx, name in enumerate(phases.phasenames): |
|
4489 | for idx, name in enumerate(phases.phasenames): | |
4487 | if opts[name]: |
|
4490 | if opts[name]: | |
4488 | if targetphase is not None: |
|
4491 | if targetphase is not None: | |
4489 | raise util.Abort(_('only one phase can be specified')) |
|
4492 | raise util.Abort(_('only one phase can be specified')) | |
4490 | targetphase = idx |
|
4493 | targetphase = idx | |
4491 |
|
4494 | |||
4492 | # look for specified revision |
|
4495 | # look for specified revision | |
4493 | revs = list(revs) |
|
4496 | revs = list(revs) | |
4494 | revs.extend(opts['rev']) |
|
4497 | revs.extend(opts['rev']) | |
4495 | if not revs: |
|
4498 | if not revs: | |
4496 | raise util.Abort(_('no revisions specified')) |
|
4499 | raise util.Abort(_('no revisions specified')) | |
4497 |
|
4500 | |||
4498 | revs = scmutil.revrange(repo, revs) |
|
4501 | revs = scmutil.revrange(repo, revs) | |
4499 |
|
4502 | |||
4500 | lock = None |
|
4503 | lock = None | |
4501 | ret = 0 |
|
4504 | ret = 0 | |
4502 | if targetphase is None: |
|
4505 | if targetphase is None: | |
4503 | # display |
|
4506 | # display | |
4504 | for r in revs: |
|
4507 | for r in revs: | |
4505 | ctx = repo[r] |
|
4508 | ctx = repo[r] | |
4506 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
4509 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
4507 | else: |
|
4510 | else: | |
4508 | lock = repo.lock() |
|
4511 | lock = repo.lock() | |
4509 | try: |
|
4512 | try: | |
4510 | # set phase |
|
4513 | # set phase | |
4511 | if not revs: |
|
4514 | if not revs: | |
4512 | raise util.Abort(_('empty revision set')) |
|
4515 | raise util.Abort(_('empty revision set')) | |
4513 | nodes = [repo[r].node() for r in revs] |
|
4516 | nodes = [repo[r].node() for r in revs] | |
4514 | olddata = repo._phasecache.getphaserevs(repo)[:] |
|
4517 | olddata = repo._phasecache.getphaserevs(repo)[:] | |
4515 | phases.advanceboundary(repo, targetphase, nodes) |
|
4518 | phases.advanceboundary(repo, targetphase, nodes) | |
4516 | if opts['force']: |
|
4519 | if opts['force']: | |
4517 | phases.retractboundary(repo, targetphase, nodes) |
|
4520 | phases.retractboundary(repo, targetphase, nodes) | |
4518 | finally: |
|
4521 | finally: | |
4519 | lock.release() |
|
4522 | lock.release() | |
4520 | # moving revision from public to draft may hide them |
|
4523 | # moving revision from public to draft may hide them | |
4521 | # We have to check result on an unfiltered repository |
|
4524 | # We have to check result on an unfiltered repository | |
4522 | unfi = repo.unfiltered() |
|
4525 | unfi = repo.unfiltered() | |
4523 | newdata = repo._phasecache.getphaserevs(unfi) |
|
4526 | newdata = repo._phasecache.getphaserevs(unfi) | |
4524 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) |
|
4527 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) | |
4525 | cl = unfi.changelog |
|
4528 | cl = unfi.changelog | |
4526 | rejected = [n for n in nodes |
|
4529 | rejected = [n for n in nodes | |
4527 | if newdata[cl.rev(n)] < targetphase] |
|
4530 | if newdata[cl.rev(n)] < targetphase] | |
4528 | if rejected: |
|
4531 | if rejected: | |
4529 | ui.warn(_('cannot move %i changesets to a higher ' |
|
4532 | ui.warn(_('cannot move %i changesets to a higher ' | |
4530 | 'phase, use --force\n') % len(rejected)) |
|
4533 | 'phase, use --force\n') % len(rejected)) | |
4531 | ret = 1 |
|
4534 | ret = 1 | |
4532 | if changes: |
|
4535 | if changes: | |
4533 | msg = _('phase changed for %i changesets\n') % changes |
|
4536 | msg = _('phase changed for %i changesets\n') % changes | |
4534 | if ret: |
|
4537 | if ret: | |
4535 | ui.status(msg) |
|
4538 | ui.status(msg) | |
4536 | else: |
|
4539 | else: | |
4537 | ui.note(msg) |
|
4540 | ui.note(msg) | |
4538 | else: |
|
4541 | else: | |
4539 | ui.warn(_('no phases changed\n')) |
|
4542 | ui.warn(_('no phases changed\n')) | |
4540 | ret = 1 |
|
4543 | ret = 1 | |
4541 | return ret |
|
4544 | return ret | |
4542 |
|
4545 | |||
4543 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
4546 | def postincoming(ui, repo, modheads, optupdate, checkout): | |
4544 | if modheads == 0: |
|
4547 | if modheads == 0: | |
4545 | return |
|
4548 | return | |
4546 | if optupdate: |
|
4549 | if optupdate: | |
4547 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) |
|
4550 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) | |
4548 | try: |
|
4551 | try: | |
4549 | ret = hg.update(repo, checkout) |
|
4552 | ret = hg.update(repo, checkout) | |
4550 | except util.Abort, inst: |
|
4553 | except util.Abort, inst: | |
4551 | ui.warn(_("not updating: %s\n") % str(inst)) |
|
4554 | ui.warn(_("not updating: %s\n") % str(inst)) | |
4552 | if inst.hint: |
|
4555 | if inst.hint: | |
4553 | ui.warn(_("(%s)\n") % inst.hint) |
|
4556 | ui.warn(_("(%s)\n") % inst.hint) | |
4554 | return 0 |
|
4557 | return 0 | |
4555 | if not ret and not checkout: |
|
4558 | if not ret and not checkout: | |
4556 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
4559 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
4557 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
4560 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |
4558 | return ret |
|
4561 | return ret | |
4559 | if modheads > 1: |
|
4562 | if modheads > 1: | |
4560 | currentbranchheads = len(repo.branchheads()) |
|
4563 | currentbranchheads = len(repo.branchheads()) | |
4561 | if currentbranchheads == modheads: |
|
4564 | if currentbranchheads == modheads: | |
4562 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
4565 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
4563 | elif currentbranchheads > 1: |
|
4566 | elif currentbranchheads > 1: | |
4564 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
4567 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
4565 | "merge)\n")) |
|
4568 | "merge)\n")) | |
4566 | else: |
|
4569 | else: | |
4567 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
4570 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
4568 | else: |
|
4571 | else: | |
4569 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
4572 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
4570 |
|
4573 | |||
4571 | @command('^pull', |
|
4574 | @command('^pull', | |
4572 | [('u', 'update', None, |
|
4575 | [('u', 'update', None, | |
4573 | _('update to new branch head if changesets were pulled')), |
|
4576 | _('update to new branch head if changesets were pulled')), | |
4574 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
4577 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
4575 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
4578 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
4576 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
4579 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
4577 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
4580 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
4578 | _('BRANCH')), |
|
4581 | _('BRANCH')), | |
4579 | ] + remoteopts, |
|
4582 | ] + remoteopts, | |
4580 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
4583 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
4581 | def pull(ui, repo, source="default", **opts): |
|
4584 | def pull(ui, repo, source="default", **opts): | |
4582 | """pull changes from the specified source |
|
4585 | """pull changes from the specified source | |
4583 |
|
4586 | |||
4584 | Pull changes from a remote repository to a local one. |
|
4587 | Pull changes from a remote repository to a local one. | |
4585 |
|
4588 | |||
4586 | This finds all changes from the repository at the specified path |
|
4589 | This finds all changes from the repository at the specified path | |
4587 | or URL and adds them to a local repository (the current one unless |
|
4590 | or URL and adds them to a local repository (the current one unless | |
4588 | -R is specified). By default, this does not update the copy of the |
|
4591 | -R is specified). By default, this does not update the copy of the | |
4589 | project in the working directory. |
|
4592 | project in the working directory. | |
4590 |
|
4593 | |||
4591 | Use :hg:`incoming` if you want to see what would have been added |
|
4594 | Use :hg:`incoming` if you want to see what would have been added | |
4592 | by a pull at the time you issued this command. If you then decide |
|
4595 | by a pull at the time you issued this command. If you then decide | |
4593 | to add those changes to the repository, you should use :hg:`pull |
|
4596 | to add those changes to the repository, you should use :hg:`pull | |
4594 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
4597 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
4595 |
|
4598 | |||
4596 | If SOURCE is omitted, the 'default' path will be used. |
|
4599 | If SOURCE is omitted, the 'default' path will be used. | |
4597 | See :hg:`help urls` for more information. |
|
4600 | See :hg:`help urls` for more information. | |
4598 |
|
4601 | |||
4599 | Returns 0 on success, 1 if an update had unresolved files. |
|
4602 | Returns 0 on success, 1 if an update had unresolved files. | |
4600 | """ |
|
4603 | """ | |
4601 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
4604 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
4602 | other = hg.peer(repo, opts, source) |
|
4605 | other = hg.peer(repo, opts, source) | |
4603 | try: |
|
4606 | try: | |
4604 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
4607 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
4605 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
4608 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
4606 | opts.get('rev')) |
|
4609 | opts.get('rev')) | |
4607 |
|
4610 | |||
4608 | remotebookmarks = other.listkeys('bookmarks') |
|
4611 | remotebookmarks = other.listkeys('bookmarks') | |
4609 |
|
4612 | |||
4610 | if opts.get('bookmark'): |
|
4613 | if opts.get('bookmark'): | |
4611 | if not revs: |
|
4614 | if not revs: | |
4612 | revs = [] |
|
4615 | revs = [] | |
4613 | for b in opts['bookmark']: |
|
4616 | for b in opts['bookmark']: | |
4614 | if b not in remotebookmarks: |
|
4617 | if b not in remotebookmarks: | |
4615 | raise util.Abort(_('remote bookmark %s not found!') % b) |
|
4618 | raise util.Abort(_('remote bookmark %s not found!') % b) | |
4616 | revs.append(remotebookmarks[b]) |
|
4619 | revs.append(remotebookmarks[b]) | |
4617 |
|
4620 | |||
4618 | if revs: |
|
4621 | if revs: | |
4619 | try: |
|
4622 | try: | |
4620 | revs = [other.lookup(rev) for rev in revs] |
|
4623 | revs = [other.lookup(rev) for rev in revs] | |
4621 | except error.CapabilityError: |
|
4624 | except error.CapabilityError: | |
4622 | err = _("other repository doesn't support revision lookup, " |
|
4625 | err = _("other repository doesn't support revision lookup, " | |
4623 | "so a rev cannot be specified.") |
|
4626 | "so a rev cannot be specified.") | |
4624 | raise util.Abort(err) |
|
4627 | raise util.Abort(err) | |
4625 |
|
4628 | |||
4626 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
4629 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) | |
4627 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) |
|
4630 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) | |
4628 | if checkout: |
|
4631 | if checkout: | |
4629 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
4632 | checkout = str(repo.changelog.rev(other.lookup(checkout))) | |
4630 | repo._subtoppath = source |
|
4633 | repo._subtoppath = source | |
4631 | try: |
|
4634 | try: | |
4632 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
4635 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) | |
4633 |
|
4636 | |||
4634 | finally: |
|
4637 | finally: | |
4635 | del repo._subtoppath |
|
4638 | del repo._subtoppath | |
4636 |
|
4639 | |||
4637 | # update specified bookmarks |
|
4640 | # update specified bookmarks | |
4638 | if opts.get('bookmark'): |
|
4641 | if opts.get('bookmark'): | |
4639 | marks = repo._bookmarks |
|
4642 | marks = repo._bookmarks | |
4640 | for b in opts['bookmark']: |
|
4643 | for b in opts['bookmark']: | |
4641 | # explicit pull overrides local bookmark if any |
|
4644 | # explicit pull overrides local bookmark if any | |
4642 | ui.status(_("importing bookmark %s\n") % b) |
|
4645 | ui.status(_("importing bookmark %s\n") % b) | |
4643 | marks[b] = repo[remotebookmarks[b]].node() |
|
4646 | marks[b] = repo[remotebookmarks[b]].node() | |
4644 | marks.write() |
|
4647 | marks.write() | |
4645 | finally: |
|
4648 | finally: | |
4646 | other.close() |
|
4649 | other.close() | |
4647 | return ret |
|
4650 | return ret | |
4648 |
|
4651 | |||
4649 | @command('^push', |
|
4652 | @command('^push', | |
4650 | [('f', 'force', None, _('force push')), |
|
4653 | [('f', 'force', None, _('force push')), | |
4651 | ('r', 'rev', [], |
|
4654 | ('r', 'rev', [], | |
4652 | _('a changeset intended to be included in the destination'), |
|
4655 | _('a changeset intended to be included in the destination'), | |
4653 | _('REV')), |
|
4656 | _('REV')), | |
4654 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4657 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
4655 | ('b', 'branch', [], |
|
4658 | ('b', 'branch', [], | |
4656 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4659 | _('a specific branch you would like to push'), _('BRANCH')), | |
4657 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4660 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
4658 | ] + remoteopts, |
|
4661 | ] + remoteopts, | |
4659 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4662 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
4660 | def push(ui, repo, dest=None, **opts): |
|
4663 | def push(ui, repo, dest=None, **opts): | |
4661 | """push changes to the specified destination |
|
4664 | """push changes to the specified destination | |
4662 |
|
4665 | |||
4663 | Push changesets from the local repository to the specified |
|
4666 | Push changesets from the local repository to the specified | |
4664 | destination. |
|
4667 | destination. | |
4665 |
|
4668 | |||
4666 | This operation is symmetrical to pull: it is identical to a pull |
|
4669 | This operation is symmetrical to pull: it is identical to a pull | |
4667 | in the destination repository from the current one. |
|
4670 | in the destination repository from the current one. | |
4668 |
|
4671 | |||
4669 | By default, push will not allow creation of new heads at the |
|
4672 | By default, push will not allow creation of new heads at the | |
4670 | destination, since multiple heads would make it unclear which head |
|
4673 | destination, since multiple heads would make it unclear which head | |
4671 | to use. In this situation, it is recommended to pull and merge |
|
4674 | to use. In this situation, it is recommended to pull and merge | |
4672 | before pushing. |
|
4675 | before pushing. | |
4673 |
|
4676 | |||
4674 | Use --new-branch if you want to allow push to create a new named |
|
4677 | Use --new-branch if you want to allow push to create a new named | |
4675 | branch that is not present at the destination. This allows you to |
|
4678 | branch that is not present at the destination. This allows you to | |
4676 | only create a new branch without forcing other changes. |
|
4679 | only create a new branch without forcing other changes. | |
4677 |
|
4680 | |||
4678 | .. note:: |
|
4681 | .. note:: | |
4679 |
|
4682 | |||
4680 | Extra care should be taken with the -f/--force option, |
|
4683 | Extra care should be taken with the -f/--force option, | |
4681 | which will push all new heads on all branches, an action which will |
|
4684 | which will push all new heads on all branches, an action which will | |
4682 | almost always cause confusion for collaborators. |
|
4685 | almost always cause confusion for collaborators. | |
4683 |
|
4686 | |||
4684 | If -r/--rev is used, the specified revision and all its ancestors |
|
4687 | If -r/--rev is used, the specified revision and all its ancestors | |
4685 | will be pushed to the remote repository. |
|
4688 | will be pushed to the remote repository. | |
4686 |
|
4689 | |||
4687 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4690 | If -B/--bookmark is used, the specified bookmarked revision, its | |
4688 | ancestors, and the bookmark will be pushed to the remote |
|
4691 | ancestors, and the bookmark will be pushed to the remote | |
4689 | repository. |
|
4692 | repository. | |
4690 |
|
4693 | |||
4691 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4694 | Please see :hg:`help urls` for important details about ``ssh://`` | |
4692 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4695 | URLs. If DESTINATION is omitted, a default path will be used. | |
4693 |
|
4696 | |||
4694 | Returns 0 if push was successful, 1 if nothing to push. |
|
4697 | Returns 0 if push was successful, 1 if nothing to push. | |
4695 | """ |
|
4698 | """ | |
4696 |
|
4699 | |||
4697 | if opts.get('bookmark'): |
|
4700 | if opts.get('bookmark'): | |
4698 | ui.setconfig('bookmarks', 'pushing', opts['bookmark']) |
|
4701 | ui.setconfig('bookmarks', 'pushing', opts['bookmark']) | |
4699 | for b in opts['bookmark']: |
|
4702 | for b in opts['bookmark']: | |
4700 | # translate -B options to -r so changesets get pushed |
|
4703 | # translate -B options to -r so changesets get pushed | |
4701 | if b in repo._bookmarks: |
|
4704 | if b in repo._bookmarks: | |
4702 | opts.setdefault('rev', []).append(b) |
|
4705 | opts.setdefault('rev', []).append(b) | |
4703 | else: |
|
4706 | else: | |
4704 | # if we try to push a deleted bookmark, translate it to null |
|
4707 | # if we try to push a deleted bookmark, translate it to null | |
4705 | # this lets simultaneous -r, -b options continue working |
|
4708 | # this lets simultaneous -r, -b options continue working | |
4706 | opts.setdefault('rev', []).append("null") |
|
4709 | opts.setdefault('rev', []).append("null") | |
4707 |
|
4710 | |||
4708 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4711 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
4709 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4712 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
4710 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4713 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
4711 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4714 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
4712 | other = hg.peer(repo, opts, dest) |
|
4715 | other = hg.peer(repo, opts, dest) | |
4713 | if revs: |
|
4716 | if revs: | |
4714 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4717 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
4715 |
|
4718 | |||
4716 | repo._subtoppath = dest |
|
4719 | repo._subtoppath = dest | |
4717 | try: |
|
4720 | try: | |
4718 | # push subrepos depth-first for coherent ordering |
|
4721 | # push subrepos depth-first for coherent ordering | |
4719 | c = repo[''] |
|
4722 | c = repo[''] | |
4720 | subs = c.substate # only repos that are committed |
|
4723 | subs = c.substate # only repos that are committed | |
4721 | for s in sorted(subs): |
|
4724 | for s in sorted(subs): | |
4722 | if c.sub(s).push(opts) == 0: |
|
4725 | if c.sub(s).push(opts) == 0: | |
4723 | return False |
|
4726 | return False | |
4724 | finally: |
|
4727 | finally: | |
4725 | del repo._subtoppath |
|
4728 | del repo._subtoppath | |
4726 | result = repo.push(other, opts.get('force'), revs=revs, |
|
4729 | result = repo.push(other, opts.get('force'), revs=revs, | |
4727 | newbranch=opts.get('new_branch')) |
|
4730 | newbranch=opts.get('new_branch')) | |
4728 |
|
4731 | |||
4729 | result = not result |
|
4732 | result = not result | |
4730 |
|
4733 | |||
4731 | if opts.get('bookmark'): |
|
4734 | if opts.get('bookmark'): | |
4732 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) |
|
4735 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) | |
4733 | if bresult == 2: |
|
4736 | if bresult == 2: | |
4734 | return 2 |
|
4737 | return 2 | |
4735 | if not result and bresult: |
|
4738 | if not result and bresult: | |
4736 | result = 2 |
|
4739 | result = 2 | |
4737 |
|
4740 | |||
4738 | return result |
|
4741 | return result | |
4739 |
|
4742 | |||
4740 | @command('recover', []) |
|
4743 | @command('recover', []) | |
4741 | def recover(ui, repo): |
|
4744 | def recover(ui, repo): | |
4742 | """roll back an interrupted transaction |
|
4745 | """roll back an interrupted transaction | |
4743 |
|
4746 | |||
4744 | Recover from an interrupted commit or pull. |
|
4747 | Recover from an interrupted commit or pull. | |
4745 |
|
4748 | |||
4746 | This command tries to fix the repository status after an |
|
4749 | This command tries to fix the repository status after an | |
4747 | interrupted operation. It should only be necessary when Mercurial |
|
4750 | interrupted operation. It should only be necessary when Mercurial | |
4748 | suggests it. |
|
4751 | suggests it. | |
4749 |
|
4752 | |||
4750 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4753 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
4751 | """ |
|
4754 | """ | |
4752 | if repo.recover(): |
|
4755 | if repo.recover(): | |
4753 | return hg.verify(repo) |
|
4756 | return hg.verify(repo) | |
4754 | return 1 |
|
4757 | return 1 | |
4755 |
|
4758 | |||
4756 | @command('^remove|rm', |
|
4759 | @command('^remove|rm', | |
4757 | [('A', 'after', None, _('record delete for missing files')), |
|
4760 | [('A', 'after', None, _('record delete for missing files')), | |
4758 | ('f', 'force', None, |
|
4761 | ('f', 'force', None, | |
4759 | _('remove (and delete) file even if added or modified')), |
|
4762 | _('remove (and delete) file even if added or modified')), | |
4760 | ] + walkopts, |
|
4763 | ] + walkopts, | |
4761 | _('[OPTION]... FILE...')) |
|
4764 | _('[OPTION]... FILE...')) | |
4762 | def remove(ui, repo, *pats, **opts): |
|
4765 | def remove(ui, repo, *pats, **opts): | |
4763 | """remove the specified files on the next commit |
|
4766 | """remove the specified files on the next commit | |
4764 |
|
4767 | |||
4765 | Schedule the indicated files for removal from the current branch. |
|
4768 | Schedule the indicated files for removal from the current branch. | |
4766 |
|
4769 | |||
4767 | This command schedules the files to be removed at the next commit. |
|
4770 | This command schedules the files to be removed at the next commit. | |
4768 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4771 | To undo a remove before that, see :hg:`revert`. To undo added | |
4769 | files, see :hg:`forget`. |
|
4772 | files, see :hg:`forget`. | |
4770 |
|
4773 | |||
4771 | .. container:: verbose |
|
4774 | .. container:: verbose | |
4772 |
|
4775 | |||
4773 | -A/--after can be used to remove only files that have already |
|
4776 | -A/--after can be used to remove only files that have already | |
4774 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4777 | been deleted, -f/--force can be used to force deletion, and -Af | |
4775 | can be used to remove files from the next revision without |
|
4778 | can be used to remove files from the next revision without | |
4776 | deleting them from the working directory. |
|
4779 | deleting them from the working directory. | |
4777 |
|
4780 | |||
4778 | The following table details the behavior of remove for different |
|
4781 | The following table details the behavior of remove for different | |
4779 | file states (columns) and option combinations (rows). The file |
|
4782 | file states (columns) and option combinations (rows). The file | |
4780 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4783 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
4781 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4784 | (as reported by :hg:`status`). The actions are Warn, Remove | |
4782 | (from branch) and Delete (from disk): |
|
4785 | (from branch) and Delete (from disk): | |
4783 |
|
4786 | |||
4784 | ========= == == == == |
|
4787 | ========= == == == == | |
4785 | opt/state A C M ! |
|
4788 | opt/state A C M ! | |
4786 | ========= == == == == |
|
4789 | ========= == == == == | |
4787 | none W RD W R |
|
4790 | none W RD W R | |
4788 | -f R RD RD R |
|
4791 | -f R RD RD R | |
4789 | -A W W W R |
|
4792 | -A W W W R | |
4790 | -Af R R R R |
|
4793 | -Af R R R R | |
4791 | ========= == == == == |
|
4794 | ========= == == == == | |
4792 |
|
4795 | |||
4793 | Note that remove never deletes files in Added [A] state from the |
|
4796 | Note that remove never deletes files in Added [A] state from the | |
4794 | working directory, not even if option --force is specified. |
|
4797 | working directory, not even if option --force is specified. | |
4795 |
|
4798 | |||
4796 | Returns 0 on success, 1 if any warnings encountered. |
|
4799 | Returns 0 on success, 1 if any warnings encountered. | |
4797 | """ |
|
4800 | """ | |
4798 |
|
4801 | |||
4799 | ret = 0 |
|
4802 | ret = 0 | |
4800 | after, force = opts.get('after'), opts.get('force') |
|
4803 | after, force = opts.get('after'), opts.get('force') | |
4801 | if not pats and not after: |
|
4804 | if not pats and not after: | |
4802 | raise util.Abort(_('no files specified')) |
|
4805 | raise util.Abort(_('no files specified')) | |
4803 |
|
4806 | |||
4804 | m = scmutil.match(repo[None], pats, opts) |
|
4807 | m = scmutil.match(repo[None], pats, opts) | |
4805 | s = repo.status(match=m, clean=True) |
|
4808 | s = repo.status(match=m, clean=True) | |
4806 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
4809 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] | |
4807 |
|
4810 | |||
4808 | # warn about failure to delete explicit files/dirs |
|
4811 | # warn about failure to delete explicit files/dirs | |
4809 | wctx = repo[None] |
|
4812 | wctx = repo[None] | |
4810 | for f in m.files(): |
|
4813 | for f in m.files(): | |
4811 | if f in repo.dirstate or f in wctx.dirs(): |
|
4814 | if f in repo.dirstate or f in wctx.dirs(): | |
4812 | continue |
|
4815 | continue | |
4813 | if os.path.exists(m.rel(f)): |
|
4816 | if os.path.exists(m.rel(f)): | |
4814 | if os.path.isdir(m.rel(f)): |
|
4817 | if os.path.isdir(m.rel(f)): | |
4815 | ui.warn(_('not removing %s: no tracked files\n') % m.rel(f)) |
|
4818 | ui.warn(_('not removing %s: no tracked files\n') % m.rel(f)) | |
4816 | else: |
|
4819 | else: | |
4817 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
4820 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) | |
4818 | # missing files will generate a warning elsewhere |
|
4821 | # missing files will generate a warning elsewhere | |
4819 | ret = 1 |
|
4822 | ret = 1 | |
4820 |
|
4823 | |||
4821 | if force: |
|
4824 | if force: | |
4822 | list = modified + deleted + clean + added |
|
4825 | list = modified + deleted + clean + added | |
4823 | elif after: |
|
4826 | elif after: | |
4824 | list = deleted |
|
4827 | list = deleted | |
4825 | for f in modified + added + clean: |
|
4828 | for f in modified + added + clean: | |
4826 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) |
|
4829 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) | |
4827 | ret = 1 |
|
4830 | ret = 1 | |
4828 | else: |
|
4831 | else: | |
4829 | list = deleted + clean |
|
4832 | list = deleted + clean | |
4830 | for f in modified: |
|
4833 | for f in modified: | |
4831 | ui.warn(_('not removing %s: file is modified (use -f' |
|
4834 | ui.warn(_('not removing %s: file is modified (use -f' | |
4832 | ' to force removal)\n') % m.rel(f)) |
|
4835 | ' to force removal)\n') % m.rel(f)) | |
4833 | ret = 1 |
|
4836 | ret = 1 | |
4834 | for f in added: |
|
4837 | for f in added: | |
4835 | ui.warn(_('not removing %s: file has been marked for add' |
|
4838 | ui.warn(_('not removing %s: file has been marked for add' | |
4836 | ' (use forget to undo)\n') % m.rel(f)) |
|
4839 | ' (use forget to undo)\n') % m.rel(f)) | |
4837 | ret = 1 |
|
4840 | ret = 1 | |
4838 |
|
4841 | |||
4839 | for f in sorted(list): |
|
4842 | for f in sorted(list): | |
4840 | if ui.verbose or not m.exact(f): |
|
4843 | if ui.verbose or not m.exact(f): | |
4841 | ui.status(_('removing %s\n') % m.rel(f)) |
|
4844 | ui.status(_('removing %s\n') % m.rel(f)) | |
4842 |
|
4845 | |||
4843 | wlock = repo.wlock() |
|
4846 | wlock = repo.wlock() | |
4844 | try: |
|
4847 | try: | |
4845 | if not after: |
|
4848 | if not after: | |
4846 | for f in list: |
|
4849 | for f in list: | |
4847 | if f in added: |
|
4850 | if f in added: | |
4848 | continue # we never unlink added files on remove |
|
4851 | continue # we never unlink added files on remove | |
4849 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
|
4852 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) | |
4850 | repo[None].forget(list) |
|
4853 | repo[None].forget(list) | |
4851 | finally: |
|
4854 | finally: | |
4852 | wlock.release() |
|
4855 | wlock.release() | |
4853 |
|
4856 | |||
4854 | return ret |
|
4857 | return ret | |
4855 |
|
4858 | |||
4856 | @command('rename|move|mv', |
|
4859 | @command('rename|move|mv', | |
4857 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4860 | [('A', 'after', None, _('record a rename that has already occurred')), | |
4858 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4861 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
4859 | ] + walkopts + dryrunopts, |
|
4862 | ] + walkopts + dryrunopts, | |
4860 | _('[OPTION]... SOURCE... DEST')) |
|
4863 | _('[OPTION]... SOURCE... DEST')) | |
4861 | def rename(ui, repo, *pats, **opts): |
|
4864 | def rename(ui, repo, *pats, **opts): | |
4862 | """rename files; equivalent of copy + remove |
|
4865 | """rename files; equivalent of copy + remove | |
4863 |
|
4866 | |||
4864 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4867 | Mark dest as copies of sources; mark sources for deletion. If dest | |
4865 | is a directory, copies are put in that directory. If dest is a |
|
4868 | is a directory, copies are put in that directory. If dest is a | |
4866 | file, there can only be one source. |
|
4869 | file, there can only be one source. | |
4867 |
|
4870 | |||
4868 | By default, this command copies the contents of files as they |
|
4871 | By default, this command copies the contents of files as they | |
4869 | exist in the working directory. If invoked with -A/--after, the |
|
4872 | exist in the working directory. If invoked with -A/--after, the | |
4870 | operation is recorded, but no copying is performed. |
|
4873 | operation is recorded, but no copying is performed. | |
4871 |
|
4874 | |||
4872 | This command takes effect at the next commit. To undo a rename |
|
4875 | This command takes effect at the next commit. To undo a rename | |
4873 | before that, see :hg:`revert`. |
|
4876 | before that, see :hg:`revert`. | |
4874 |
|
4877 | |||
4875 | Returns 0 on success, 1 if errors are encountered. |
|
4878 | Returns 0 on success, 1 if errors are encountered. | |
4876 | """ |
|
4879 | """ | |
4877 | wlock = repo.wlock(False) |
|
4880 | wlock = repo.wlock(False) | |
4878 | try: |
|
4881 | try: | |
4879 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4882 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
4880 | finally: |
|
4883 | finally: | |
4881 | wlock.release() |
|
4884 | wlock.release() | |
4882 |
|
4885 | |||
4883 | @command('resolve', |
|
4886 | @command('resolve', | |
4884 | [('a', 'all', None, _('select all unresolved files')), |
|
4887 | [('a', 'all', None, _('select all unresolved files')), | |
4885 | ('l', 'list', None, _('list state of files needing merge')), |
|
4888 | ('l', 'list', None, _('list state of files needing merge')), | |
4886 | ('m', 'mark', None, _('mark files as resolved')), |
|
4889 | ('m', 'mark', None, _('mark files as resolved')), | |
4887 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4890 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4888 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4891 | ('n', 'no-status', None, _('hide status prefix'))] | |
4889 | + mergetoolopts + walkopts, |
|
4892 | + mergetoolopts + walkopts, | |
4890 | _('[OPTION]... [FILE]...')) |
|
4893 | _('[OPTION]... [FILE]...')) | |
4891 | def resolve(ui, repo, *pats, **opts): |
|
4894 | def resolve(ui, repo, *pats, **opts): | |
4892 | """redo merges or set/view the merge status of files |
|
4895 | """redo merges or set/view the merge status of files | |
4893 |
|
4896 | |||
4894 | Merges with unresolved conflicts are often the result of |
|
4897 | Merges with unresolved conflicts are often the result of | |
4895 | non-interactive merging using the ``internal:merge`` configuration |
|
4898 | non-interactive merging using the ``internal:merge`` configuration | |
4896 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4899 | setting, or a command-line merge tool like ``diff3``. The resolve | |
4897 | command is used to manage the files involved in a merge, after |
|
4900 | command is used to manage the files involved in a merge, after | |
4898 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4901 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
4899 | working directory must have two parents). See :hg:`help |
|
4902 | working directory must have two parents). See :hg:`help | |
4900 | merge-tools` for information on configuring merge tools. |
|
4903 | merge-tools` for information on configuring merge tools. | |
4901 |
|
4904 | |||
4902 | The resolve command can be used in the following ways: |
|
4905 | The resolve command can be used in the following ways: | |
4903 |
|
4906 | |||
4904 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4907 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
4905 | files, discarding any previous merge attempts. Re-merging is not |
|
4908 | files, discarding any previous merge attempts. Re-merging is not | |
4906 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4909 | performed for files already marked as resolved. Use ``--all/-a`` | |
4907 | to select all unresolved files. ``--tool`` can be used to specify |
|
4910 | to select all unresolved files. ``--tool`` can be used to specify | |
4908 | the merge tool used for the given files. It overrides the HGMERGE |
|
4911 | the merge tool used for the given files. It overrides the HGMERGE | |
4909 | environment variable and your configuration files. Previous file |
|
4912 | environment variable and your configuration files. Previous file | |
4910 | contents are saved with a ``.orig`` suffix. |
|
4913 | contents are saved with a ``.orig`` suffix. | |
4911 |
|
4914 | |||
4912 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4915 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
4913 | (e.g. after having manually fixed-up the files). The default is |
|
4916 | (e.g. after having manually fixed-up the files). The default is | |
4914 | to mark all unresolved files. |
|
4917 | to mark all unresolved files. | |
4915 |
|
4918 | |||
4916 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4919 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
4917 | default is to mark all resolved files. |
|
4920 | default is to mark all resolved files. | |
4918 |
|
4921 | |||
4919 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4922 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4920 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4923 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
4921 |
|
4924 | |||
4922 | Note that Mercurial will not let you commit files with unresolved |
|
4925 | Note that Mercurial will not let you commit files with unresolved | |
4923 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
4926 | merge conflicts. You must use :hg:`resolve -m ...` before you can | |
4924 | commit after a conflicting merge. |
|
4927 | commit after a conflicting merge. | |
4925 |
|
4928 | |||
4926 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4929 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
4927 | """ |
|
4930 | """ | |
4928 |
|
4931 | |||
4929 | all, mark, unmark, show, nostatus = \ |
|
4932 | all, mark, unmark, show, nostatus = \ | |
4930 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
4933 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] | |
4931 |
|
4934 | |||
4932 | if (show and (mark or unmark)) or (mark and unmark): |
|
4935 | if (show and (mark or unmark)) or (mark and unmark): | |
4933 | raise util.Abort(_("too many options specified")) |
|
4936 | raise util.Abort(_("too many options specified")) | |
4934 | if pats and all: |
|
4937 | if pats and all: | |
4935 | raise util.Abort(_("can't specify --all and patterns")) |
|
4938 | raise util.Abort(_("can't specify --all and patterns")) | |
4936 | if not (all or pats or show or mark or unmark): |
|
4939 | if not (all or pats or show or mark or unmark): | |
4937 | raise util.Abort(_('no files or directories specified; ' |
|
4940 | raise util.Abort(_('no files or directories specified; ' | |
4938 | 'use --all to remerge all files')) |
|
4941 | 'use --all to remerge all files')) | |
4939 |
|
4942 | |||
4940 | ms = mergemod.mergestate(repo) |
|
4943 | ms = mergemod.mergestate(repo) | |
4941 | m = scmutil.match(repo[None], pats, opts) |
|
4944 | m = scmutil.match(repo[None], pats, opts) | |
4942 | ret = 0 |
|
4945 | ret = 0 | |
4943 |
|
4946 | |||
4944 | for f in ms: |
|
4947 | for f in ms: | |
4945 | if m(f): |
|
4948 | if m(f): | |
4946 | if show: |
|
4949 | if show: | |
4947 | if nostatus: |
|
4950 | if nostatus: | |
4948 | ui.write("%s\n" % f) |
|
4951 | ui.write("%s\n" % f) | |
4949 | else: |
|
4952 | else: | |
4950 | ui.write("%s %s\n" % (ms[f].upper(), f), |
|
4953 | ui.write("%s %s\n" % (ms[f].upper(), f), | |
4951 | label='resolve.' + |
|
4954 | label='resolve.' + | |
4952 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
4955 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) | |
4953 | elif mark: |
|
4956 | elif mark: | |
4954 | ms.mark(f, "r") |
|
4957 | ms.mark(f, "r") | |
4955 | elif unmark: |
|
4958 | elif unmark: | |
4956 | ms.mark(f, "u") |
|
4959 | ms.mark(f, "u") | |
4957 | else: |
|
4960 | else: | |
4958 | wctx = repo[None] |
|
4961 | wctx = repo[None] | |
4959 |
|
4962 | |||
4960 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4963 | # backup pre-resolve (merge uses .orig for its own purposes) | |
4961 | a = repo.wjoin(f) |
|
4964 | a = repo.wjoin(f) | |
4962 | util.copyfile(a, a + ".resolve") |
|
4965 | util.copyfile(a, a + ".resolve") | |
4963 |
|
4966 | |||
4964 | try: |
|
4967 | try: | |
4965 | # resolve file |
|
4968 | # resolve file | |
4966 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
4969 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
4967 | if ms.resolve(f, wctx): |
|
4970 | if ms.resolve(f, wctx): | |
4968 | ret = 1 |
|
4971 | ret = 1 | |
4969 | finally: |
|
4972 | finally: | |
4970 | ui.setconfig('ui', 'forcemerge', '') |
|
4973 | ui.setconfig('ui', 'forcemerge', '') | |
4971 | ms.commit() |
|
4974 | ms.commit() | |
4972 |
|
4975 | |||
4973 | # replace filemerge's .orig file with our resolve file |
|
4976 | # replace filemerge's .orig file with our resolve file | |
4974 | util.rename(a + ".resolve", a + ".orig") |
|
4977 | util.rename(a + ".resolve", a + ".orig") | |
4975 |
|
4978 | |||
4976 | ms.commit() |
|
4979 | ms.commit() | |
4977 | return ret |
|
4980 | return ret | |
4978 |
|
4981 | |||
4979 | @command('revert', |
|
4982 | @command('revert', | |
4980 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4983 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
4981 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4984 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
4982 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4985 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
4983 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4986 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
4984 | ] + walkopts + dryrunopts, |
|
4987 | ] + walkopts + dryrunopts, | |
4985 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4988 | _('[OPTION]... [-r REV] [NAME]...')) | |
4986 | def revert(ui, repo, *pats, **opts): |
|
4989 | def revert(ui, repo, *pats, **opts): | |
4987 | """restore files to their checkout state |
|
4990 | """restore files to their checkout state | |
4988 |
|
4991 | |||
4989 | .. note:: |
|
4992 | .. note:: | |
4990 |
|
4993 | |||
4991 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4994 | To check out earlier revisions, you should use :hg:`update REV`. | |
4992 | To cancel an uncommitted merge (and lose your changes), |
|
4995 | To cancel an uncommitted merge (and lose your changes), | |
4993 | use :hg:`update --clean .`. |
|
4996 | use :hg:`update --clean .`. | |
4994 |
|
4997 | |||
4995 | With no revision specified, revert the specified files or directories |
|
4998 | With no revision specified, revert the specified files or directories | |
4996 | to the contents they had in the parent of the working directory. |
|
4999 | to the contents they had in the parent of the working directory. | |
4997 | This restores the contents of files to an unmodified |
|
5000 | This restores the contents of files to an unmodified | |
4998 | state and unschedules adds, removes, copies, and renames. If the |
|
5001 | state and unschedules adds, removes, copies, and renames. If the | |
4999 | working directory has two parents, you must explicitly specify a |
|
5002 | working directory has two parents, you must explicitly specify a | |
5000 | revision. |
|
5003 | revision. | |
5001 |
|
5004 | |||
5002 | Using the -r/--rev or -d/--date options, revert the given files or |
|
5005 | Using the -r/--rev or -d/--date options, revert the given files or | |
5003 | directories to their states as of a specific revision. Because |
|
5006 | directories to their states as of a specific revision. Because | |
5004 | revert does not change the working directory parents, this will |
|
5007 | revert does not change the working directory parents, this will | |
5005 | cause these files to appear modified. This can be helpful to "back |
|
5008 | cause these files to appear modified. This can be helpful to "back | |
5006 | out" some or all of an earlier change. See :hg:`backout` for a |
|
5009 | out" some or all of an earlier change. See :hg:`backout` for a | |
5007 | related method. |
|
5010 | related method. | |
5008 |
|
5011 | |||
5009 | Modified files are saved with a .orig suffix before reverting. |
|
5012 | Modified files are saved with a .orig suffix before reverting. | |
5010 | To disable these backups, use --no-backup. |
|
5013 | To disable these backups, use --no-backup. | |
5011 |
|
5014 | |||
5012 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5015 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5013 |
|
5016 | |||
5014 | Returns 0 on success. |
|
5017 | Returns 0 on success. | |
5015 | """ |
|
5018 | """ | |
5016 |
|
5019 | |||
5017 | if opts.get("date"): |
|
5020 | if opts.get("date"): | |
5018 | if opts.get("rev"): |
|
5021 | if opts.get("rev"): | |
5019 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5022 | raise util.Abort(_("you can't specify a revision and a date")) | |
5020 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
5023 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
5021 |
|
5024 | |||
5022 | parent, p2 = repo.dirstate.parents() |
|
5025 | parent, p2 = repo.dirstate.parents() | |
5023 | if not opts.get('rev') and p2 != nullid: |
|
5026 | if not opts.get('rev') and p2 != nullid: | |
5024 | # revert after merge is a trap for new users (issue2915) |
|
5027 | # revert after merge is a trap for new users (issue2915) | |
5025 | raise util.Abort(_('uncommitted merge with no revision specified'), |
|
5028 | raise util.Abort(_('uncommitted merge with no revision specified'), | |
5026 | hint=_('use "hg update" or see "hg help revert"')) |
|
5029 | hint=_('use "hg update" or see "hg help revert"')) | |
5027 |
|
5030 | |||
5028 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5031 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
5029 |
|
5032 | |||
5030 | if not pats and not opts.get('all'): |
|
5033 | if not pats and not opts.get('all'): | |
5031 | msg = _("no files or directories specified") |
|
5034 | msg = _("no files or directories specified") | |
5032 | if p2 != nullid: |
|
5035 | if p2 != nullid: | |
5033 | hint = _("uncommitted merge, use --all to discard all changes," |
|
5036 | hint = _("uncommitted merge, use --all to discard all changes," | |
5034 | " or 'hg update -C .' to abort the merge") |
|
5037 | " or 'hg update -C .' to abort the merge") | |
5035 | raise util.Abort(msg, hint=hint) |
|
5038 | raise util.Abort(msg, hint=hint) | |
5036 | dirty = util.any(repo.status()) |
|
5039 | dirty = util.any(repo.status()) | |
5037 | node = ctx.node() |
|
5040 | node = ctx.node() | |
5038 | if node != parent: |
|
5041 | if node != parent: | |
5039 | if dirty: |
|
5042 | if dirty: | |
5040 | hint = _("uncommitted changes, use --all to discard all" |
|
5043 | hint = _("uncommitted changes, use --all to discard all" | |
5041 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
5044 | " changes, or 'hg update %s' to update") % ctx.rev() | |
5042 | else: |
|
5045 | else: | |
5043 | hint = _("use --all to revert all files," |
|
5046 | hint = _("use --all to revert all files," | |
5044 | " or 'hg update %s' to update") % ctx.rev() |
|
5047 | " or 'hg update %s' to update") % ctx.rev() | |
5045 | elif dirty: |
|
5048 | elif dirty: | |
5046 | hint = _("uncommitted changes, use --all to discard all changes") |
|
5049 | hint = _("uncommitted changes, use --all to discard all changes") | |
5047 | else: |
|
5050 | else: | |
5048 | hint = _("use --all to revert all files") |
|
5051 | hint = _("use --all to revert all files") | |
5049 | raise util.Abort(msg, hint=hint) |
|
5052 | raise util.Abort(msg, hint=hint) | |
5050 |
|
5053 | |||
5051 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
5054 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) | |
5052 |
|
5055 | |||
5053 | @command('rollback', dryrunopts + |
|
5056 | @command('rollback', dryrunopts + | |
5054 | [('f', 'force', False, _('ignore safety measures'))]) |
|
5057 | [('f', 'force', False, _('ignore safety measures'))]) | |
5055 | def rollback(ui, repo, **opts): |
|
5058 | def rollback(ui, repo, **opts): | |
5056 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
5059 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
5057 |
|
5060 | |||
5058 | Please use :hg:`commit --amend` instead of rollback to correct |
|
5061 | Please use :hg:`commit --amend` instead of rollback to correct | |
5059 | mistakes in the last commit. |
|
5062 | mistakes in the last commit. | |
5060 |
|
5063 | |||
5061 | This command should be used with care. There is only one level of |
|
5064 | This command should be used with care. There is only one level of | |
5062 | rollback, and there is no way to undo a rollback. It will also |
|
5065 | rollback, and there is no way to undo a rollback. It will also | |
5063 | restore the dirstate at the time of the last transaction, losing |
|
5066 | restore the dirstate at the time of the last transaction, losing | |
5064 | any dirstate changes since that time. This command does not alter |
|
5067 | any dirstate changes since that time. This command does not alter | |
5065 | the working directory. |
|
5068 | the working directory. | |
5066 |
|
5069 | |||
5067 | Transactions are used to encapsulate the effects of all commands |
|
5070 | Transactions are used to encapsulate the effects of all commands | |
5068 | that create new changesets or propagate existing changesets into a |
|
5071 | that create new changesets or propagate existing changesets into a | |
5069 | repository. |
|
5072 | repository. | |
5070 |
|
5073 | |||
5071 | .. container:: verbose |
|
5074 | .. container:: verbose | |
5072 |
|
5075 | |||
5073 | For example, the following commands are transactional, and their |
|
5076 | For example, the following commands are transactional, and their | |
5074 | effects can be rolled back: |
|
5077 | effects can be rolled back: | |
5075 |
|
5078 | |||
5076 | - commit |
|
5079 | - commit | |
5077 | - import |
|
5080 | - import | |
5078 | - pull |
|
5081 | - pull | |
5079 | - push (with this repository as the destination) |
|
5082 | - push (with this repository as the destination) | |
5080 | - unbundle |
|
5083 | - unbundle | |
5081 |
|
5084 | |||
5082 | To avoid permanent data loss, rollback will refuse to rollback a |
|
5085 | To avoid permanent data loss, rollback will refuse to rollback a | |
5083 | commit transaction if it isn't checked out. Use --force to |
|
5086 | commit transaction if it isn't checked out. Use --force to | |
5084 | override this protection. |
|
5087 | override this protection. | |
5085 |
|
5088 | |||
5086 | This command is not intended for use on public repositories. Once |
|
5089 | This command is not intended for use on public repositories. Once | |
5087 | changes are visible for pull by other users, rolling a transaction |
|
5090 | changes are visible for pull by other users, rolling a transaction | |
5088 | back locally is ineffective (someone else may already have pulled |
|
5091 | back locally is ineffective (someone else may already have pulled | |
5089 | the changes). Furthermore, a race is possible with readers of the |
|
5092 | the changes). Furthermore, a race is possible with readers of the | |
5090 | repository; for example an in-progress pull from the repository |
|
5093 | repository; for example an in-progress pull from the repository | |
5091 | may fail if a rollback is performed. |
|
5094 | may fail if a rollback is performed. | |
5092 |
|
5095 | |||
5093 | Returns 0 on success, 1 if no rollback data is available. |
|
5096 | Returns 0 on success, 1 if no rollback data is available. | |
5094 | """ |
|
5097 | """ | |
5095 | return repo.rollback(dryrun=opts.get('dry_run'), |
|
5098 | return repo.rollback(dryrun=opts.get('dry_run'), | |
5096 | force=opts.get('force')) |
|
5099 | force=opts.get('force')) | |
5097 |
|
5100 | |||
5098 | @command('root', []) |
|
5101 | @command('root', []) | |
5099 | def root(ui, repo): |
|
5102 | def root(ui, repo): | |
5100 | """print the root (top) of the current working directory |
|
5103 | """print the root (top) of the current working directory | |
5101 |
|
5104 | |||
5102 | Print the root directory of the current repository. |
|
5105 | Print the root directory of the current repository. | |
5103 |
|
5106 | |||
5104 | Returns 0 on success. |
|
5107 | Returns 0 on success. | |
5105 | """ |
|
5108 | """ | |
5106 | ui.write(repo.root + "\n") |
|
5109 | ui.write(repo.root + "\n") | |
5107 |
|
5110 | |||
5108 | @command('^serve', |
|
5111 | @command('^serve', | |
5109 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
5112 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
5110 | _('FILE')), |
|
5113 | _('FILE')), | |
5111 | ('d', 'daemon', None, _('run server in background')), |
|
5114 | ('d', 'daemon', None, _('run server in background')), | |
5112 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), |
|
5115 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), | |
5113 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
5116 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
5114 | # use string type, then we can check if something was passed |
|
5117 | # use string type, then we can check if something was passed | |
5115 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
5118 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
5116 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
5119 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
5117 | _('ADDR')), |
|
5120 | _('ADDR')), | |
5118 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
5121 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
5119 | _('PREFIX')), |
|
5122 | _('PREFIX')), | |
5120 | ('n', 'name', '', |
|
5123 | ('n', 'name', '', | |
5121 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
5124 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
5122 | ('', 'web-conf', '', |
|
5125 | ('', 'web-conf', '', | |
5123 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), |
|
5126 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), | |
5124 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
5127 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
5125 | _('FILE')), |
|
5128 | _('FILE')), | |
5126 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
5129 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
5127 | ('', 'stdio', None, _('for remote clients')), |
|
5130 | ('', 'stdio', None, _('for remote clients')), | |
5128 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), |
|
5131 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), | |
5129 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
5132 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
5130 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
5133 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
5131 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
5134 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
5132 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], |
|
5135 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], | |
5133 | _('[OPTION]...')) |
|
5136 | _('[OPTION]...')) | |
5134 | def serve(ui, repo, **opts): |
|
5137 | def serve(ui, repo, **opts): | |
5135 | """start stand-alone webserver |
|
5138 | """start stand-alone webserver | |
5136 |
|
5139 | |||
5137 | Start a local HTTP repository browser and pull server. You can use |
|
5140 | Start a local HTTP repository browser and pull server. You can use | |
5138 | this for ad-hoc sharing and browsing of repositories. It is |
|
5141 | this for ad-hoc sharing and browsing of repositories. It is | |
5139 | recommended to use a real web server to serve a repository for |
|
5142 | recommended to use a real web server to serve a repository for | |
5140 | longer periods of time. |
|
5143 | longer periods of time. | |
5141 |
|
5144 | |||
5142 | Please note that the server does not implement access control. |
|
5145 | Please note that the server does not implement access control. | |
5143 | This means that, by default, anybody can read from the server and |
|
5146 | This means that, by default, anybody can read from the server and | |
5144 | nobody can write to it by default. Set the ``web.allow_push`` |
|
5147 | nobody can write to it by default. Set the ``web.allow_push`` | |
5145 | option to ``*`` to allow everybody to push to the server. You |
|
5148 | option to ``*`` to allow everybody to push to the server. You | |
5146 | should use a real web server if you need to authenticate users. |
|
5149 | should use a real web server if you need to authenticate users. | |
5147 |
|
5150 | |||
5148 | By default, the server logs accesses to stdout and errors to |
|
5151 | By default, the server logs accesses to stdout and errors to | |
5149 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
5152 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
5150 | files. |
|
5153 | files. | |
5151 |
|
5154 | |||
5152 | To have the server choose a free port number to listen on, specify |
|
5155 | To have the server choose a free port number to listen on, specify | |
5153 | a port number of 0; in this case, the server will print the port |
|
5156 | a port number of 0; in this case, the server will print the port | |
5154 | number it uses. |
|
5157 | number it uses. | |
5155 |
|
5158 | |||
5156 | Returns 0 on success. |
|
5159 | Returns 0 on success. | |
5157 | """ |
|
5160 | """ | |
5158 |
|
5161 | |||
5159 | if opts["stdio"] and opts["cmdserver"]: |
|
5162 | if opts["stdio"] and opts["cmdserver"]: | |
5160 | raise util.Abort(_("cannot use --stdio with --cmdserver")) |
|
5163 | raise util.Abort(_("cannot use --stdio with --cmdserver")) | |
5161 |
|
5164 | |||
5162 | def checkrepo(): |
|
5165 | def checkrepo(): | |
5163 | if repo is None: |
|
5166 | if repo is None: | |
5164 | raise error.RepoError(_("there is no Mercurial repository here" |
|
5167 | raise error.RepoError(_("there is no Mercurial repository here" | |
5165 | " (.hg not found)")) |
|
5168 | " (.hg not found)")) | |
5166 |
|
5169 | |||
5167 | if opts["stdio"]: |
|
5170 | if opts["stdio"]: | |
5168 | checkrepo() |
|
5171 | checkrepo() | |
5169 | s = sshserver.sshserver(ui, repo) |
|
5172 | s = sshserver.sshserver(ui, repo) | |
5170 | s.serve_forever() |
|
5173 | s.serve_forever() | |
5171 |
|
5174 | |||
5172 | if opts["cmdserver"]: |
|
5175 | if opts["cmdserver"]: | |
5173 | checkrepo() |
|
5176 | checkrepo() | |
5174 | s = commandserver.server(ui, repo, opts["cmdserver"]) |
|
5177 | s = commandserver.server(ui, repo, opts["cmdserver"]) | |
5175 | return s.serve() |
|
5178 | return s.serve() | |
5176 |
|
5179 | |||
5177 | # this way we can check if something was given in the command-line |
|
5180 | # this way we can check if something was given in the command-line | |
5178 | if opts.get('port'): |
|
5181 | if opts.get('port'): | |
5179 | opts['port'] = util.getport(opts.get('port')) |
|
5182 | opts['port'] = util.getport(opts.get('port')) | |
5180 |
|
5183 | |||
5181 | baseui = repo and repo.baseui or ui |
|
5184 | baseui = repo and repo.baseui or ui | |
5182 | optlist = ("name templates style address port prefix ipv6" |
|
5185 | optlist = ("name templates style address port prefix ipv6" | |
5183 | " accesslog errorlog certificate encoding") |
|
5186 | " accesslog errorlog certificate encoding") | |
5184 | for o in optlist.split(): |
|
5187 | for o in optlist.split(): | |
5185 | val = opts.get(o, '') |
|
5188 | val = opts.get(o, '') | |
5186 | if val in (None, ''): # should check against default options instead |
|
5189 | if val in (None, ''): # should check against default options instead | |
5187 | continue |
|
5190 | continue | |
5188 | baseui.setconfig("web", o, val) |
|
5191 | baseui.setconfig("web", o, val) | |
5189 | if repo and repo.ui != baseui: |
|
5192 | if repo and repo.ui != baseui: | |
5190 | repo.ui.setconfig("web", o, val) |
|
5193 | repo.ui.setconfig("web", o, val) | |
5191 |
|
5194 | |||
5192 | o = opts.get('web_conf') or opts.get('webdir_conf') |
|
5195 | o = opts.get('web_conf') or opts.get('webdir_conf') | |
5193 | if not o: |
|
5196 | if not o: | |
5194 | if not repo: |
|
5197 | if not repo: | |
5195 | raise error.RepoError(_("there is no Mercurial repository" |
|
5198 | raise error.RepoError(_("there is no Mercurial repository" | |
5196 | " here (.hg not found)")) |
|
5199 | " here (.hg not found)")) | |
5197 | o = repo |
|
5200 | o = repo | |
5198 |
|
5201 | |||
5199 | app = hgweb.hgweb(o, baseui=baseui) |
|
5202 | app = hgweb.hgweb(o, baseui=baseui) | |
5200 | service = httpservice(ui, app, opts) |
|
5203 | service = httpservice(ui, app, opts) | |
5201 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
5204 | cmdutil.service(opts, initfn=service.init, runfn=service.run) | |
5202 |
|
5205 | |||
5203 | class httpservice(object): |
|
5206 | class httpservice(object): | |
5204 | def __init__(self, ui, app, opts): |
|
5207 | def __init__(self, ui, app, opts): | |
5205 | self.ui = ui |
|
5208 | self.ui = ui | |
5206 | self.app = app |
|
5209 | self.app = app | |
5207 | self.opts = opts |
|
5210 | self.opts = opts | |
5208 |
|
5211 | |||
5209 | def init(self): |
|
5212 | def init(self): | |
5210 | util.setsignalhandler() |
|
5213 | util.setsignalhandler() | |
5211 | self.httpd = hgweb_server.create_server(self.ui, self.app) |
|
5214 | self.httpd = hgweb_server.create_server(self.ui, self.app) | |
5212 |
|
5215 | |||
5213 | if self.opts['port'] and not self.ui.verbose: |
|
5216 | if self.opts['port'] and not self.ui.verbose: | |
5214 | return |
|
5217 | return | |
5215 |
|
5218 | |||
5216 | if self.httpd.prefix: |
|
5219 | if self.httpd.prefix: | |
5217 | prefix = self.httpd.prefix.strip('/') + '/' |
|
5220 | prefix = self.httpd.prefix.strip('/') + '/' | |
5218 | else: |
|
5221 | else: | |
5219 | prefix = '' |
|
5222 | prefix = '' | |
5220 |
|
5223 | |||
5221 | port = ':%d' % self.httpd.port |
|
5224 | port = ':%d' % self.httpd.port | |
5222 | if port == ':80': |
|
5225 | if port == ':80': | |
5223 | port = '' |
|
5226 | port = '' | |
5224 |
|
5227 | |||
5225 | bindaddr = self.httpd.addr |
|
5228 | bindaddr = self.httpd.addr | |
5226 | if bindaddr == '0.0.0.0': |
|
5229 | if bindaddr == '0.0.0.0': | |
5227 | bindaddr = '*' |
|
5230 | bindaddr = '*' | |
5228 | elif ':' in bindaddr: # IPv6 |
|
5231 | elif ':' in bindaddr: # IPv6 | |
5229 | bindaddr = '[%s]' % bindaddr |
|
5232 | bindaddr = '[%s]' % bindaddr | |
5230 |
|
5233 | |||
5231 | fqaddr = self.httpd.fqaddr |
|
5234 | fqaddr = self.httpd.fqaddr | |
5232 | if ':' in fqaddr: |
|
5235 | if ':' in fqaddr: | |
5233 | fqaddr = '[%s]' % fqaddr |
|
5236 | fqaddr = '[%s]' % fqaddr | |
5234 | if self.opts['port']: |
|
5237 | if self.opts['port']: | |
5235 | write = self.ui.status |
|
5238 | write = self.ui.status | |
5236 | else: |
|
5239 | else: | |
5237 | write = self.ui.write |
|
5240 | write = self.ui.write | |
5238 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % |
|
5241 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % | |
5239 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) |
|
5242 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) | |
5240 |
|
5243 | |||
5241 | def run(self): |
|
5244 | def run(self): | |
5242 | self.httpd.serve_forever() |
|
5245 | self.httpd.serve_forever() | |
5243 |
|
5246 | |||
5244 |
|
5247 | |||
5245 | @command('showconfig|debugconfig', |
|
5248 | @command('showconfig|debugconfig', | |
5246 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
5249 | [('u', 'untrusted', None, _('show untrusted configuration options'))], | |
5247 | _('[-u] [NAME]...')) |
|
5250 | _('[-u] [NAME]...')) | |
5248 | def showconfig(ui, repo, *values, **opts): |
|
5251 | def showconfig(ui, repo, *values, **opts): | |
5249 | """show combined config settings from all hgrc files |
|
5252 | """show combined config settings from all hgrc files | |
5250 |
|
5253 | |||
5251 | With no arguments, print names and values of all config items. |
|
5254 | With no arguments, print names and values of all config items. | |
5252 |
|
5255 | |||
5253 | With one argument of the form section.name, print just the value |
|
5256 | With one argument of the form section.name, print just the value | |
5254 | of that config item. |
|
5257 | of that config item. | |
5255 |
|
5258 | |||
5256 | With multiple arguments, print names and values of all config |
|
5259 | With multiple arguments, print names and values of all config | |
5257 | items with matching section names. |
|
5260 | items with matching section names. | |
5258 |
|
5261 | |||
5259 | With --debug, the source (filename and line number) is printed |
|
5262 | With --debug, the source (filename and line number) is printed | |
5260 | for each config item. |
|
5263 | for each config item. | |
5261 |
|
5264 | |||
5262 | Returns 0 on success. |
|
5265 | Returns 0 on success. | |
5263 | """ |
|
5266 | """ | |
5264 |
|
5267 | |||
5265 | for f in scmutil.rcpath(): |
|
5268 | for f in scmutil.rcpath(): | |
5266 | ui.debug('read config from: %s\n' % f) |
|
5269 | ui.debug('read config from: %s\n' % f) | |
5267 | untrusted = bool(opts.get('untrusted')) |
|
5270 | untrusted = bool(opts.get('untrusted')) | |
5268 | if values: |
|
5271 | if values: | |
5269 | sections = [v for v in values if '.' not in v] |
|
5272 | sections = [v for v in values if '.' not in v] | |
5270 | items = [v for v in values if '.' in v] |
|
5273 | items = [v for v in values if '.' in v] | |
5271 | if len(items) > 1 or items and sections: |
|
5274 | if len(items) > 1 or items and sections: | |
5272 | raise util.Abort(_('only one config item permitted')) |
|
5275 | raise util.Abort(_('only one config item permitted')) | |
5273 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
5276 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
5274 | value = str(value).replace('\n', '\\n') |
|
5277 | value = str(value).replace('\n', '\\n') | |
5275 | sectname = section + '.' + name |
|
5278 | sectname = section + '.' + name | |
5276 | if values: |
|
5279 | if values: | |
5277 | for v in values: |
|
5280 | for v in values: | |
5278 | if v == section: |
|
5281 | if v == section: | |
5279 | ui.debug('%s: ' % |
|
5282 | ui.debug('%s: ' % | |
5280 | ui.configsource(section, name, untrusted)) |
|
5283 | ui.configsource(section, name, untrusted)) | |
5281 | ui.write('%s=%s\n' % (sectname, value)) |
|
5284 | ui.write('%s=%s\n' % (sectname, value)) | |
5282 | elif v == sectname: |
|
5285 | elif v == sectname: | |
5283 | ui.debug('%s: ' % |
|
5286 | ui.debug('%s: ' % | |
5284 | ui.configsource(section, name, untrusted)) |
|
5287 | ui.configsource(section, name, untrusted)) | |
5285 | ui.write(value, '\n') |
|
5288 | ui.write(value, '\n') | |
5286 | else: |
|
5289 | else: | |
5287 | ui.debug('%s: ' % |
|
5290 | ui.debug('%s: ' % | |
5288 | ui.configsource(section, name, untrusted)) |
|
5291 | ui.configsource(section, name, untrusted)) | |
5289 | ui.write('%s=%s\n' % (sectname, value)) |
|
5292 | ui.write('%s=%s\n' % (sectname, value)) | |
5290 |
|
5293 | |||
5291 | @command('^status|st', |
|
5294 | @command('^status|st', | |
5292 | [('A', 'all', None, _('show status of all files')), |
|
5295 | [('A', 'all', None, _('show status of all files')), | |
5293 | ('m', 'modified', None, _('show only modified files')), |
|
5296 | ('m', 'modified', None, _('show only modified files')), | |
5294 | ('a', 'added', None, _('show only added files')), |
|
5297 | ('a', 'added', None, _('show only added files')), | |
5295 | ('r', 'removed', None, _('show only removed files')), |
|
5298 | ('r', 'removed', None, _('show only removed files')), | |
5296 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
5299 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
5297 | ('c', 'clean', None, _('show only files without changes')), |
|
5300 | ('c', 'clean', None, _('show only files without changes')), | |
5298 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
5301 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
5299 | ('i', 'ignored', None, _('show only ignored files')), |
|
5302 | ('i', 'ignored', None, _('show only ignored files')), | |
5300 | ('n', 'no-status', None, _('hide status prefix')), |
|
5303 | ('n', 'no-status', None, _('hide status prefix')), | |
5301 | ('C', 'copies', None, _('show source of copied files')), |
|
5304 | ('C', 'copies', None, _('show source of copied files')), | |
5302 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
5305 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
5303 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
5306 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
5304 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
5307 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
5305 | ] + walkopts + subrepoopts, |
|
5308 | ] + walkopts + subrepoopts, | |
5306 | _('[OPTION]... [FILE]...')) |
|
5309 | _('[OPTION]... [FILE]...')) | |
5307 | def status(ui, repo, *pats, **opts): |
|
5310 | def status(ui, repo, *pats, **opts): | |
5308 | """show changed files in the working directory |
|
5311 | """show changed files in the working directory | |
5309 |
|
5312 | |||
5310 | Show status of files in the repository. If names are given, only |
|
5313 | Show status of files in the repository. If names are given, only | |
5311 | files that match are shown. Files that are clean or ignored or |
|
5314 | files that match are shown. Files that are clean or ignored or | |
5312 | the source of a copy/move operation, are not listed unless |
|
5315 | the source of a copy/move operation, are not listed unless | |
5313 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
5316 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
5314 | Unless options described with "show only ..." are given, the |
|
5317 | Unless options described with "show only ..." are given, the | |
5315 | options -mardu are used. |
|
5318 | options -mardu are used. | |
5316 |
|
5319 | |||
5317 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
5320 | Option -q/--quiet hides untracked (unknown and ignored) files | |
5318 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
5321 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
5319 |
|
5322 | |||
5320 | .. note:: |
|
5323 | .. note:: | |
5321 |
|
5324 | |||
5322 | status may appear to disagree with diff if permissions have |
|
5325 | status may appear to disagree with diff if permissions have | |
5323 | changed or a merge has occurred. The standard diff format does |
|
5326 | changed or a merge has occurred. The standard diff format does | |
5324 | not report permission changes and diff only reports changes |
|
5327 | not report permission changes and diff only reports changes | |
5325 | relative to one merge parent. |
|
5328 | relative to one merge parent. | |
5326 |
|
5329 | |||
5327 | If one revision is given, it is used as the base revision. |
|
5330 | If one revision is given, it is used as the base revision. | |
5328 | If two revisions are given, the differences between them are |
|
5331 | If two revisions are given, the differences between them are | |
5329 | shown. The --change option can also be used as a shortcut to list |
|
5332 | shown. The --change option can also be used as a shortcut to list | |
5330 | the changed files of a revision from its first parent. |
|
5333 | the changed files of a revision from its first parent. | |
5331 |
|
5334 | |||
5332 | The codes used to show the status of files are:: |
|
5335 | The codes used to show the status of files are:: | |
5333 |
|
5336 | |||
5334 | M = modified |
|
5337 | M = modified | |
5335 | A = added |
|
5338 | A = added | |
5336 | R = removed |
|
5339 | R = removed | |
5337 | C = clean |
|
5340 | C = clean | |
5338 | ! = missing (deleted by non-hg command, but still tracked) |
|
5341 | ! = missing (deleted by non-hg command, but still tracked) | |
5339 | ? = not tracked |
|
5342 | ? = not tracked | |
5340 | I = ignored |
|
5343 | I = ignored | |
5341 | = origin of the previous file listed as A (added) |
|
5344 | = origin of the previous file listed as A (added) | |
5342 |
|
5345 | |||
5343 | .. container:: verbose |
|
5346 | .. container:: verbose | |
5344 |
|
5347 | |||
5345 | Examples: |
|
5348 | Examples: | |
5346 |
|
5349 | |||
5347 | - show changes in the working directory relative to a |
|
5350 | - show changes in the working directory relative to a | |
5348 | changeset:: |
|
5351 | changeset:: | |
5349 |
|
5352 | |||
5350 | hg status --rev 9353 |
|
5353 | hg status --rev 9353 | |
5351 |
|
5354 | |||
5352 | - show all changes including copies in an existing changeset:: |
|
5355 | - show all changes including copies in an existing changeset:: | |
5353 |
|
5356 | |||
5354 | hg status --copies --change 9353 |
|
5357 | hg status --copies --change 9353 | |
5355 |
|
5358 | |||
5356 | - get a NUL separated list of added files, suitable for xargs:: |
|
5359 | - get a NUL separated list of added files, suitable for xargs:: | |
5357 |
|
5360 | |||
5358 | hg status -an0 |
|
5361 | hg status -an0 | |
5359 |
|
5362 | |||
5360 | Returns 0 on success. |
|
5363 | Returns 0 on success. | |
5361 | """ |
|
5364 | """ | |
5362 |
|
5365 | |||
5363 | revs = opts.get('rev') |
|
5366 | revs = opts.get('rev') | |
5364 | change = opts.get('change') |
|
5367 | change = opts.get('change') | |
5365 |
|
5368 | |||
5366 | if revs and change: |
|
5369 | if revs and change: | |
5367 | msg = _('cannot specify --rev and --change at the same time') |
|
5370 | msg = _('cannot specify --rev and --change at the same time') | |
5368 | raise util.Abort(msg) |
|
5371 | raise util.Abort(msg) | |
5369 | elif change: |
|
5372 | elif change: | |
5370 | node2 = scmutil.revsingle(repo, change, None).node() |
|
5373 | node2 = scmutil.revsingle(repo, change, None).node() | |
5371 | node1 = repo[node2].p1().node() |
|
5374 | node1 = repo[node2].p1().node() | |
5372 | else: |
|
5375 | else: | |
5373 | node1, node2 = scmutil.revpair(repo, revs) |
|
5376 | node1, node2 = scmutil.revpair(repo, revs) | |
5374 |
|
5377 | |||
5375 | cwd = (pats and repo.getcwd()) or '' |
|
5378 | cwd = (pats and repo.getcwd()) or '' | |
5376 | end = opts.get('print0') and '\0' or '\n' |
|
5379 | end = opts.get('print0') and '\0' or '\n' | |
5377 | copy = {} |
|
5380 | copy = {} | |
5378 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
5381 | states = 'modified added removed deleted unknown ignored clean'.split() | |
5379 | show = [k for k in states if opts.get(k)] |
|
5382 | show = [k for k in states if opts.get(k)] | |
5380 | if opts.get('all'): |
|
5383 | if opts.get('all'): | |
5381 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
5384 | show += ui.quiet and (states[:4] + ['clean']) or states | |
5382 | if not show: |
|
5385 | if not show: | |
5383 | show = ui.quiet and states[:4] or states[:5] |
|
5386 | show = ui.quiet and states[:4] or states[:5] | |
5384 |
|
5387 | |||
5385 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), |
|
5388 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), | |
5386 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
5389 | 'ignored' in show, 'clean' in show, 'unknown' in show, | |
5387 | opts.get('subrepos')) |
|
5390 | opts.get('subrepos')) | |
5388 | changestates = zip(states, 'MAR!?IC', stat) |
|
5391 | changestates = zip(states, 'MAR!?IC', stat) | |
5389 |
|
5392 | |||
5390 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
|
5393 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): | |
5391 | copy = copies.pathcopies(repo[node1], repo[node2]) |
|
5394 | copy = copies.pathcopies(repo[node1], repo[node2]) | |
5392 |
|
5395 | |||
5393 | fm = ui.formatter('status', opts) |
|
5396 | fm = ui.formatter('status', opts) | |
5394 | fmt = '%s' + end |
|
5397 | fmt = '%s' + end | |
5395 | showchar = not opts.get('no_status') |
|
5398 | showchar = not opts.get('no_status') | |
5396 |
|
5399 | |||
5397 | for state, char, files in changestates: |
|
5400 | for state, char, files in changestates: | |
5398 | if state in show: |
|
5401 | if state in show: | |
5399 | label = 'status.' + state |
|
5402 | label = 'status.' + state | |
5400 | for f in files: |
|
5403 | for f in files: | |
5401 | fm.startitem() |
|
5404 | fm.startitem() | |
5402 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
5405 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
5403 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
5406 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
5404 | if f in copy: |
|
5407 | if f in copy: | |
5405 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
5408 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
5406 | label='status.copied') |
|
5409 | label='status.copied') | |
5407 | fm.end() |
|
5410 | fm.end() | |
5408 |
|
5411 | |||
5409 | @command('^summary|sum', |
|
5412 | @command('^summary|sum', | |
5410 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
5413 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') | |
5411 | def summary(ui, repo, **opts): |
|
5414 | def summary(ui, repo, **opts): | |
5412 | """summarize working directory state |
|
5415 | """summarize working directory state | |
5413 |
|
5416 | |||
5414 | This generates a brief summary of the working directory state, |
|
5417 | This generates a brief summary of the working directory state, | |
5415 | including parents, branch, commit status, and available updates. |
|
5418 | including parents, branch, commit status, and available updates. | |
5416 |
|
5419 | |||
5417 | With the --remote option, this will check the default paths for |
|
5420 | With the --remote option, this will check the default paths for | |
5418 | incoming and outgoing changes. This can be time-consuming. |
|
5421 | incoming and outgoing changes. This can be time-consuming. | |
5419 |
|
5422 | |||
5420 | Returns 0 on success. |
|
5423 | Returns 0 on success. | |
5421 | """ |
|
5424 | """ | |
5422 |
|
5425 | |||
5423 | ctx = repo[None] |
|
5426 | ctx = repo[None] | |
5424 | parents = ctx.parents() |
|
5427 | parents = ctx.parents() | |
5425 | pnode = parents[0].node() |
|
5428 | pnode = parents[0].node() | |
5426 | marks = [] |
|
5429 | marks = [] | |
5427 |
|
5430 | |||
5428 | for p in parents: |
|
5431 | for p in parents: | |
5429 | # label with log.changeset (instead of log.parent) since this |
|
5432 | # label with log.changeset (instead of log.parent) since this | |
5430 | # shows a working directory parent *changeset*: |
|
5433 | # shows a working directory parent *changeset*: | |
5431 | # i18n: column positioning for "hg summary" |
|
5434 | # i18n: column positioning for "hg summary" | |
5432 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
5435 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), | |
5433 | label='log.changeset changeset.%s' % p.phasestr()) |
|
5436 | label='log.changeset changeset.%s' % p.phasestr()) | |
5434 | ui.write(' '.join(p.tags()), label='log.tag') |
|
5437 | ui.write(' '.join(p.tags()), label='log.tag') | |
5435 | if p.bookmarks(): |
|
5438 | if p.bookmarks(): | |
5436 | marks.extend(p.bookmarks()) |
|
5439 | marks.extend(p.bookmarks()) | |
5437 | if p.rev() == -1: |
|
5440 | if p.rev() == -1: | |
5438 | if not len(repo): |
|
5441 | if not len(repo): | |
5439 | ui.write(_(' (empty repository)')) |
|
5442 | ui.write(_(' (empty repository)')) | |
5440 | else: |
|
5443 | else: | |
5441 | ui.write(_(' (no revision checked out)')) |
|
5444 | ui.write(_(' (no revision checked out)')) | |
5442 | ui.write('\n') |
|
5445 | ui.write('\n') | |
5443 | if p.description(): |
|
5446 | if p.description(): | |
5444 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
5447 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
5445 | label='log.summary') |
|
5448 | label='log.summary') | |
5446 |
|
5449 | |||
5447 | branch = ctx.branch() |
|
5450 | branch = ctx.branch() | |
5448 | bheads = repo.branchheads(branch) |
|
5451 | bheads = repo.branchheads(branch) | |
5449 | # i18n: column positioning for "hg summary" |
|
5452 | # i18n: column positioning for "hg summary" | |
5450 | m = _('branch: %s\n') % branch |
|
5453 | m = _('branch: %s\n') % branch | |
5451 | if branch != 'default': |
|
5454 | if branch != 'default': | |
5452 | ui.write(m, label='log.branch') |
|
5455 | ui.write(m, label='log.branch') | |
5453 | else: |
|
5456 | else: | |
5454 | ui.status(m, label='log.branch') |
|
5457 | ui.status(m, label='log.branch') | |
5455 |
|
5458 | |||
5456 | if marks: |
|
5459 | if marks: | |
5457 | current = repo._bookmarkcurrent |
|
5460 | current = repo._bookmarkcurrent | |
5458 | # i18n: column positioning for "hg summary" |
|
5461 | # i18n: column positioning for "hg summary" | |
5459 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5462 | ui.write(_('bookmarks:'), label='log.bookmark') | |
5460 | if current is not None: |
|
5463 | if current is not None: | |
5461 | if current in marks: |
|
5464 | if current in marks: | |
5462 | ui.write(' *' + current, label='bookmarks.current') |
|
5465 | ui.write(' *' + current, label='bookmarks.current') | |
5463 | marks.remove(current) |
|
5466 | marks.remove(current) | |
5464 | else: |
|
5467 | else: | |
5465 | ui.write(' [%s]' % current, label='bookmarks.current') |
|
5468 | ui.write(' [%s]' % current, label='bookmarks.current') | |
5466 | for m in marks: |
|
5469 | for m in marks: | |
5467 | ui.write(' ' + m, label='log.bookmark') |
|
5470 | ui.write(' ' + m, label='log.bookmark') | |
5468 | ui.write('\n', label='log.bookmark') |
|
5471 | ui.write('\n', label='log.bookmark') | |
5469 |
|
5472 | |||
5470 | st = list(repo.status(unknown=True))[:6] |
|
5473 | st = list(repo.status(unknown=True))[:6] | |
5471 |
|
5474 | |||
5472 | c = repo.dirstate.copies() |
|
5475 | c = repo.dirstate.copies() | |
5473 | copied, renamed = [], [] |
|
5476 | copied, renamed = [], [] | |
5474 | for d, s in c.iteritems(): |
|
5477 | for d, s in c.iteritems(): | |
5475 | if s in st[2]: |
|
5478 | if s in st[2]: | |
5476 | st[2].remove(s) |
|
5479 | st[2].remove(s) | |
5477 | renamed.append(d) |
|
5480 | renamed.append(d) | |
5478 | else: |
|
5481 | else: | |
5479 | copied.append(d) |
|
5482 | copied.append(d) | |
5480 | if d in st[1]: |
|
5483 | if d in st[1]: | |
5481 | st[1].remove(d) |
|
5484 | st[1].remove(d) | |
5482 | st.insert(3, renamed) |
|
5485 | st.insert(3, renamed) | |
5483 | st.insert(4, copied) |
|
5486 | st.insert(4, copied) | |
5484 |
|
5487 | |||
5485 | ms = mergemod.mergestate(repo) |
|
5488 | ms = mergemod.mergestate(repo) | |
5486 | st.append([f for f in ms if ms[f] == 'u']) |
|
5489 | st.append([f for f in ms if ms[f] == 'u']) | |
5487 |
|
5490 | |||
5488 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5491 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
5489 | st.append(subs) |
|
5492 | st.append(subs) | |
5490 |
|
5493 | |||
5491 | labels = [ui.label(_('%d modified'), 'status.modified'), |
|
5494 | labels = [ui.label(_('%d modified'), 'status.modified'), | |
5492 | ui.label(_('%d added'), 'status.added'), |
|
5495 | ui.label(_('%d added'), 'status.added'), | |
5493 | ui.label(_('%d removed'), 'status.removed'), |
|
5496 | ui.label(_('%d removed'), 'status.removed'), | |
5494 | ui.label(_('%d renamed'), 'status.copied'), |
|
5497 | ui.label(_('%d renamed'), 'status.copied'), | |
5495 | ui.label(_('%d copied'), 'status.copied'), |
|
5498 | ui.label(_('%d copied'), 'status.copied'), | |
5496 | ui.label(_('%d deleted'), 'status.deleted'), |
|
5499 | ui.label(_('%d deleted'), 'status.deleted'), | |
5497 | ui.label(_('%d unknown'), 'status.unknown'), |
|
5500 | ui.label(_('%d unknown'), 'status.unknown'), | |
5498 | ui.label(_('%d ignored'), 'status.ignored'), |
|
5501 | ui.label(_('%d ignored'), 'status.ignored'), | |
5499 | ui.label(_('%d unresolved'), 'resolve.unresolved'), |
|
5502 | ui.label(_('%d unresolved'), 'resolve.unresolved'), | |
5500 | ui.label(_('%d subrepos'), 'status.modified')] |
|
5503 | ui.label(_('%d subrepos'), 'status.modified')] | |
5501 | t = [] |
|
5504 | t = [] | |
5502 | for s, l in zip(st, labels): |
|
5505 | for s, l in zip(st, labels): | |
5503 | if s: |
|
5506 | if s: | |
5504 | t.append(l % len(s)) |
|
5507 | t.append(l % len(s)) | |
5505 |
|
5508 | |||
5506 | t = ', '.join(t) |
|
5509 | t = ', '.join(t) | |
5507 | cleanworkdir = False |
|
5510 | cleanworkdir = False | |
5508 |
|
5511 | |||
5509 | if repo.vfs.exists('updatestate'): |
|
5512 | if repo.vfs.exists('updatestate'): | |
5510 | t += _(' (interrupted update)') |
|
5513 | t += _(' (interrupted update)') | |
5511 | elif len(parents) > 1: |
|
5514 | elif len(parents) > 1: | |
5512 | t += _(' (merge)') |
|
5515 | t += _(' (merge)') | |
5513 | elif branch != parents[0].branch(): |
|
5516 | elif branch != parents[0].branch(): | |
5514 | t += _(' (new branch)') |
|
5517 | t += _(' (new branch)') | |
5515 | elif (parents[0].closesbranch() and |
|
5518 | elif (parents[0].closesbranch() and | |
5516 | pnode in repo.branchheads(branch, closed=True)): |
|
5519 | pnode in repo.branchheads(branch, closed=True)): | |
5517 | t += _(' (head closed)') |
|
5520 | t += _(' (head closed)') | |
5518 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): |
|
5521 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): | |
5519 | t += _(' (clean)') |
|
5522 | t += _(' (clean)') | |
5520 | cleanworkdir = True |
|
5523 | cleanworkdir = True | |
5521 | elif pnode not in bheads: |
|
5524 | elif pnode not in bheads: | |
5522 | t += _(' (new branch head)') |
|
5525 | t += _(' (new branch head)') | |
5523 |
|
5526 | |||
5524 | if cleanworkdir: |
|
5527 | if cleanworkdir: | |
5525 | # i18n: column positioning for "hg summary" |
|
5528 | # i18n: column positioning for "hg summary" | |
5526 | ui.status(_('commit: %s\n') % t.strip()) |
|
5529 | ui.status(_('commit: %s\n') % t.strip()) | |
5527 | else: |
|
5530 | else: | |
5528 | # i18n: column positioning for "hg summary" |
|
5531 | # i18n: column positioning for "hg summary" | |
5529 | ui.write(_('commit: %s\n') % t.strip()) |
|
5532 | ui.write(_('commit: %s\n') % t.strip()) | |
5530 |
|
5533 | |||
5531 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5534 | # all ancestors of branch heads - all ancestors of parent = new csets | |
5532 | new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], |
|
5535 | new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], | |
5533 | bheads)) |
|
5536 | bheads)) | |
5534 |
|
5537 | |||
5535 | if new == 0: |
|
5538 | if new == 0: | |
5536 | # i18n: column positioning for "hg summary" |
|
5539 | # i18n: column positioning for "hg summary" | |
5537 | ui.status(_('update: (current)\n')) |
|
5540 | ui.status(_('update: (current)\n')) | |
5538 | elif pnode not in bheads: |
|
5541 | elif pnode not in bheads: | |
5539 | # i18n: column positioning for "hg summary" |
|
5542 | # i18n: column positioning for "hg summary" | |
5540 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5543 | ui.write(_('update: %d new changesets (update)\n') % new) | |
5541 | else: |
|
5544 | else: | |
5542 | # i18n: column positioning for "hg summary" |
|
5545 | # i18n: column positioning for "hg summary" | |
5543 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5546 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
5544 | (new, len(bheads))) |
|
5547 | (new, len(bheads))) | |
5545 |
|
5548 | |||
5546 | cmdutil.summaryhooks(ui, repo) |
|
5549 | cmdutil.summaryhooks(ui, repo) | |
5547 |
|
5550 | |||
5548 | if opts.get('remote'): |
|
5551 | if opts.get('remote'): | |
5549 | t = [] |
|
5552 | t = [] | |
5550 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5553 | source, branches = hg.parseurl(ui.expandpath('default')) | |
5551 | sbranch = branches[0] |
|
5554 | sbranch = branches[0] | |
5552 | other = hg.peer(repo, {}, source) |
|
5555 | other = hg.peer(repo, {}, source) | |
5553 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5556 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
5554 | if revs: |
|
5557 | if revs: | |
5555 | revs = [other.lookup(rev) for rev in revs] |
|
5558 | revs = [other.lookup(rev) for rev in revs] | |
5556 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5559 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
5557 | repo.ui.pushbuffer() |
|
5560 | repo.ui.pushbuffer() | |
5558 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5561 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
5559 | _common, incoming, _rheads = commoninc |
|
5562 | _common, incoming, _rheads = commoninc | |
5560 | repo.ui.popbuffer() |
|
5563 | repo.ui.popbuffer() | |
5561 | if incoming: |
|
5564 | if incoming: | |
5562 | t.append(_('1 or more incoming')) |
|
5565 | t.append(_('1 or more incoming')) | |
5563 |
|
5566 | |||
5564 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5567 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
5565 | dbranch = branches[0] |
|
5568 | dbranch = branches[0] | |
5566 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5569 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
5567 | if source != dest: |
|
5570 | if source != dest: | |
5568 | other = hg.peer(repo, {}, dest) |
|
5571 | other = hg.peer(repo, {}, dest) | |
5569 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5572 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
5570 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5573 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
5571 | commoninc = None |
|
5574 | commoninc = None | |
5572 | if revs: |
|
5575 | if revs: | |
5573 | revs = [repo.lookup(rev) for rev in revs] |
|
5576 | revs = [repo.lookup(rev) for rev in revs] | |
5574 | repo.ui.pushbuffer() |
|
5577 | repo.ui.pushbuffer() | |
5575 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs, |
|
5578 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs, | |
5576 | commoninc=commoninc) |
|
5579 | commoninc=commoninc) | |
5577 | repo.ui.popbuffer() |
|
5580 | repo.ui.popbuffer() | |
5578 | o = outgoing.missing |
|
5581 | o = outgoing.missing | |
5579 | if o: |
|
5582 | if o: | |
5580 | t.append(_('%d outgoing') % len(o)) |
|
5583 | t.append(_('%d outgoing') % len(o)) | |
5581 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5584 | if 'bookmarks' in other.listkeys('namespaces'): | |
5582 | lmarks = repo.listkeys('bookmarks') |
|
5585 | lmarks = repo.listkeys('bookmarks') | |
5583 | rmarks = other.listkeys('bookmarks') |
|
5586 | rmarks = other.listkeys('bookmarks') | |
5584 | diff = set(rmarks) - set(lmarks) |
|
5587 | diff = set(rmarks) - set(lmarks) | |
5585 | if len(diff) > 0: |
|
5588 | if len(diff) > 0: | |
5586 | t.append(_('%d incoming bookmarks') % len(diff)) |
|
5589 | t.append(_('%d incoming bookmarks') % len(diff)) | |
5587 | diff = set(lmarks) - set(rmarks) |
|
5590 | diff = set(lmarks) - set(rmarks) | |
5588 | if len(diff) > 0: |
|
5591 | if len(diff) > 0: | |
5589 | t.append(_('%d outgoing bookmarks') % len(diff)) |
|
5592 | t.append(_('%d outgoing bookmarks') % len(diff)) | |
5590 |
|
5593 | |||
5591 | if t: |
|
5594 | if t: | |
5592 | # i18n: column positioning for "hg summary" |
|
5595 | # i18n: column positioning for "hg summary" | |
5593 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5596 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5594 | else: |
|
5597 | else: | |
5595 | # i18n: column positioning for "hg summary" |
|
5598 | # i18n: column positioning for "hg summary" | |
5596 | ui.status(_('remote: (synced)\n')) |
|
5599 | ui.status(_('remote: (synced)\n')) | |
5597 |
|
5600 | |||
5598 | @command('tag', |
|
5601 | @command('tag', | |
5599 | [('f', 'force', None, _('force tag')), |
|
5602 | [('f', 'force', None, _('force tag')), | |
5600 | ('l', 'local', None, _('make the tag local')), |
|
5603 | ('l', 'local', None, _('make the tag local')), | |
5601 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5604 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
5602 | ('', 'remove', None, _('remove a tag')), |
|
5605 | ('', 'remove', None, _('remove a tag')), | |
5603 | # -l/--local is already there, commitopts cannot be used |
|
5606 | # -l/--local is already there, commitopts cannot be used | |
5604 | ('e', 'edit', None, _('edit commit message')), |
|
5607 | ('e', 'edit', None, _('edit commit message')), | |
5605 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), |
|
5608 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), | |
5606 | ] + commitopts2, |
|
5609 | ] + commitopts2, | |
5607 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5610 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
5608 | def tag(ui, repo, name1, *names, **opts): |
|
5611 | def tag(ui, repo, name1, *names, **opts): | |
5609 | """add one or more tags for the current or given revision |
|
5612 | """add one or more tags for the current or given revision | |
5610 |
|
5613 | |||
5611 | Name a particular revision using <name>. |
|
5614 | Name a particular revision using <name>. | |
5612 |
|
5615 | |||
5613 | Tags are used to name particular revisions of the repository and are |
|
5616 | Tags are used to name particular revisions of the repository and are | |
5614 | very useful to compare different revisions, to go back to significant |
|
5617 | very useful to compare different revisions, to go back to significant | |
5615 | earlier versions or to mark branch points as releases, etc. Changing |
|
5618 | earlier versions or to mark branch points as releases, etc. Changing | |
5616 | an existing tag is normally disallowed; use -f/--force to override. |
|
5619 | an existing tag is normally disallowed; use -f/--force to override. | |
5617 |
|
5620 | |||
5618 | If no revision is given, the parent of the working directory is |
|
5621 | If no revision is given, the parent of the working directory is | |
5619 | used. |
|
5622 | used. | |
5620 |
|
5623 | |||
5621 | To facilitate version control, distribution, and merging of tags, |
|
5624 | To facilitate version control, distribution, and merging of tags, | |
5622 | they are stored as a file named ".hgtags" which is managed similarly |
|
5625 | they are stored as a file named ".hgtags" which is managed similarly | |
5623 | to other project files and can be hand-edited if necessary. This |
|
5626 | to other project files and can be hand-edited if necessary. This | |
5624 | also means that tagging creates a new commit. The file |
|
5627 | also means that tagging creates a new commit. The file | |
5625 | ".hg/localtags" is used for local tags (not shared among |
|
5628 | ".hg/localtags" is used for local tags (not shared among | |
5626 | repositories). |
|
5629 | repositories). | |
5627 |
|
5630 | |||
5628 | Tag commits are usually made at the head of a branch. If the parent |
|
5631 | Tag commits are usually made at the head of a branch. If the parent | |
5629 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5632 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
5630 | -f/--force to force the tag commit to be based on a non-head |
|
5633 | -f/--force to force the tag commit to be based on a non-head | |
5631 | changeset. |
|
5634 | changeset. | |
5632 |
|
5635 | |||
5633 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5636 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5634 |
|
5637 | |||
5635 | Since tag names have priority over branch names during revision |
|
5638 | Since tag names have priority over branch names during revision | |
5636 | lookup, using an existing branch name as a tag name is discouraged. |
|
5639 | lookup, using an existing branch name as a tag name is discouraged. | |
5637 |
|
5640 | |||
5638 | Returns 0 on success. |
|
5641 | Returns 0 on success. | |
5639 | """ |
|
5642 | """ | |
5640 | wlock = lock = None |
|
5643 | wlock = lock = None | |
5641 | try: |
|
5644 | try: | |
5642 | wlock = repo.wlock() |
|
5645 | wlock = repo.wlock() | |
5643 | lock = repo.lock() |
|
5646 | lock = repo.lock() | |
5644 | rev_ = "." |
|
5647 | rev_ = "." | |
5645 | names = [t.strip() for t in (name1,) + names] |
|
5648 | names = [t.strip() for t in (name1,) + names] | |
5646 | if len(names) != len(set(names)): |
|
5649 | if len(names) != len(set(names)): | |
5647 | raise util.Abort(_('tag names must be unique')) |
|
5650 | raise util.Abort(_('tag names must be unique')) | |
5648 | for n in names: |
|
5651 | for n in names: | |
5649 | scmutil.checknewlabel(repo, n, 'tag') |
|
5652 | scmutil.checknewlabel(repo, n, 'tag') | |
5650 | if not n: |
|
5653 | if not n: | |
5651 | raise util.Abort(_('tag names cannot consist entirely of ' |
|
5654 | raise util.Abort(_('tag names cannot consist entirely of ' | |
5652 | 'whitespace')) |
|
5655 | 'whitespace')) | |
5653 | if opts.get('rev') and opts.get('remove'): |
|
5656 | if opts.get('rev') and opts.get('remove'): | |
5654 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
5657 | raise util.Abort(_("--rev and --remove are incompatible")) | |
5655 | if opts.get('rev'): |
|
5658 | if opts.get('rev'): | |
5656 | rev_ = opts['rev'] |
|
5659 | rev_ = opts['rev'] | |
5657 | message = opts.get('message') |
|
5660 | message = opts.get('message') | |
5658 | if opts.get('remove'): |
|
5661 | if opts.get('remove'): | |
5659 | expectedtype = opts.get('local') and 'local' or 'global' |
|
5662 | expectedtype = opts.get('local') and 'local' or 'global' | |
5660 | for n in names: |
|
5663 | for n in names: | |
5661 | if not repo.tagtype(n): |
|
5664 | if not repo.tagtype(n): | |
5662 | raise util.Abort(_("tag '%s' does not exist") % n) |
|
5665 | raise util.Abort(_("tag '%s' does not exist") % n) | |
5663 | if repo.tagtype(n) != expectedtype: |
|
5666 | if repo.tagtype(n) != expectedtype: | |
5664 | if expectedtype == 'global': |
|
5667 | if expectedtype == 'global': | |
5665 | raise util.Abort(_("tag '%s' is not a global tag") % n) |
|
5668 | raise util.Abort(_("tag '%s' is not a global tag") % n) | |
5666 | else: |
|
5669 | else: | |
5667 | raise util.Abort(_("tag '%s' is not a local tag") % n) |
|
5670 | raise util.Abort(_("tag '%s' is not a local tag") % n) | |
5668 | rev_ = nullid |
|
5671 | rev_ = nullid | |
5669 | if not message: |
|
5672 | if not message: | |
5670 | # we don't translate commit messages |
|
5673 | # we don't translate commit messages | |
5671 | message = 'Removed tag %s' % ', '.join(names) |
|
5674 | message = 'Removed tag %s' % ', '.join(names) | |
5672 | elif not opts.get('force'): |
|
5675 | elif not opts.get('force'): | |
5673 | for n in names: |
|
5676 | for n in names: | |
5674 | if n in repo.tags(): |
|
5677 | if n in repo.tags(): | |
5675 | raise util.Abort(_("tag '%s' already exists " |
|
5678 | raise util.Abort(_("tag '%s' already exists " | |
5676 | "(use -f to force)") % n) |
|
5679 | "(use -f to force)") % n) | |
5677 | if not opts.get('local'): |
|
5680 | if not opts.get('local'): | |
5678 | p1, p2 = repo.dirstate.parents() |
|
5681 | p1, p2 = repo.dirstate.parents() | |
5679 | if p2 != nullid: |
|
5682 | if p2 != nullid: | |
5680 | raise util.Abort(_('uncommitted merge')) |
|
5683 | raise util.Abort(_('uncommitted merge')) | |
5681 | bheads = repo.branchheads() |
|
5684 | bheads = repo.branchheads() | |
5682 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5685 | if not opts.get('force') and bheads and p1 not in bheads: | |
5683 | raise util.Abort(_('not at a branch head (use -f to force)')) |
|
5686 | raise util.Abort(_('not at a branch head (use -f to force)')) | |
5684 | r = scmutil.revsingle(repo, rev_).node() |
|
5687 | r = scmutil.revsingle(repo, rev_).node() | |
5685 |
|
5688 | |||
5686 | if not message: |
|
5689 | if not message: | |
5687 | # we don't translate commit messages |
|
5690 | # we don't translate commit messages | |
5688 | message = ('Added tag %s for changeset %s' % |
|
5691 | message = ('Added tag %s for changeset %s' % | |
5689 | (', '.join(names), short(r))) |
|
5692 | (', '.join(names), short(r))) | |
5690 |
|
5693 | |||
5691 | date = opts.get('date') |
|
5694 | date = opts.get('date') | |
5692 | if date: |
|
5695 | if date: | |
5693 | date = util.parsedate(date) |
|
5696 | date = util.parsedate(date) | |
5694 |
|
5697 | |||
5695 | if opts.get('edit'): |
|
5698 | if opts.get('edit'): | |
5696 | message = ui.edit(message, ui.username()) |
|
5699 | message = ui.edit(message, ui.username()) | |
5697 | repo.savecommitmessage(message) |
|
5700 | repo.savecommitmessage(message) | |
5698 |
|
5701 | |||
5699 | # don't allow tagging the null rev |
|
5702 | # don't allow tagging the null rev | |
5700 | if (not opts.get('remove') and |
|
5703 | if (not opts.get('remove') and | |
5701 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5704 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
5702 | raise util.Abort(_("cannot tag null revision")) |
|
5705 | raise util.Abort(_("cannot tag null revision")) | |
5703 |
|
5706 | |||
5704 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
|
5707 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) | |
5705 | finally: |
|
5708 | finally: | |
5706 | release(lock, wlock) |
|
5709 | release(lock, wlock) | |
5707 |
|
5710 | |||
5708 | @command('tags', [], '') |
|
5711 | @command('tags', [], '') | |
5709 | def tags(ui, repo, **opts): |
|
5712 | def tags(ui, repo, **opts): | |
5710 | """list repository tags |
|
5713 | """list repository tags | |
5711 |
|
5714 | |||
5712 | This lists both regular and local tags. When the -v/--verbose |
|
5715 | This lists both regular and local tags. When the -v/--verbose | |
5713 | switch is used, a third column "local" is printed for local tags. |
|
5716 | switch is used, a third column "local" is printed for local tags. | |
5714 |
|
5717 | |||
5715 | Returns 0 on success. |
|
5718 | Returns 0 on success. | |
5716 | """ |
|
5719 | """ | |
5717 |
|
5720 | |||
5718 | fm = ui.formatter('tags', opts) |
|
5721 | fm = ui.formatter('tags', opts) | |
5719 | hexfunc = ui.debugflag and hex or short |
|
5722 | hexfunc = ui.debugflag and hex or short | |
5720 | tagtype = "" |
|
5723 | tagtype = "" | |
5721 |
|
5724 | |||
5722 | for t, n in reversed(repo.tagslist()): |
|
5725 | for t, n in reversed(repo.tagslist()): | |
5723 | hn = hexfunc(n) |
|
5726 | hn = hexfunc(n) | |
5724 | label = 'tags.normal' |
|
5727 | label = 'tags.normal' | |
5725 | tagtype = '' |
|
5728 | tagtype = '' | |
5726 | if repo.tagtype(t) == 'local': |
|
5729 | if repo.tagtype(t) == 'local': | |
5727 | label = 'tags.local' |
|
5730 | label = 'tags.local' | |
5728 | tagtype = 'local' |
|
5731 | tagtype = 'local' | |
5729 |
|
5732 | |||
5730 | fm.startitem() |
|
5733 | fm.startitem() | |
5731 | fm.write('tag', '%s', t, label=label) |
|
5734 | fm.write('tag', '%s', t, label=label) | |
5732 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5735 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
5733 | fm.condwrite(not ui.quiet, 'rev id', fmt, |
|
5736 | fm.condwrite(not ui.quiet, 'rev id', fmt, | |
5734 | repo.changelog.rev(n), hn, label=label) |
|
5737 | repo.changelog.rev(n), hn, label=label) | |
5735 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5738 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
5736 | tagtype, label=label) |
|
5739 | tagtype, label=label) | |
5737 | fm.plain('\n') |
|
5740 | fm.plain('\n') | |
5738 | fm.end() |
|
5741 | fm.end() | |
5739 |
|
5742 | |||
5740 | @command('tip', |
|
5743 | @command('tip', | |
5741 | [('p', 'patch', None, _('show patch')), |
|
5744 | [('p', 'patch', None, _('show patch')), | |
5742 | ('g', 'git', None, _('use git extended diff format')), |
|
5745 | ('g', 'git', None, _('use git extended diff format')), | |
5743 | ] + templateopts, |
|
5746 | ] + templateopts, | |
5744 | _('[-p] [-g]')) |
|
5747 | _('[-p] [-g]')) | |
5745 | def tip(ui, repo, **opts): |
|
5748 | def tip(ui, repo, **opts): | |
5746 | """show the tip revision (DEPRECATED) |
|
5749 | """show the tip revision (DEPRECATED) | |
5747 |
|
5750 | |||
5748 | The tip revision (usually just called the tip) is the changeset |
|
5751 | The tip revision (usually just called the tip) is the changeset | |
5749 | most recently added to the repository (and therefore the most |
|
5752 | most recently added to the repository (and therefore the most | |
5750 | recently changed head). |
|
5753 | recently changed head). | |
5751 |
|
5754 | |||
5752 | If you have just made a commit, that commit will be the tip. If |
|
5755 | If you have just made a commit, that commit will be the tip. If | |
5753 | you have just pulled changes from another repository, the tip of |
|
5756 | you have just pulled changes from another repository, the tip of | |
5754 | that repository becomes the current tip. The "tip" tag is special |
|
5757 | that repository becomes the current tip. The "tip" tag is special | |
5755 | and cannot be renamed or assigned to a different changeset. |
|
5758 | and cannot be renamed or assigned to a different changeset. | |
5756 |
|
5759 | |||
5757 | This command is deprecated, please use :hg:`heads` instead. |
|
5760 | This command is deprecated, please use :hg:`heads` instead. | |
5758 |
|
5761 | |||
5759 | Returns 0 on success. |
|
5762 | Returns 0 on success. | |
5760 | """ |
|
5763 | """ | |
5761 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5764 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5762 | displayer.show(repo['tip']) |
|
5765 | displayer.show(repo['tip']) | |
5763 | displayer.close() |
|
5766 | displayer.close() | |
5764 |
|
5767 | |||
5765 | @command('unbundle', |
|
5768 | @command('unbundle', | |
5766 | [('u', 'update', None, |
|
5769 | [('u', 'update', None, | |
5767 | _('update to new branch head if changesets were unbundled'))], |
|
5770 | _('update to new branch head if changesets were unbundled'))], | |
5768 | _('[-u] FILE...')) |
|
5771 | _('[-u] FILE...')) | |
5769 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5772 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
5770 | """apply one or more changegroup files |
|
5773 | """apply one or more changegroup files | |
5771 |
|
5774 | |||
5772 | Apply one or more compressed changegroup files generated by the |
|
5775 | Apply one or more compressed changegroup files generated by the | |
5773 | bundle command. |
|
5776 | bundle command. | |
5774 |
|
5777 | |||
5775 | Returns 0 on success, 1 if an update has unresolved files. |
|
5778 | Returns 0 on success, 1 if an update has unresolved files. | |
5776 | """ |
|
5779 | """ | |
5777 | fnames = (fname1,) + fnames |
|
5780 | fnames = (fname1,) + fnames | |
5778 |
|
5781 | |||
5779 | lock = repo.lock() |
|
5782 | lock = repo.lock() | |
5780 | wc = repo['.'] |
|
5783 | wc = repo['.'] | |
5781 | try: |
|
5784 | try: | |
5782 | for fname in fnames: |
|
5785 | for fname in fnames: | |
5783 | f = hg.openpath(ui, fname) |
|
5786 | f = hg.openpath(ui, fname) | |
5784 | gen = changegroup.readbundle(f, fname) |
|
5787 | gen = changegroup.readbundle(f, fname) | |
5785 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
|
5788 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) | |
5786 | finally: |
|
5789 | finally: | |
5787 | lock.release() |
|
5790 | lock.release() | |
5788 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) |
|
5791 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) | |
5789 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
5792 | return postincoming(ui, repo, modheads, opts.get('update'), None) | |
5790 |
|
5793 | |||
5791 | @command('^update|up|checkout|co', |
|
5794 | @command('^update|up|checkout|co', | |
5792 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5795 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
5793 | ('c', 'check', None, |
|
5796 | ('c', 'check', None, | |
5794 | _('update across branches if no uncommitted changes')), |
|
5797 | _('update across branches if no uncommitted changes')), | |
5795 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5798 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5796 | ('r', 'rev', '', _('revision'), _('REV'))], |
|
5799 | ('r', 'rev', '', _('revision'), _('REV'))], | |
5797 | _('[-c] [-C] [-d DATE] [[-r] REV]')) |
|
5800 | _('[-c] [-C] [-d DATE] [[-r] REV]')) | |
5798 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): |
|
5801 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): | |
5799 | """update working directory (or switch revisions) |
|
5802 | """update working directory (or switch revisions) | |
5800 |
|
5803 | |||
5801 | Update the repository's working directory to the specified |
|
5804 | Update the repository's working directory to the specified | |
5802 | changeset. If no changeset is specified, update to the tip of the |
|
5805 | changeset. If no changeset is specified, update to the tip of the | |
5803 | current named branch and move the current bookmark (see :hg:`help |
|
5806 | current named branch and move the current bookmark (see :hg:`help | |
5804 | bookmarks`). |
|
5807 | bookmarks`). | |
5805 |
|
5808 | |||
5806 | Update sets the working directory's parent revision to the specified |
|
5809 | Update sets the working directory's parent revision to the specified | |
5807 | changeset (see :hg:`help parents`). |
|
5810 | changeset (see :hg:`help parents`). | |
5808 |
|
5811 | |||
5809 | If the changeset is not a descendant or ancestor of the working |
|
5812 | If the changeset is not a descendant or ancestor of the working | |
5810 | directory's parent, the update is aborted. With the -c/--check |
|
5813 | directory's parent, the update is aborted. With the -c/--check | |
5811 | option, the working directory is checked for uncommitted changes; if |
|
5814 | option, the working directory is checked for uncommitted changes; if | |
5812 | none are found, the working directory is updated to the specified |
|
5815 | none are found, the working directory is updated to the specified | |
5813 | changeset. |
|
5816 | changeset. | |
5814 |
|
5817 | |||
5815 | .. container:: verbose |
|
5818 | .. container:: verbose | |
5816 |
|
5819 | |||
5817 | The following rules apply when the working directory contains |
|
5820 | The following rules apply when the working directory contains | |
5818 | uncommitted changes: |
|
5821 | uncommitted changes: | |
5819 |
|
5822 | |||
5820 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
5823 | 1. If neither -c/--check nor -C/--clean is specified, and if | |
5821 | the requested changeset is an ancestor or descendant of |
|
5824 | the requested changeset is an ancestor or descendant of | |
5822 | the working directory's parent, the uncommitted changes |
|
5825 | the working directory's parent, the uncommitted changes | |
5823 | are merged into the requested changeset and the merged |
|
5826 | are merged into the requested changeset and the merged | |
5824 | result is left uncommitted. If the requested changeset is |
|
5827 | result is left uncommitted. If the requested changeset is | |
5825 | not an ancestor or descendant (that is, it is on another |
|
5828 | not an ancestor or descendant (that is, it is on another | |
5826 | branch), the update is aborted and the uncommitted changes |
|
5829 | branch), the update is aborted and the uncommitted changes | |
5827 | are preserved. |
|
5830 | are preserved. | |
5828 |
|
5831 | |||
5829 | 2. With the -c/--check option, the update is aborted and the |
|
5832 | 2. With the -c/--check option, the update is aborted and the | |
5830 | uncommitted changes are preserved. |
|
5833 | uncommitted changes are preserved. | |
5831 |
|
5834 | |||
5832 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
5835 | 3. With the -C/--clean option, uncommitted changes are discarded and | |
5833 | the working directory is updated to the requested changeset. |
|
5836 | the working directory is updated to the requested changeset. | |
5834 |
|
5837 | |||
5835 | To cancel an uncommitted merge (and lose your changes), use |
|
5838 | To cancel an uncommitted merge (and lose your changes), use | |
5836 | :hg:`update --clean .`. |
|
5839 | :hg:`update --clean .`. | |
5837 |
|
5840 | |||
5838 | Use null as the changeset to remove the working directory (like |
|
5841 | Use null as the changeset to remove the working directory (like | |
5839 | :hg:`clone -U`). |
|
5842 | :hg:`clone -U`). | |
5840 |
|
5843 | |||
5841 | If you want to revert just one file to an older revision, use |
|
5844 | If you want to revert just one file to an older revision, use | |
5842 | :hg:`revert [-r REV] NAME`. |
|
5845 | :hg:`revert [-r REV] NAME`. | |
5843 |
|
5846 | |||
5844 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5847 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5845 |
|
5848 | |||
5846 | Returns 0 on success, 1 if there are unresolved files. |
|
5849 | Returns 0 on success, 1 if there are unresolved files. | |
5847 | """ |
|
5850 | """ | |
5848 | if rev and node: |
|
5851 | if rev and node: | |
5849 | raise util.Abort(_("please specify just one revision")) |
|
5852 | raise util.Abort(_("please specify just one revision")) | |
5850 |
|
5853 | |||
5851 | if rev is None or rev == '': |
|
5854 | if rev is None or rev == '': | |
5852 | rev = node |
|
5855 | rev = node | |
5853 |
|
5856 | |||
5854 | cmdutil.clearunfinished(repo) |
|
5857 | cmdutil.clearunfinished(repo) | |
5855 |
|
5858 | |||
5856 | # with no argument, we also move the current bookmark, if any |
|
5859 | # with no argument, we also move the current bookmark, if any | |
5857 | rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) |
|
5860 | rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) | |
5858 |
|
5861 | |||
5859 | # if we defined a bookmark, we have to remember the original bookmark name |
|
5862 | # if we defined a bookmark, we have to remember the original bookmark name | |
5860 | brev = rev |
|
5863 | brev = rev | |
5861 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5864 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
5862 |
|
5865 | |||
5863 | if check and clean: |
|
5866 | if check and clean: | |
5864 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
5867 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) | |
5865 |
|
5868 | |||
5866 | if date: |
|
5869 | if date: | |
5867 | if rev is not None: |
|
5870 | if rev is not None: | |
5868 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5871 | raise util.Abort(_("you can't specify a revision and a date")) | |
5869 | rev = cmdutil.finddate(ui, repo, date) |
|
5872 | rev = cmdutil.finddate(ui, repo, date) | |
5870 |
|
5873 | |||
5871 | if check: |
|
5874 | if check: | |
5872 | c = repo[None] |
|
5875 | c = repo[None] | |
5873 | if c.dirty(merge=False, branch=False, missing=True): |
|
5876 | if c.dirty(merge=False, branch=False, missing=True): | |
5874 | raise util.Abort(_("uncommitted changes")) |
|
5877 | raise util.Abort(_("uncommitted changes")) | |
5875 | if rev is None: |
|
5878 | if rev is None: | |
5876 | rev = repo[repo[None].branch()].rev() |
|
5879 | rev = repo[repo[None].branch()].rev() | |
5877 | mergemod._checkunknown(repo, repo[None], repo[rev]) |
|
5880 | mergemod._checkunknown(repo, repo[None], repo[rev]) | |
5878 |
|
5881 | |||
5879 | if clean: |
|
5882 | if clean: | |
5880 | ret = hg.clean(repo, rev) |
|
5883 | ret = hg.clean(repo, rev) | |
5881 | else: |
|
5884 | else: | |
5882 | ret = hg.update(repo, rev) |
|
5885 | ret = hg.update(repo, rev) | |
5883 |
|
5886 | |||
5884 | if not ret and movemarkfrom: |
|
5887 | if not ret and movemarkfrom: | |
5885 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
5888 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
5886 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
5889 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |
5887 | elif brev in repo._bookmarks: |
|
5890 | elif brev in repo._bookmarks: | |
5888 | bookmarks.setcurrent(repo, brev) |
|
5891 | bookmarks.setcurrent(repo, brev) | |
5889 | elif brev: |
|
5892 | elif brev: | |
5890 | bookmarks.unsetcurrent(repo) |
|
5893 | bookmarks.unsetcurrent(repo) | |
5891 |
|
5894 | |||
5892 | return ret |
|
5895 | return ret | |
5893 |
|
5896 | |||
5894 | @command('verify', []) |
|
5897 | @command('verify', []) | |
5895 | def verify(ui, repo): |
|
5898 | def verify(ui, repo): | |
5896 | """verify the integrity of the repository |
|
5899 | """verify the integrity of the repository | |
5897 |
|
5900 | |||
5898 | Verify the integrity of the current repository. |
|
5901 | Verify the integrity of the current repository. | |
5899 |
|
5902 | |||
5900 | This will perform an extensive check of the repository's |
|
5903 | This will perform an extensive check of the repository's | |
5901 | integrity, validating the hashes and checksums of each entry in |
|
5904 | integrity, validating the hashes and checksums of each entry in | |
5902 | the changelog, manifest, and tracked files, as well as the |
|
5905 | the changelog, manifest, and tracked files, as well as the | |
5903 | integrity of their crosslinks and indices. |
|
5906 | integrity of their crosslinks and indices. | |
5904 |
|
5907 | |||
5905 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption |
|
5908 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption | |
5906 | for more information about recovery from corruption of the |
|
5909 | for more information about recovery from corruption of the | |
5907 | repository. |
|
5910 | repository. | |
5908 |
|
5911 | |||
5909 | Returns 0 on success, 1 if errors are encountered. |
|
5912 | Returns 0 on success, 1 if errors are encountered. | |
5910 | """ |
|
5913 | """ | |
5911 | return hg.verify(repo) |
|
5914 | return hg.verify(repo) | |
5912 |
|
5915 | |||
5913 | @command('version', []) |
|
5916 | @command('version', []) | |
5914 | def version_(ui): |
|
5917 | def version_(ui): | |
5915 | """output version and copyright information""" |
|
5918 | """output version and copyright information""" | |
5916 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
5919 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | |
5917 | % util.version()) |
|
5920 | % util.version()) | |
5918 | ui.status(_( |
|
5921 | ui.status(_( | |
5919 | "(see http://mercurial.selenic.com for more information)\n" |
|
5922 | "(see http://mercurial.selenic.com for more information)\n" | |
5920 | "\nCopyright (C) 2005-2014 Matt Mackall and others\n" |
|
5923 | "\nCopyright (C) 2005-2014 Matt Mackall and others\n" | |
5921 | "This is free software; see the source for copying conditions. " |
|
5924 | "This is free software; see the source for copying conditions. " | |
5922 | "There is NO\nwarranty; " |
|
5925 | "There is NO\nwarranty; " | |
5923 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5926 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
5924 | )) |
|
5927 | )) | |
5925 |
|
5928 | |||
5926 | norepo = ("clone init version help debugcommands debugcomplete" |
|
5929 | norepo = ("clone init version help debugcommands debugcomplete" | |
5927 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" |
|
5930 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" | |
5928 | " debugknown debuggetbundle debugbundle") |
|
5931 | " debugknown debuggetbundle debugbundle") | |
5929 | optionalrepo = ("identify paths serve showconfig debugancestor debugdag" |
|
5932 | optionalrepo = ("identify paths serve showconfig debugancestor debugdag" | |
5930 | " debugdata debugindex debugindexdot debugrevlog") |
|
5933 | " debugdata debugindex debugindexdot debugrevlog") | |
5931 | inferrepo = ("add addremove annotate cat commit diff grep forget log parents" |
|
5934 | inferrepo = ("add addremove annotate cat commit diff grep forget log parents" | |
5932 | " remove resolve status debugwalk") |
|
5935 | " remove resolve status debugwalk") |
@@ -1,1296 +1,1311 b'' | |||||
1 | Let commit recurse into subrepos by default to match pre-2.0 behavior: |
|
1 | Let commit recurse into subrepos by default to match pre-2.0 behavior: | |
2 |
|
2 | |||
3 | $ echo "[ui]" >> $HGRCPATH |
|
3 | $ echo "[ui]" >> $HGRCPATH | |
4 | $ echo "commitsubrepos = Yes" >> $HGRCPATH |
|
4 | $ echo "commitsubrepos = Yes" >> $HGRCPATH | |
5 |
|
5 | |||
6 | $ hg init t |
|
6 | $ hg init t | |
7 | $ cd t |
|
7 | $ cd t | |
8 |
|
8 | |||
9 | first revision, no sub |
|
9 | first revision, no sub | |
10 |
|
10 | |||
11 | $ echo a > a |
|
11 | $ echo a > a | |
12 | $ hg ci -Am0 |
|
12 | $ hg ci -Am0 | |
13 | adding a |
|
13 | adding a | |
14 |
|
14 | |||
15 | add first sub |
|
15 | add first sub | |
16 |
|
16 | |||
17 | $ echo s = s > .hgsub |
|
17 | $ echo s = s > .hgsub | |
18 | $ hg add .hgsub |
|
18 | $ hg add .hgsub | |
19 | $ hg init s |
|
19 | $ hg init s | |
20 | $ echo a > s/a |
|
20 | $ echo a > s/a | |
21 |
|
21 | |||
22 | Issue2232: committing a subrepo without .hgsub |
|
22 | Issue2232: committing a subrepo without .hgsub | |
23 |
|
23 | |||
24 | $ hg ci -mbad s |
|
24 | $ hg ci -mbad s | |
25 | abort: can't commit subrepos without .hgsub |
|
25 | abort: can't commit subrepos without .hgsub | |
26 | [255] |
|
26 | [255] | |
27 |
|
27 | |||
28 | $ hg -R s ci -Ams0 |
|
28 | $ hg -R s ci -Ams0 | |
29 | adding a |
|
29 | adding a | |
30 | $ hg sum |
|
30 | $ hg sum | |
31 | parent: 0:f7b1eb17ad24 tip |
|
31 | parent: 0:f7b1eb17ad24 tip | |
32 | 0 |
|
32 | 0 | |
33 | branch: default |
|
33 | branch: default | |
34 | commit: 1 added, 1 subrepos |
|
34 | commit: 1 added, 1 subrepos | |
35 | update: (current) |
|
35 | update: (current) | |
36 | $ hg ci -m1 |
|
36 | $ hg ci -m1 | |
37 |
|
37 | |||
38 | Revert subrepo and test subrepo fileset keyword: |
|
38 | Revert subrepo and test subrepo fileset keyword: | |
39 |
|
39 | |||
40 | $ echo b > s/a |
|
40 | $ echo b > s/a | |
41 | $ hg revert "set:subrepo('glob:s*')" |
|
41 | $ hg revert "set:subrepo('glob:s*')" | |
42 | reverting subrepo s |
|
42 | reverting subrepo s | |
43 | reverting s/a (glob) |
|
43 | reverting s/a (glob) | |
44 | $ rm s/a.orig |
|
44 | $ rm s/a.orig | |
45 |
|
45 | |||
46 | Revert subrepo with no backup. The "reverting s/a" line is gone since |
|
46 | Revert subrepo with no backup. The "reverting s/a" line is gone since | |
47 | we're really running 'hg update' in the subrepo: |
|
47 | we're really running 'hg update' in the subrepo: | |
48 |
|
48 | |||
49 | $ echo b > s/a |
|
49 | $ echo b > s/a | |
50 | $ hg revert --no-backup s |
|
50 | $ hg revert --no-backup s | |
51 | reverting subrepo s |
|
51 | reverting subrepo s | |
52 |
|
52 | |||
53 | Issue2022: update -C |
|
53 | Issue2022: update -C | |
54 |
|
54 | |||
55 | $ echo b > s/a |
|
55 | $ echo b > s/a | |
56 | $ hg sum |
|
56 | $ hg sum | |
57 | parent: 1:7cf8cfea66e4 tip |
|
57 | parent: 1:7cf8cfea66e4 tip | |
58 | 1 |
|
58 | 1 | |
59 | branch: default |
|
59 | branch: default | |
60 | commit: 1 subrepos |
|
60 | commit: 1 subrepos | |
61 | update: (current) |
|
61 | update: (current) | |
62 | $ hg co -C 1 |
|
62 | $ hg co -C 1 | |
63 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
63 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
64 | $ hg sum |
|
64 | $ hg sum | |
65 | parent: 1:7cf8cfea66e4 tip |
|
65 | parent: 1:7cf8cfea66e4 tip | |
66 | 1 |
|
66 | 1 | |
67 | branch: default |
|
67 | branch: default | |
68 | commit: (clean) |
|
68 | commit: (clean) | |
69 | update: (current) |
|
69 | update: (current) | |
70 |
|
70 | |||
71 | commands that require a clean repo should respect subrepos |
|
71 | commands that require a clean repo should respect subrepos | |
72 |
|
72 | |||
73 | $ echo b >> s/a |
|
73 | $ echo b >> s/a | |
74 | $ hg backout tip |
|
74 | $ hg backout tip | |
75 | abort: uncommitted changes in subrepo s |
|
75 | abort: uncommitted changes in subrepo s | |
76 | [255] |
|
76 | [255] | |
77 | $ hg revert -C -R s s/a |
|
77 | $ hg revert -C -R s s/a | |
78 |
|
78 | |||
79 | add sub sub |
|
79 | add sub sub | |
80 |
|
80 | |||
81 | $ echo ss = ss > s/.hgsub |
|
81 | $ echo ss = ss > s/.hgsub | |
82 | $ hg init s/ss |
|
82 | $ hg init s/ss | |
83 | $ echo a > s/ss/a |
|
83 | $ echo a > s/ss/a | |
84 | $ hg -R s add s/.hgsub |
|
84 | $ hg -R s add s/.hgsub | |
85 | $ hg -R s/ss add s/ss/a |
|
85 | $ hg -R s/ss add s/ss/a | |
86 | $ hg sum |
|
86 | $ hg sum | |
87 | parent: 1:7cf8cfea66e4 tip |
|
87 | parent: 1:7cf8cfea66e4 tip | |
88 | 1 |
|
88 | 1 | |
89 | branch: default |
|
89 | branch: default | |
90 | commit: 1 subrepos |
|
90 | commit: 1 subrepos | |
91 | update: (current) |
|
91 | update: (current) | |
92 | $ hg ci -m2 |
|
92 | $ hg ci -m2 | |
93 | committing subrepository s |
|
93 | committing subrepository s | |
94 | committing subrepository s/ss (glob) |
|
94 | committing subrepository s/ss (glob) | |
95 | $ hg sum |
|
95 | $ hg sum | |
96 | parent: 2:df30734270ae tip |
|
96 | parent: 2:df30734270ae tip | |
97 | 2 |
|
97 | 2 | |
98 | branch: default |
|
98 | branch: default | |
99 | commit: (clean) |
|
99 | commit: (clean) | |
100 | update: (current) |
|
100 | update: (current) | |
101 |
|
101 | |||
102 | bump sub rev (and check it is ignored by ui.commitsubrepos) |
|
102 | bump sub rev (and check it is ignored by ui.commitsubrepos) | |
103 |
|
103 | |||
104 | $ echo b > s/a |
|
104 | $ echo b > s/a | |
105 | $ hg -R s ci -ms1 |
|
105 | $ hg -R s ci -ms1 | |
106 | $ hg --config ui.commitsubrepos=no ci -m3 |
|
106 | $ hg --config ui.commitsubrepos=no ci -m3 | |
107 |
|
107 | |||
108 | leave sub dirty (and check ui.commitsubrepos=no aborts the commit) |
|
108 | leave sub dirty (and check ui.commitsubrepos=no aborts the commit) | |
109 |
|
109 | |||
110 | $ echo c > s/a |
|
110 | $ echo c > s/a | |
111 | $ hg --config ui.commitsubrepos=no ci -m4 |
|
111 | $ hg --config ui.commitsubrepos=no ci -m4 | |
112 | abort: uncommitted changes in subrepo s |
|
112 | abort: uncommitted changes in subrepo s | |
113 | (use --subrepos for recursive commit) |
|
113 | (use --subrepos for recursive commit) | |
114 | [255] |
|
114 | [255] | |
115 | $ hg id |
|
115 | $ hg id | |
116 | f6affe3fbfaa+ tip |
|
116 | f6affe3fbfaa+ tip | |
117 | $ hg -R s ci -mc |
|
117 | $ hg -R s ci -mc | |
118 | $ hg id |
|
118 | $ hg id | |
119 | f6affe3fbfaa+ tip |
|
119 | f6affe3fbfaa+ tip | |
120 | $ echo d > s/a |
|
120 | $ echo d > s/a | |
121 | $ hg ci -m4 |
|
121 | $ hg ci -m4 | |
122 | committing subrepository s |
|
122 | committing subrepository s | |
123 | $ hg tip -R s |
|
123 | $ hg tip -R s | |
124 | changeset: 4:02dcf1d70411 |
|
124 | changeset: 4:02dcf1d70411 | |
125 | tag: tip |
|
125 | tag: tip | |
126 | user: test |
|
126 | user: test | |
127 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
127 | date: Thu Jan 01 00:00:00 1970 +0000 | |
128 | summary: 4 |
|
128 | summary: 4 | |
129 |
|
129 | |||
130 |
|
130 | |||
131 | check caching |
|
131 | check caching | |
132 |
|
132 | |||
133 | $ hg co 0 |
|
133 | $ hg co 0 | |
134 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
134 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
135 | $ hg debugsub |
|
135 | $ hg debugsub | |
136 |
|
136 | |||
137 | restore |
|
137 | restore | |
138 |
|
138 | |||
139 | $ hg co |
|
139 | $ hg co | |
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
141 | $ hg debugsub |
|
141 | $ hg debugsub | |
142 | path s |
|
142 | path s | |
143 | source s |
|
143 | source s | |
144 | revision 02dcf1d704118aee3ee306ccfa1910850d5b05ef |
|
144 | revision 02dcf1d704118aee3ee306ccfa1910850d5b05ef | |
145 |
|
145 | |||
146 | new branch for merge tests |
|
146 | new branch for merge tests | |
147 |
|
147 | |||
148 | $ hg co 1 |
|
148 | $ hg co 1 | |
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 | $ echo t = t >> .hgsub |
|
150 | $ echo t = t >> .hgsub | |
151 | $ hg init t |
|
151 | $ hg init t | |
152 | $ echo t > t/t |
|
152 | $ echo t > t/t | |
153 | $ hg -R t add t |
|
153 | $ hg -R t add t | |
154 | adding t/t (glob) |
|
154 | adding t/t (glob) | |
155 |
|
155 | |||
156 | 5 |
|
156 | 5 | |
157 |
|
157 | |||
158 | $ hg ci -m5 # add sub |
|
158 | $ hg ci -m5 # add sub | |
159 | committing subrepository t |
|
159 | committing subrepository t | |
160 | created new head |
|
160 | created new head | |
161 | $ echo t2 > t/t |
|
161 | $ echo t2 > t/t | |
162 |
|
162 | |||
163 | 6 |
|
163 | 6 | |
164 |
|
164 | |||
165 | $ hg st -R s |
|
165 | $ hg st -R s | |
166 | $ hg ci -m6 # change sub |
|
166 | $ hg ci -m6 # change sub | |
167 | committing subrepository t |
|
167 | committing subrepository t | |
168 | $ hg debugsub |
|
168 | $ hg debugsub | |
169 | path s |
|
169 | path s | |
170 | source s |
|
170 | source s | |
171 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
|
171 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
172 | path t |
|
172 | path t | |
173 | source t |
|
173 | source t | |
174 | revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
|
174 | revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
175 | $ echo t3 > t/t |
|
175 | $ echo t3 > t/t | |
176 |
|
176 | |||
177 | 7 |
|
177 | 7 | |
178 |
|
178 | |||
179 | $ hg ci -m7 # change sub again for conflict test |
|
179 | $ hg ci -m7 # change sub again for conflict test | |
180 | committing subrepository t |
|
180 | committing subrepository t | |
181 | $ hg rm .hgsub |
|
181 | $ hg rm .hgsub | |
182 |
|
182 | |||
183 | 8 |
|
183 | 8 | |
184 |
|
184 | |||
185 | $ hg ci -m8 # remove sub |
|
185 | $ hg ci -m8 # remove sub | |
186 |
|
186 | |||
187 | merge tests |
|
187 | merge tests | |
188 |
|
188 | |||
189 | $ hg co -C 3 |
|
189 | $ hg co -C 3 | |
190 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
190 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
191 | $ hg merge 5 # test adding |
|
191 | $ hg merge 5 # test adding | |
192 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
192 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
193 | (branch merge, don't forget to commit) |
|
193 | (branch merge, don't forget to commit) | |
194 | $ hg debugsub |
|
194 | $ hg debugsub | |
195 | path s |
|
195 | path s | |
196 | source s |
|
196 | source s | |
197 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
197 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
198 | path t |
|
198 | path t | |
199 | source t |
|
199 | source t | |
200 | revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 |
|
200 | revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 | |
201 | $ hg ci -m9 |
|
201 | $ hg ci -m9 | |
202 | created new head |
|
202 | created new head | |
203 | $ hg merge 6 --debug # test change |
|
203 | $ hg merge 6 --debug # test change | |
204 | searching for copies back to rev 2 |
|
204 | searching for copies back to rev 2 | |
205 | resolving manifests |
|
205 | resolving manifests | |
206 | branchmerge: True, force: False, partial: False |
|
206 | branchmerge: True, force: False, partial: False | |
207 | ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
|
207 | ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 | |
208 | .hgsubstate: versions differ -> m |
|
208 | .hgsubstate: versions differ -> m | |
209 | updating: .hgsubstate 1/1 files (100.00%) |
|
209 | updating: .hgsubstate 1/1 files (100.00%) | |
210 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
210 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec | |
211 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
211 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg | |
212 | getting subrepo t |
|
212 | getting subrepo t | |
213 | resolving manifests |
|
213 | resolving manifests | |
214 | branchmerge: False, force: False, partial: False |
|
214 | branchmerge: False, force: False, partial: False | |
215 | ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
|
215 | ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a | |
216 | t: remote is newer -> g |
|
216 | t: remote is newer -> g | |
217 | getting t |
|
217 | getting t | |
218 | updating: t 1/1 files (100.00%) |
|
218 | updating: t 1/1 files (100.00%) | |
219 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
219 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
220 | (branch merge, don't forget to commit) |
|
220 | (branch merge, don't forget to commit) | |
221 | $ hg debugsub |
|
221 | $ hg debugsub | |
222 | path s |
|
222 | path s | |
223 | source s |
|
223 | source s | |
224 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
224 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
225 | path t |
|
225 | path t | |
226 | source t |
|
226 | source t | |
227 | revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
|
227 | revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
228 | $ echo conflict > t/t |
|
228 | $ echo conflict > t/t | |
229 | $ hg ci -m10 |
|
229 | $ hg ci -m10 | |
230 | committing subrepository t |
|
230 | committing subrepository t | |
231 | $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
|
231 | $ HGMERGE=internal:merge hg merge --debug 7 # test conflict | |
232 | searching for copies back to rev 2 |
|
232 | searching for copies back to rev 2 | |
233 | resolving manifests |
|
233 | resolving manifests | |
234 | branchmerge: True, force: False, partial: False |
|
234 | branchmerge: True, force: False, partial: False | |
235 | ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
|
235 | ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf | |
236 | .hgsubstate: versions differ -> m |
|
236 | .hgsubstate: versions differ -> m | |
237 | updating: .hgsubstate 1/1 files (100.00%) |
|
237 | updating: .hgsubstate 1/1 files (100.00%) | |
238 | subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
238 | subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 | |
239 | subrepo t: both sides changed |
|
239 | subrepo t: both sides changed | |
240 | subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
|
240 | subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) | |
241 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
241 | (M)erge, keep (l)ocal or keep (r)emote? m | |
242 | merging subrepo t |
|
242 | merging subrepo t | |
243 | searching for copies back to rev 2 |
|
243 | searching for copies back to rev 2 | |
244 | resolving manifests |
|
244 | resolving manifests | |
245 | branchmerge: True, force: False, partial: False |
|
245 | branchmerge: True, force: False, partial: False | |
246 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
246 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 | |
247 | t: versions differ -> m |
|
247 | t: versions differ -> m | |
248 | preserving t for resolve of t |
|
248 | preserving t for resolve of t | |
249 | updating: t 1/1 files (100.00%) |
|
249 | updating: t 1/1 files (100.00%) | |
250 | picked tool 'internal:merge' for t (binary False symlink False) |
|
250 | picked tool 'internal:merge' for t (binary False symlink False) | |
251 | merging t |
|
251 | merging t | |
252 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
|
252 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | |
253 | warning: conflicts during merge. |
|
253 | warning: conflicts during merge. | |
254 | merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
254 | merging t incomplete! (edit conflicts, then use 'hg resolve --mark') | |
255 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
255 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
256 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
256 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
257 | subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
|
257 | subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg | |
258 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
258 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
259 | (branch merge, don't forget to commit) |
|
259 | (branch merge, don't forget to commit) | |
260 |
|
260 | |||
261 | should conflict |
|
261 | should conflict | |
262 |
|
262 | |||
263 | $ cat t/t |
|
263 | $ cat t/t | |
264 | <<<<<<< local |
|
264 | <<<<<<< local | |
265 | conflict |
|
265 | conflict | |
266 | ======= |
|
266 | ======= | |
267 | t3 |
|
267 | t3 | |
268 | >>>>>>> other |
|
268 | >>>>>>> other | |
269 |
|
269 | |||
270 | clone |
|
270 | clone | |
271 |
|
271 | |||
272 | $ cd .. |
|
272 | $ cd .. | |
273 | $ hg clone t tc |
|
273 | $ hg clone t tc | |
274 | updating to branch default |
|
274 | updating to branch default | |
275 | cloning subrepo s from $TESTTMP/t/s |
|
275 | cloning subrepo s from $TESTTMP/t/s | |
276 | cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) |
|
276 | cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) | |
277 | cloning subrepo t from $TESTTMP/t/t |
|
277 | cloning subrepo t from $TESTTMP/t/t | |
278 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
278 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
279 | $ cd tc |
|
279 | $ cd tc | |
280 | $ hg debugsub |
|
280 | $ hg debugsub | |
281 | path s |
|
281 | path s | |
282 | source s |
|
282 | source s | |
283 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
283 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
284 | path t |
|
284 | path t | |
285 | source t |
|
285 | source t | |
286 | revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e |
|
286 | revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e | |
287 |
|
287 | |||
288 | push |
|
288 | push | |
289 |
|
289 | |||
290 | $ echo bah > t/t |
|
290 | $ echo bah > t/t | |
291 | $ hg ci -m11 |
|
291 | $ hg ci -m11 | |
292 | committing subrepository t |
|
292 | committing subrepository t | |
293 | $ hg push |
|
293 | $ hg push | |
294 | pushing to $TESTTMP/t (glob) |
|
294 | pushing to $TESTTMP/t (glob) | |
295 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
|
295 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
296 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
296 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
297 | pushing subrepo t to $TESTTMP/t/t |
|
297 | pushing subrepo t to $TESTTMP/t/t | |
298 | searching for changes |
|
298 | searching for changes | |
299 | adding changesets |
|
299 | adding changesets | |
300 | adding manifests |
|
300 | adding manifests | |
301 | adding file changes |
|
301 | adding file changes | |
302 | added 1 changesets with 1 changes to 1 files |
|
302 | added 1 changesets with 1 changes to 1 files | |
303 | searching for changes |
|
303 | searching for changes | |
304 | adding changesets |
|
304 | adding changesets | |
305 | adding manifests |
|
305 | adding manifests | |
306 | adding file changes |
|
306 | adding file changes | |
307 | added 1 changesets with 1 changes to 1 files |
|
307 | added 1 changesets with 1 changes to 1 files | |
308 |
|
308 | |||
309 | push -f |
|
309 | push -f | |
310 |
|
310 | |||
311 | $ echo bah > s/a |
|
311 | $ echo bah > s/a | |
312 | $ hg ci -m12 |
|
312 | $ hg ci -m12 | |
313 | committing subrepository s |
|
313 | committing subrepository s | |
314 | $ hg push |
|
314 | $ hg push | |
315 | pushing to $TESTTMP/t (glob) |
|
315 | pushing to $TESTTMP/t (glob) | |
316 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
|
316 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
317 | pushing subrepo s to $TESTTMP/t/s |
|
317 | pushing subrepo s to $TESTTMP/t/s | |
318 | searching for changes |
|
318 | searching for changes | |
319 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
|
319 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) | |
320 | (merge or see "hg help push" for details about pushing new heads) |
|
320 | (merge or see "hg help push" for details about pushing new heads) | |
321 | [255] |
|
321 | [255] | |
322 | $ hg push -f |
|
322 | $ hg push -f | |
323 | pushing to $TESTTMP/t (glob) |
|
323 | pushing to $TESTTMP/t (glob) | |
324 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
|
324 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
325 | searching for changes |
|
325 | searching for changes | |
326 | no changes found |
|
326 | no changes found | |
327 | pushing subrepo s to $TESTTMP/t/s |
|
327 | pushing subrepo s to $TESTTMP/t/s | |
328 | searching for changes |
|
328 | searching for changes | |
329 | adding changesets |
|
329 | adding changesets | |
330 | adding manifests |
|
330 | adding manifests | |
331 | adding file changes |
|
331 | adding file changes | |
332 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
332 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
333 | pushing subrepo t to $TESTTMP/t/t |
|
333 | pushing subrepo t to $TESTTMP/t/t | |
334 | searching for changes |
|
334 | searching for changes | |
335 | no changes found |
|
335 | no changes found | |
336 | searching for changes |
|
336 | searching for changes | |
337 | adding changesets |
|
337 | adding changesets | |
338 | adding manifests |
|
338 | adding manifests | |
339 | adding file changes |
|
339 | adding file changes | |
340 | added 1 changesets with 1 changes to 1 files |
|
340 | added 1 changesets with 1 changes to 1 files | |
341 |
|
341 | |||
342 | check that unmodified subrepos are not pushed |
|
342 | check that unmodified subrepos are not pushed | |
343 |
|
343 | |||
344 | $ hg clone . ../tcc |
|
344 | $ hg clone . ../tcc | |
345 | updating to branch default |
|
345 | updating to branch default | |
346 | cloning subrepo s from $TESTTMP/tc/s |
|
346 | cloning subrepo s from $TESTTMP/tc/s | |
347 | cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob) |
|
347 | cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob) | |
348 | cloning subrepo t from $TESTTMP/tc/t |
|
348 | cloning subrepo t from $TESTTMP/tc/t | |
349 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
349 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
350 |
|
350 | |||
351 | the subrepos on the new clone have nothing to push to its source |
|
351 | the subrepos on the new clone have nothing to push to its source | |
352 |
|
352 | |||
353 | $ hg push -R ../tcc . |
|
353 | $ hg push -R ../tcc . | |
354 | pushing to . |
|
354 | pushing to . | |
355 | no changes made to subrepo s/ss since last push to s/ss (glob) |
|
355 | no changes made to subrepo s/ss since last push to s/ss (glob) | |
356 | no changes made to subrepo s since last push to s |
|
356 | no changes made to subrepo s since last push to s | |
357 | no changes made to subrepo t since last push to t |
|
357 | no changes made to subrepo t since last push to t | |
358 | searching for changes |
|
358 | searching for changes | |
359 | no changes found |
|
359 | no changes found | |
360 | [1] |
|
360 | [1] | |
361 |
|
361 | |||
362 | the subrepos on the source do not have a clean store versus the clone target |
|
362 | the subrepos on the source do not have a clean store versus the clone target | |
363 | because they were never explicitly pushed to the source |
|
363 | because they were never explicitly pushed to the source | |
364 |
|
364 | |||
365 | $ hg push ../tcc |
|
365 | $ hg push ../tcc | |
366 | pushing to ../tcc |
|
366 | pushing to ../tcc | |
367 | pushing subrepo s/ss to ../tcc/s/ss (glob) |
|
367 | pushing subrepo s/ss to ../tcc/s/ss (glob) | |
368 | searching for changes |
|
368 | searching for changes | |
369 | no changes found |
|
369 | no changes found | |
370 | pushing subrepo s to ../tcc/s |
|
370 | pushing subrepo s to ../tcc/s | |
371 | searching for changes |
|
371 | searching for changes | |
372 | no changes found |
|
372 | no changes found | |
373 | pushing subrepo t to ../tcc/t |
|
373 | pushing subrepo t to ../tcc/t | |
374 | searching for changes |
|
374 | searching for changes | |
375 | no changes found |
|
375 | no changes found | |
376 | searching for changes |
|
376 | searching for changes | |
377 | no changes found |
|
377 | no changes found | |
378 | [1] |
|
378 | [1] | |
379 |
|
379 | |||
380 | after push their stores become clean |
|
380 | after push their stores become clean | |
381 |
|
381 | |||
382 | $ hg push ../tcc |
|
382 | $ hg push ../tcc | |
383 | pushing to ../tcc |
|
383 | pushing to ../tcc | |
384 | no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob) |
|
384 | no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob) | |
385 | no changes made to subrepo s since last push to ../tcc/s |
|
385 | no changes made to subrepo s since last push to ../tcc/s | |
386 | no changes made to subrepo t since last push to ../tcc/t |
|
386 | no changes made to subrepo t since last push to ../tcc/t | |
387 | searching for changes |
|
387 | searching for changes | |
388 | no changes found |
|
388 | no changes found | |
389 | [1] |
|
389 | [1] | |
390 |
|
390 | |||
391 | updating a subrepo to a different revision or changing |
|
391 | updating a subrepo to a different revision or changing | |
392 | its working directory does not make its store dirty |
|
392 | its working directory does not make its store dirty | |
393 |
|
393 | |||
394 | $ hg -R s update '.^' |
|
394 | $ hg -R s update '.^' | |
395 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
395 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
396 | $ hg push |
|
396 | $ hg push | |
397 | pushing to $TESTTMP/t (glob) |
|
397 | pushing to $TESTTMP/t (glob) | |
398 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
|
398 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
399 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
399 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
400 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
400 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
401 | searching for changes |
|
401 | searching for changes | |
402 | no changes found |
|
402 | no changes found | |
403 | [1] |
|
403 | [1] | |
404 | $ echo foo >> s/a |
|
404 | $ echo foo >> s/a | |
405 | $ hg push |
|
405 | $ hg push | |
406 | pushing to $TESTTMP/t (glob) |
|
406 | pushing to $TESTTMP/t (glob) | |
407 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
|
407 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
408 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
408 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
409 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
409 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
410 | searching for changes |
|
410 | searching for changes | |
411 | no changes found |
|
411 | no changes found | |
412 | [1] |
|
412 | [1] | |
413 | $ hg -R s update -C tip |
|
413 | $ hg -R s update -C tip | |
414 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
414 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
415 |
|
415 | |||
416 | committing into a subrepo makes its store (but not its parent's store) dirty |
|
416 | committing into a subrepo makes its store (but not its parent's store) dirty | |
417 |
|
417 | |||
418 | $ echo foo >> s/ss/a |
|
418 | $ echo foo >> s/ss/a | |
419 | $ hg -R s/ss commit -m 'test dirty store detection' |
|
419 | $ hg -R s/ss commit -m 'test dirty store detection' | |
420 | $ hg push |
|
420 | $ hg push | |
421 | pushing to $TESTTMP/t (glob) |
|
421 | pushing to $TESTTMP/t (glob) | |
422 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
|
422 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
423 | searching for changes |
|
423 | searching for changes | |
424 | adding changesets |
|
424 | adding changesets | |
425 | adding manifests |
|
425 | adding manifests | |
426 | adding file changes |
|
426 | adding file changes | |
427 | added 1 changesets with 1 changes to 1 files |
|
427 | added 1 changesets with 1 changes to 1 files | |
428 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
428 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
429 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
429 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
430 | searching for changes |
|
430 | searching for changes | |
431 | no changes found |
|
431 | no changes found | |
432 | [1] |
|
432 | [1] | |
433 |
|
433 | |||
434 | a subrepo store may be clean versus one repo but not versus another |
|
434 | a subrepo store may be clean versus one repo but not versus another | |
435 |
|
435 | |||
436 | $ hg push |
|
436 | $ hg push | |
437 | pushing to $TESTTMP/t (glob) |
|
437 | pushing to $TESTTMP/t (glob) | |
438 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
|
438 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
439 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
439 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
440 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
440 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
441 | searching for changes |
|
441 | searching for changes | |
442 | no changes found |
|
442 | no changes found | |
443 | [1] |
|
443 | [1] | |
444 | $ hg push ../tcc |
|
444 | $ hg push ../tcc | |
445 | pushing to ../tcc |
|
445 | pushing to ../tcc | |
446 | pushing subrepo s/ss to ../tcc/s/ss (glob) |
|
446 | pushing subrepo s/ss to ../tcc/s/ss (glob) | |
447 | searching for changes |
|
447 | searching for changes | |
448 | adding changesets |
|
448 | adding changesets | |
449 | adding manifests |
|
449 | adding manifests | |
450 | adding file changes |
|
450 | adding file changes | |
451 | added 1 changesets with 1 changes to 1 files |
|
451 | added 1 changesets with 1 changes to 1 files | |
452 | no changes made to subrepo s since last push to ../tcc/s |
|
452 | no changes made to subrepo s since last push to ../tcc/s | |
453 | no changes made to subrepo t since last push to ../tcc/t |
|
453 | no changes made to subrepo t since last push to ../tcc/t | |
454 | searching for changes |
|
454 | searching for changes | |
455 | no changes found |
|
455 | no changes found | |
456 | [1] |
|
456 | [1] | |
457 |
|
457 | |||
458 | update |
|
458 | update | |
459 |
|
459 | |||
460 | $ cd ../t |
|
460 | $ cd ../t | |
461 | $ hg up -C # discard our earlier merge |
|
461 | $ hg up -C # discard our earlier merge | |
462 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
462 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
463 | $ echo blah > t/t |
|
463 | $ echo blah > t/t | |
464 | $ hg ci -m13 |
|
464 | $ hg ci -m13 | |
465 | committing subrepository t |
|
465 | committing subrepository t | |
466 |
|
466 | |||
467 | backout calls revert internally with minimal opts, which should not raise |
|
467 | backout calls revert internally with minimal opts, which should not raise | |
468 | KeyError |
|
468 | KeyError | |
469 |
|
469 | |||
470 | $ hg backout ".^" |
|
470 | $ hg backout ".^" | |
471 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
471 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
472 | changeset c373c8102e68 backed out, don't forget to commit. |
|
472 | changeset c373c8102e68 backed out, don't forget to commit. | |
473 |
|
473 | |||
474 | $ hg up -C # discard changes |
|
474 | $ hg up -C # discard changes | |
475 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
475 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
476 |
|
476 | |||
477 | pull |
|
477 | pull | |
478 |
|
478 | |||
479 | $ cd ../tc |
|
479 | $ cd ../tc | |
480 | $ hg pull |
|
480 | $ hg pull | |
481 | pulling from $TESTTMP/t (glob) |
|
481 | pulling from $TESTTMP/t (glob) | |
482 | searching for changes |
|
482 | searching for changes | |
483 | adding changesets |
|
483 | adding changesets | |
484 | adding manifests |
|
484 | adding manifests | |
485 | adding file changes |
|
485 | adding file changes | |
486 | added 1 changesets with 1 changes to 1 files |
|
486 | added 1 changesets with 1 changes to 1 files | |
487 | (run 'hg update' to get a working copy) |
|
487 | (run 'hg update' to get a working copy) | |
488 |
|
488 | |||
489 | should pull t |
|
489 | should pull t | |
490 |
|
490 | |||
491 | $ hg up |
|
491 | $ hg up | |
492 | pulling subrepo t from $TESTTMP/t/t |
|
492 | pulling subrepo t from $TESTTMP/t/t | |
493 | searching for changes |
|
493 | searching for changes | |
494 | adding changesets |
|
494 | adding changesets | |
495 | adding manifests |
|
495 | adding manifests | |
496 | adding file changes |
|
496 | adding file changes | |
497 | added 1 changesets with 1 changes to 1 files |
|
497 | added 1 changesets with 1 changes to 1 files | |
498 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
498 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
499 | $ cat t/t |
|
499 | $ cat t/t | |
500 | blah |
|
500 | blah | |
501 |
|
501 | |||
502 | bogus subrepo path aborts |
|
502 | bogus subrepo path aborts | |
503 |
|
503 | |||
504 | $ echo 'bogus=[boguspath' >> .hgsub |
|
504 | $ echo 'bogus=[boguspath' >> .hgsub | |
505 | $ hg ci -m 'bogus subrepo path' |
|
505 | $ hg ci -m 'bogus subrepo path' | |
506 | abort: missing ] in subrepo source |
|
506 | abort: missing ] in subrepo source | |
507 | [255] |
|
507 | [255] | |
508 |
|
508 | |||
509 | Issue1986: merge aborts when trying to merge a subrepo that |
|
509 | Issue1986: merge aborts when trying to merge a subrepo that | |
510 | shouldn't need merging |
|
510 | shouldn't need merging | |
511 |
|
511 | |||
512 | # subrepo layout |
|
512 | # subrepo layout | |
513 | # |
|
513 | # | |
514 | # o 5 br |
|
514 | # o 5 br | |
515 | # /| |
|
515 | # /| | |
516 | # o | 4 default |
|
516 | # o | 4 default | |
517 | # | | |
|
517 | # | | | |
518 | # | o 3 br |
|
518 | # | o 3 br | |
519 | # |/| |
|
519 | # |/| | |
520 | # o | 2 default |
|
520 | # o | 2 default | |
521 | # | | |
|
521 | # | | | |
522 | # | o 1 br |
|
522 | # | o 1 br | |
523 | # |/ |
|
523 | # |/ | |
524 | # o 0 default |
|
524 | # o 0 default | |
525 |
|
525 | |||
526 | $ cd .. |
|
526 | $ cd .. | |
527 | $ rm -rf sub |
|
527 | $ rm -rf sub | |
528 | $ hg init main |
|
528 | $ hg init main | |
529 | $ cd main |
|
529 | $ cd main | |
530 | $ hg init s |
|
530 | $ hg init s | |
531 | $ cd s |
|
531 | $ cd s | |
532 | $ echo a > a |
|
532 | $ echo a > a | |
533 | $ hg ci -Am1 |
|
533 | $ hg ci -Am1 | |
534 | adding a |
|
534 | adding a | |
535 | $ hg branch br |
|
535 | $ hg branch br | |
536 | marked working directory as branch br |
|
536 | marked working directory as branch br | |
537 | (branches are permanent and global, did you want a bookmark?) |
|
537 | (branches are permanent and global, did you want a bookmark?) | |
538 | $ echo a >> a |
|
538 | $ echo a >> a | |
539 | $ hg ci -m1 |
|
539 | $ hg ci -m1 | |
540 | $ hg up default |
|
540 | $ hg up default | |
541 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
541 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
542 | $ echo b > b |
|
542 | $ echo b > b | |
543 | $ hg ci -Am1 |
|
543 | $ hg ci -Am1 | |
544 | adding b |
|
544 | adding b | |
545 | $ hg up br |
|
545 | $ hg up br | |
546 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
546 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
547 | $ hg merge tip |
|
547 | $ hg merge tip | |
548 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
548 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
549 | (branch merge, don't forget to commit) |
|
549 | (branch merge, don't forget to commit) | |
550 | $ hg ci -m1 |
|
550 | $ hg ci -m1 | |
551 | $ hg up 2 |
|
551 | $ hg up 2 | |
552 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
552 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
553 | $ echo c > c |
|
553 | $ echo c > c | |
554 | $ hg ci -Am1 |
|
554 | $ hg ci -Am1 | |
555 | adding c |
|
555 | adding c | |
556 | $ hg up 3 |
|
556 | $ hg up 3 | |
557 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
557 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
558 | $ hg merge 4 |
|
558 | $ hg merge 4 | |
559 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
559 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
560 | (branch merge, don't forget to commit) |
|
560 | (branch merge, don't forget to commit) | |
561 | $ hg ci -m1 |
|
561 | $ hg ci -m1 | |
562 |
|
562 | |||
563 | # main repo layout: |
|
563 | # main repo layout: | |
564 | # |
|
564 | # | |
565 | # * <-- try to merge default into br again |
|
565 | # * <-- try to merge default into br again | |
566 | # .`| |
|
566 | # .`| | |
567 | # . o 5 br --> substate = 5 |
|
567 | # . o 5 br --> substate = 5 | |
568 | # . | |
|
568 | # . | | |
569 | # o | 4 default --> substate = 4 |
|
569 | # o | 4 default --> substate = 4 | |
570 | # | | |
|
570 | # | | | |
571 | # | o 3 br --> substate = 2 |
|
571 | # | o 3 br --> substate = 2 | |
572 | # |/| |
|
572 | # |/| | |
573 | # o | 2 default --> substate = 2 |
|
573 | # o | 2 default --> substate = 2 | |
574 | # | | |
|
574 | # | | | |
575 | # | o 1 br --> substate = 3 |
|
575 | # | o 1 br --> substate = 3 | |
576 | # |/ |
|
576 | # |/ | |
577 | # o 0 default --> substate = 2 |
|
577 | # o 0 default --> substate = 2 | |
578 |
|
578 | |||
579 | $ cd .. |
|
579 | $ cd .. | |
580 | $ echo 's = s' > .hgsub |
|
580 | $ echo 's = s' > .hgsub | |
581 | $ hg -R s up 2 |
|
581 | $ hg -R s up 2 | |
582 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
582 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
583 | $ hg ci -Am1 |
|
583 | $ hg ci -Am1 | |
584 | adding .hgsub |
|
584 | adding .hgsub | |
585 | $ hg branch br |
|
585 | $ hg branch br | |
586 | marked working directory as branch br |
|
586 | marked working directory as branch br | |
587 | (branches are permanent and global, did you want a bookmark?) |
|
587 | (branches are permanent and global, did you want a bookmark?) | |
588 | $ echo b > b |
|
588 | $ echo b > b | |
589 | $ hg -R s up 3 |
|
589 | $ hg -R s up 3 | |
590 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
590 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
591 | $ hg ci -Am1 |
|
591 | $ hg ci -Am1 | |
592 | adding b |
|
592 | adding b | |
593 | $ hg up default |
|
593 | $ hg up default | |
594 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
594 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
595 | $ echo c > c |
|
595 | $ echo c > c | |
596 | $ hg ci -Am1 |
|
596 | $ hg ci -Am1 | |
597 | adding c |
|
597 | adding c | |
598 | $ hg up 1 |
|
598 | $ hg up 1 | |
599 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
599 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
600 | $ hg merge 2 |
|
600 | $ hg merge 2 | |
601 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
601 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
602 | (branch merge, don't forget to commit) |
|
602 | (branch merge, don't forget to commit) | |
603 | $ hg ci -m1 |
|
603 | $ hg ci -m1 | |
604 | $ hg up 2 |
|
604 | $ hg up 2 | |
605 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
605 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
606 | $ hg -R s up 4 |
|
606 | $ hg -R s up 4 | |
607 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
607 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
608 | $ echo d > d |
|
608 | $ echo d > d | |
609 | $ hg ci -Am1 |
|
609 | $ hg ci -Am1 | |
610 | adding d |
|
610 | adding d | |
611 | $ hg up 3 |
|
611 | $ hg up 3 | |
612 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
612 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
613 | $ hg -R s up 5 |
|
613 | $ hg -R s up 5 | |
614 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
614 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
615 | $ echo e > e |
|
615 | $ echo e > e | |
616 | $ hg ci -Am1 |
|
616 | $ hg ci -Am1 | |
617 | adding e |
|
617 | adding e | |
618 |
|
618 | |||
619 | $ hg up 5 |
|
619 | $ hg up 5 | |
620 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
620 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
621 | $ hg merge 4 # try to merge default into br again |
|
621 | $ hg merge 4 # try to merge default into br again | |
622 | subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) |
|
622 | subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) | |
623 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
623 | (M)erge, keep (l)ocal or keep (r)emote? m | |
624 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
624 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
625 | (branch merge, don't forget to commit) |
|
625 | (branch merge, don't forget to commit) | |
626 | $ cd .. |
|
626 | $ cd .. | |
627 |
|
627 | |||
628 | test subrepo delete from .hgsubstate |
|
628 | test subrepo delete from .hgsubstate | |
629 |
|
629 | |||
630 | $ hg init testdelete |
|
630 | $ hg init testdelete | |
631 | $ mkdir testdelete/nested testdelete/nested2 |
|
631 | $ mkdir testdelete/nested testdelete/nested2 | |
632 | $ hg init testdelete/nested |
|
632 | $ hg init testdelete/nested | |
633 | $ hg init testdelete/nested2 |
|
633 | $ hg init testdelete/nested2 | |
634 | $ echo test > testdelete/nested/foo |
|
634 | $ echo test > testdelete/nested/foo | |
635 | $ echo test > testdelete/nested2/foo |
|
635 | $ echo test > testdelete/nested2/foo | |
636 | $ hg -R testdelete/nested add |
|
636 | $ hg -R testdelete/nested add | |
637 | adding testdelete/nested/foo (glob) |
|
637 | adding testdelete/nested/foo (glob) | |
638 | $ hg -R testdelete/nested2 add |
|
638 | $ hg -R testdelete/nested2 add | |
639 | adding testdelete/nested2/foo (glob) |
|
639 | adding testdelete/nested2/foo (glob) | |
640 | $ hg -R testdelete/nested ci -m test |
|
640 | $ hg -R testdelete/nested ci -m test | |
641 | $ hg -R testdelete/nested2 ci -m test |
|
641 | $ hg -R testdelete/nested2 ci -m test | |
642 | $ echo nested = nested > testdelete/.hgsub |
|
642 | $ echo nested = nested > testdelete/.hgsub | |
643 | $ echo nested2 = nested2 >> testdelete/.hgsub |
|
643 | $ echo nested2 = nested2 >> testdelete/.hgsub | |
644 | $ hg -R testdelete add |
|
644 | $ hg -R testdelete add | |
645 | adding testdelete/.hgsub (glob) |
|
645 | adding testdelete/.hgsub (glob) | |
646 | $ hg -R testdelete ci -m "nested 1 & 2 added" |
|
646 | $ hg -R testdelete ci -m "nested 1 & 2 added" | |
647 | $ echo nested = nested > testdelete/.hgsub |
|
647 | $ echo nested = nested > testdelete/.hgsub | |
648 | $ hg -R testdelete ci -m "nested 2 deleted" |
|
648 | $ hg -R testdelete ci -m "nested 2 deleted" | |
649 | $ cat testdelete/.hgsubstate |
|
649 | $ cat testdelete/.hgsubstate | |
650 | bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
|
650 | bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested | |
651 | $ hg -R testdelete remove testdelete/.hgsub |
|
651 | $ hg -R testdelete remove testdelete/.hgsub | |
652 | $ hg -R testdelete ci -m ".hgsub deleted" |
|
652 | $ hg -R testdelete ci -m ".hgsub deleted" | |
653 | $ cat testdelete/.hgsubstate |
|
653 | $ cat testdelete/.hgsubstate | |
654 | bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
|
654 | bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested | |
655 |
|
655 | |||
656 | test repository cloning |
|
656 | test repository cloning | |
657 |
|
657 | |||
658 | $ mkdir mercurial mercurial2 |
|
658 | $ mkdir mercurial mercurial2 | |
659 | $ hg init nested_absolute |
|
659 | $ hg init nested_absolute | |
660 | $ echo test > nested_absolute/foo |
|
660 | $ echo test > nested_absolute/foo | |
661 | $ hg -R nested_absolute add |
|
661 | $ hg -R nested_absolute add | |
662 | adding nested_absolute/foo (glob) |
|
662 | adding nested_absolute/foo (glob) | |
663 | $ hg -R nested_absolute ci -mtest |
|
663 | $ hg -R nested_absolute ci -mtest | |
664 | $ cd mercurial |
|
664 | $ cd mercurial | |
665 | $ hg init nested_relative |
|
665 | $ hg init nested_relative | |
666 | $ echo test2 > nested_relative/foo2 |
|
666 | $ echo test2 > nested_relative/foo2 | |
667 | $ hg -R nested_relative add |
|
667 | $ hg -R nested_relative add | |
668 | adding nested_relative/foo2 (glob) |
|
668 | adding nested_relative/foo2 (glob) | |
669 | $ hg -R nested_relative ci -mtest2 |
|
669 | $ hg -R nested_relative ci -mtest2 | |
670 | $ hg init main |
|
670 | $ hg init main | |
671 | $ echo "nested_relative = ../nested_relative" > main/.hgsub |
|
671 | $ echo "nested_relative = ../nested_relative" > main/.hgsub | |
672 | $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub |
|
672 | $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub | |
673 | $ hg -R main add |
|
673 | $ hg -R main add | |
674 | adding main/.hgsub (glob) |
|
674 | adding main/.hgsub (glob) | |
675 | $ hg -R main ci -m "add subrepos" |
|
675 | $ hg -R main ci -m "add subrepos" | |
676 | $ cd .. |
|
676 | $ cd .. | |
677 | $ hg clone mercurial/main mercurial2/main |
|
677 | $ hg clone mercurial/main mercurial2/main | |
678 | updating to branch default |
|
678 | updating to branch default | |
679 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
679 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
680 | $ cat mercurial2/main/nested_absolute/.hg/hgrc \ |
|
680 | $ cat mercurial2/main/nested_absolute/.hg/hgrc \ | |
681 | > mercurial2/main/nested_relative/.hg/hgrc |
|
681 | > mercurial2/main/nested_relative/.hg/hgrc | |
682 | [paths] |
|
682 | [paths] | |
683 | default = $TESTTMP/mercurial/nested_absolute |
|
683 | default = $TESTTMP/mercurial/nested_absolute | |
684 | [paths] |
|
684 | [paths] | |
685 | default = $TESTTMP/mercurial/nested_relative |
|
685 | default = $TESTTMP/mercurial/nested_relative | |
686 | $ rm -rf mercurial mercurial2 |
|
686 | $ rm -rf mercurial mercurial2 | |
687 |
|
687 | |||
688 | Issue1977: multirepo push should fail if subrepo push fails |
|
688 | Issue1977: multirepo push should fail if subrepo push fails | |
689 |
|
689 | |||
690 | $ hg init repo |
|
690 | $ hg init repo | |
691 | $ hg init repo/s |
|
691 | $ hg init repo/s | |
692 | $ echo a > repo/s/a |
|
692 | $ echo a > repo/s/a | |
693 | $ hg -R repo/s ci -Am0 |
|
693 | $ hg -R repo/s ci -Am0 | |
694 | adding a |
|
694 | adding a | |
695 | $ echo s = s > repo/.hgsub |
|
695 | $ echo s = s > repo/.hgsub | |
696 | $ hg -R repo ci -Am1 |
|
696 | $ hg -R repo ci -Am1 | |
697 | adding .hgsub |
|
697 | adding .hgsub | |
698 | $ hg clone repo repo2 |
|
698 | $ hg clone repo repo2 | |
699 | updating to branch default |
|
699 | updating to branch default | |
700 | cloning subrepo s from $TESTTMP/repo/s |
|
700 | cloning subrepo s from $TESTTMP/repo/s | |
701 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
701 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
702 | $ hg -q -R repo2 pull -u |
|
702 | $ hg -q -R repo2 pull -u | |
703 | $ echo 1 > repo2/s/a |
|
703 | $ echo 1 > repo2/s/a | |
704 | $ hg -R repo2/s ci -m2 |
|
704 | $ hg -R repo2/s ci -m2 | |
705 | $ hg -q -R repo2/s push |
|
705 | $ hg -q -R repo2/s push | |
706 | $ hg -R repo2/s up -C 0 |
|
706 | $ hg -R repo2/s up -C 0 | |
707 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
707 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
708 | $ echo 2 > repo2/s/b |
|
708 | $ echo 2 > repo2/s/b | |
709 | $ hg -R repo2/s ci -m3 -A |
|
709 | $ hg -R repo2/s ci -m3 -A | |
710 | adding b |
|
710 | adding b | |
711 | created new head |
|
711 | created new head | |
712 | $ hg -R repo2 ci -m3 |
|
712 | $ hg -R repo2 ci -m3 | |
713 | $ hg -q -R repo2 push |
|
713 | $ hg -q -R repo2 push | |
714 | abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
|
714 | abort: push creates new remote head cc505f09a8b2! (in subrepo s) | |
715 | (merge or see "hg help push" for details about pushing new heads) |
|
715 | (merge or see "hg help push" for details about pushing new heads) | |
716 | [255] |
|
716 | [255] | |
717 | $ hg -R repo update |
|
717 | $ hg -R repo update | |
718 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
718 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
719 |
|
719 | |||
720 | test if untracked file is not overwritten |
|
720 | test if untracked file is not overwritten | |
721 |
|
721 | |||
722 | $ echo issue3276_ok > repo/s/b |
|
722 | $ echo issue3276_ok > repo/s/b | |
723 | $ hg -R repo2 push -f -q |
|
723 | $ hg -R repo2 push -f -q | |
724 | $ hg -R repo update |
|
724 | $ hg -R repo update | |
725 | b: untracked file differs |
|
725 | b: untracked file differs | |
726 | abort: untracked files in working directory differ from files in requested revision (in subrepo s) |
|
726 | abort: untracked files in working directory differ from files in requested revision (in subrepo s) | |
727 | [255] |
|
727 | [255] | |
728 |
|
728 | |||
729 | $ cat repo/s/b |
|
729 | $ cat repo/s/b | |
730 | issue3276_ok |
|
730 | issue3276_ok | |
731 | $ rm repo/s/b |
|
731 | $ rm repo/s/b | |
732 | $ hg -R repo revert --all |
|
732 | $ hg -R repo revert --all | |
733 | reverting repo/.hgsubstate (glob) |
|
733 | reverting repo/.hgsubstate (glob) | |
734 | reverting subrepo s |
|
734 | reverting subrepo s | |
735 | $ hg -R repo update |
|
735 | $ hg -R repo update | |
736 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
736 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
737 | $ cat repo/s/b |
|
737 | $ cat repo/s/b | |
738 | 2 |
|
738 | 2 | |
739 | $ rm -rf repo2 repo |
|
739 | $ rm -rf repo2 repo | |
740 |
|
740 | |||
741 |
|
741 | |||
742 | Issue1852 subrepos with relative paths always push/pull relative to default |
|
742 | Issue1852 subrepos with relative paths always push/pull relative to default | |
743 |
|
743 | |||
744 | Prepare a repo with subrepo |
|
744 | Prepare a repo with subrepo | |
745 |
|
745 | |||
746 | $ hg init issue1852a |
|
746 | $ hg init issue1852a | |
747 | $ cd issue1852a |
|
747 | $ cd issue1852a | |
748 | $ hg init sub/repo |
|
748 | $ hg init sub/repo | |
749 | $ echo test > sub/repo/foo |
|
749 | $ echo test > sub/repo/foo | |
750 | $ hg -R sub/repo add sub/repo/foo |
|
750 | $ hg -R sub/repo add sub/repo/foo | |
751 | $ echo sub/repo = sub/repo > .hgsub |
|
751 | $ echo sub/repo = sub/repo > .hgsub | |
752 | $ hg add .hgsub |
|
752 | $ hg add .hgsub | |
753 | $ hg ci -mtest |
|
753 | $ hg ci -mtest | |
754 | committing subrepository sub/repo (glob) |
|
754 | committing subrepository sub/repo (glob) | |
755 | $ echo test >> sub/repo/foo |
|
755 | $ echo test >> sub/repo/foo | |
756 | $ hg ci -mtest |
|
756 | $ hg ci -mtest | |
757 | committing subrepository sub/repo (glob) |
|
757 | committing subrepository sub/repo (glob) | |
758 | $ cd .. |
|
758 | $ cd .. | |
759 |
|
759 | |||
760 | Create repo without default path, pull top repo, and see what happens on update |
|
760 | Create repo without default path, pull top repo, and see what happens on update | |
761 |
|
761 | |||
762 | $ hg init issue1852b |
|
762 | $ hg init issue1852b | |
763 | $ hg -R issue1852b pull issue1852a |
|
763 | $ hg -R issue1852b pull issue1852a | |
764 | pulling from issue1852a |
|
764 | pulling from issue1852a | |
765 | requesting all changes |
|
765 | requesting all changes | |
766 | adding changesets |
|
766 | adding changesets | |
767 | adding manifests |
|
767 | adding manifests | |
768 | adding file changes |
|
768 | adding file changes | |
769 | added 2 changesets with 3 changes to 2 files |
|
769 | added 2 changesets with 3 changes to 2 files | |
770 | (run 'hg update' to get a working copy) |
|
770 | (run 'hg update' to get a working copy) | |
771 | $ hg -R issue1852b update |
|
771 | $ hg -R issue1852b update | |
772 | abort: default path for subrepository not found (in subrepo sub/repo) (glob) |
|
772 | abort: default path for subrepository not found (in subrepo sub/repo) (glob) | |
773 | [255] |
|
773 | [255] | |
774 |
|
774 | |||
775 | Ensure a full traceback, not just the SubrepoAbort part |
|
775 | Ensure a full traceback, not just the SubrepoAbort part | |
776 |
|
776 | |||
777 | $ hg -R issue1852b update --traceback 2>&1 | grep 'raise util\.Abort' |
|
777 | $ hg -R issue1852b update --traceback 2>&1 | grep 'raise util\.Abort' | |
778 | raise util.Abort(_("default path for subrepository not found")) |
|
778 | raise util.Abort(_("default path for subrepository not found")) | |
779 |
|
779 | |||
780 | Pull -u now doesn't help |
|
780 | Pull -u now doesn't help | |
781 |
|
781 | |||
782 | $ hg -R issue1852b pull -u issue1852a |
|
782 | $ hg -R issue1852b pull -u issue1852a | |
783 | pulling from issue1852a |
|
783 | pulling from issue1852a | |
784 | searching for changes |
|
784 | searching for changes | |
785 | no changes found |
|
785 | no changes found | |
786 |
|
786 | |||
787 | Try the same, but with pull -u |
|
787 | Try the same, but with pull -u | |
788 |
|
788 | |||
789 | $ hg init issue1852c |
|
789 | $ hg init issue1852c | |
790 | $ hg -R issue1852c pull -r0 -u issue1852a |
|
790 | $ hg -R issue1852c pull -r0 -u issue1852a | |
791 | pulling from issue1852a |
|
791 | pulling from issue1852a | |
792 | adding changesets |
|
792 | adding changesets | |
793 | adding manifests |
|
793 | adding manifests | |
794 | adding file changes |
|
794 | adding file changes | |
795 | added 1 changesets with 2 changes to 2 files |
|
795 | added 1 changesets with 2 changes to 2 files | |
796 | cloning subrepo sub/repo from issue1852a/sub/repo (glob) |
|
796 | cloning subrepo sub/repo from issue1852a/sub/repo (glob) | |
797 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
797 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
798 |
|
798 | |||
799 | Try to push from the other side |
|
799 | Try to push from the other side | |
800 |
|
800 | |||
801 | $ hg -R issue1852a push `pwd`/issue1852c |
|
801 | $ hg -R issue1852a push `pwd`/issue1852c | |
802 | pushing to $TESTTMP/issue1852c (glob) |
|
802 | pushing to $TESTTMP/issue1852c (glob) | |
803 | pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob) |
|
803 | pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob) | |
804 | searching for changes |
|
804 | searching for changes | |
805 | no changes found |
|
805 | no changes found | |
806 | searching for changes |
|
806 | searching for changes | |
807 | adding changesets |
|
807 | adding changesets | |
808 | adding manifests |
|
808 | adding manifests | |
809 | adding file changes |
|
809 | adding file changes | |
810 | added 1 changesets with 1 changes to 1 files |
|
810 | added 1 changesets with 1 changes to 1 files | |
811 |
|
811 | |||
812 | Incoming and outgoing should not use the default path: |
|
812 | Incoming and outgoing should not use the default path: | |
813 |
|
813 | |||
814 | $ hg clone -q issue1852a issue1852d |
|
814 | $ hg clone -q issue1852a issue1852d | |
815 | $ hg -R issue1852d outgoing --subrepos issue1852c |
|
815 | $ hg -R issue1852d outgoing --subrepos issue1852c | |
816 | comparing with issue1852c |
|
816 | comparing with issue1852c | |
817 | searching for changes |
|
817 | searching for changes | |
818 | no changes found |
|
818 | no changes found | |
819 | comparing with issue1852c/sub/repo |
|
819 | comparing with issue1852c/sub/repo | |
820 | searching for changes |
|
820 | searching for changes | |
821 | no changes found |
|
821 | no changes found | |
822 | [1] |
|
822 | [1] | |
823 | $ hg -R issue1852d incoming --subrepos issue1852c |
|
823 | $ hg -R issue1852d incoming --subrepos issue1852c | |
824 | comparing with issue1852c |
|
824 | comparing with issue1852c | |
825 | searching for changes |
|
825 | searching for changes | |
826 | no changes found |
|
826 | no changes found | |
827 | comparing with issue1852c/sub/repo |
|
827 | comparing with issue1852c/sub/repo | |
828 | searching for changes |
|
828 | searching for changes | |
829 | no changes found |
|
829 | no changes found | |
830 | [1] |
|
830 | [1] | |
831 |
|
831 | |||
832 | Check status of files when none of them belong to the first |
|
832 | Check status of files when none of them belong to the first | |
833 | subrepository: |
|
833 | subrepository: | |
834 |
|
834 | |||
835 | $ hg init subrepo-status |
|
835 | $ hg init subrepo-status | |
836 | $ cd subrepo-status |
|
836 | $ cd subrepo-status | |
837 | $ hg init subrepo-1 |
|
837 | $ hg init subrepo-1 | |
838 | $ hg init subrepo-2 |
|
838 | $ hg init subrepo-2 | |
839 | $ cd subrepo-2 |
|
839 | $ cd subrepo-2 | |
840 | $ touch file |
|
840 | $ touch file | |
841 | $ hg add file |
|
841 | $ hg add file | |
842 | $ cd .. |
|
842 | $ cd .. | |
843 | $ echo subrepo-1 = subrepo-1 > .hgsub |
|
843 | $ echo subrepo-1 = subrepo-1 > .hgsub | |
844 | $ echo subrepo-2 = subrepo-2 >> .hgsub |
|
844 | $ echo subrepo-2 = subrepo-2 >> .hgsub | |
845 | $ hg add .hgsub |
|
845 | $ hg add .hgsub | |
846 | $ hg ci -m 'Added subrepos' |
|
846 | $ hg ci -m 'Added subrepos' | |
847 | committing subrepository subrepo-2 |
|
847 | committing subrepository subrepo-2 | |
848 | $ hg st subrepo-2/file |
|
848 | $ hg st subrepo-2/file | |
849 |
|
849 | |||
850 | Check that share works with subrepo |
|
850 | Check that share works with subrepo | |
851 | $ hg --config extensions.share= share . ../shared |
|
851 | $ hg --config extensions.share= share . ../shared | |
852 | updating working directory |
|
852 | updating working directory | |
853 | cloning subrepo subrepo-2 from $TESTTMP/subrepo-status/subrepo-2 |
|
853 | cloning subrepo subrepo-2 from $TESTTMP/subrepo-status/subrepo-2 | |
854 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
854 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
855 | $ test -f ../shared/subrepo-1/.hg/sharedpath |
|
855 | $ test -f ../shared/subrepo-1/.hg/sharedpath | |
856 | [1] |
|
856 | [1] | |
857 | $ hg -R ../shared in |
|
857 | $ hg -R ../shared in | |
858 | abort: repository default not found! |
|
858 | abort: repository default not found! | |
859 | [255] |
|
859 | [255] | |
860 | $ hg -R ../shared/subrepo-2 showconfig paths |
|
860 | $ hg -R ../shared/subrepo-2 showconfig paths | |
861 | paths.default=$TESTTMP/subrepo-status/subrepo-2 |
|
861 | paths.default=$TESTTMP/subrepo-status/subrepo-2 | |
862 | $ hg -R ../shared/subrepo-1 sum --remote |
|
862 | $ hg -R ../shared/subrepo-1 sum --remote | |
863 | parent: -1:000000000000 tip (empty repository) |
|
863 | parent: -1:000000000000 tip (empty repository) | |
864 | branch: default |
|
864 | branch: default | |
865 | commit: (clean) |
|
865 | commit: (clean) | |
866 | update: (current) |
|
866 | update: (current) | |
867 | remote: (synced) |
|
867 | remote: (synced) | |
868 |
|
868 | |||
869 | Check hg update --clean |
|
869 | Check hg update --clean | |
870 | $ cd $TESTTMP/t |
|
870 | $ cd $TESTTMP/t | |
871 | $ rm -r t/t.orig |
|
871 | $ rm -r t/t.orig | |
872 | $ hg status -S --all |
|
872 | $ hg status -S --all | |
873 | C .hgsub |
|
873 | C .hgsub | |
874 | C .hgsubstate |
|
874 | C .hgsubstate | |
875 | C a |
|
875 | C a | |
876 | C s/.hgsub |
|
876 | C s/.hgsub | |
877 | C s/.hgsubstate |
|
877 | C s/.hgsubstate | |
878 | C s/a |
|
878 | C s/a | |
879 | C s/ss/a |
|
879 | C s/ss/a | |
880 | C t/t |
|
880 | C t/t | |
881 | $ echo c1 > s/a |
|
881 | $ echo c1 > s/a | |
882 | $ cd s |
|
882 | $ cd s | |
883 | $ echo c1 > b |
|
883 | $ echo c1 > b | |
884 | $ echo c1 > c |
|
884 | $ echo c1 > c | |
885 | $ hg add b |
|
885 | $ hg add b | |
886 | $ cd .. |
|
886 | $ cd .. | |
887 | $ hg status -S |
|
887 | $ hg status -S | |
888 | M s/a |
|
888 | M s/a | |
889 | A s/b |
|
889 | A s/b | |
890 | ? s/c |
|
890 | ? s/c | |
891 | $ hg update -C |
|
891 | $ hg update -C | |
892 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
892 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
893 | $ hg status -S |
|
893 | $ hg status -S | |
894 | ? s/b |
|
894 | ? s/b | |
895 | ? s/c |
|
895 | ? s/c | |
896 |
|
896 | |||
897 | Sticky subrepositories, no changes |
|
897 | Sticky subrepositories, no changes | |
898 | $ cd $TESTTMP/t |
|
898 | $ cd $TESTTMP/t | |
899 | $ hg id |
|
899 | $ hg id | |
900 | 925c17564ef8 tip |
|
900 | 925c17564ef8 tip | |
901 | $ hg -R s id |
|
901 | $ hg -R s id | |
902 | 12a213df6fa9 tip |
|
902 | 12a213df6fa9 tip | |
903 | $ hg -R t id |
|
903 | $ hg -R t id | |
904 | 52c0adc0515a tip |
|
904 | 52c0adc0515a tip | |
905 | $ hg update 11 |
|
905 | $ hg update 11 | |
906 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
906 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
907 | $ hg id |
|
907 | $ hg id | |
908 | 365661e5936a |
|
908 | 365661e5936a | |
909 | $ hg -R s id |
|
909 | $ hg -R s id | |
910 | fc627a69481f |
|
910 | fc627a69481f | |
911 | $ hg -R t id |
|
911 | $ hg -R t id | |
912 | e95bcfa18a35 |
|
912 | e95bcfa18a35 | |
913 |
|
913 | |||
914 | Sticky subrepositorys, file changes |
|
914 | Sticky subrepositorys, file changes | |
915 | $ touch s/f1 |
|
915 | $ touch s/f1 | |
916 | $ touch t/f1 |
|
916 | $ touch t/f1 | |
917 | $ hg add -S s/f1 |
|
917 | $ hg add -S s/f1 | |
918 | $ hg add -S t/f1 |
|
918 | $ hg add -S t/f1 | |
919 | $ hg id |
|
919 | $ hg id | |
920 | 365661e5936a+ |
|
920 | 365661e5936a+ | |
921 | $ hg -R s id |
|
921 | $ hg -R s id | |
922 | fc627a69481f+ |
|
922 | fc627a69481f+ | |
923 | $ hg -R t id |
|
923 | $ hg -R t id | |
924 | e95bcfa18a35+ |
|
924 | e95bcfa18a35+ | |
925 | $ hg update tip |
|
925 | $ hg update tip | |
926 | subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) |
|
926 | subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) | |
927 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
927 | (M)erge, keep (l)ocal or keep (r)emote? m | |
928 | subrepository sources for s differ |
|
928 | subrepository sources for s differ | |
929 | use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? |
|
929 | use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? | |
930 | l |
|
930 | l | |
931 | subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) |
|
931 | subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) | |
932 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
932 | (M)erge, keep (l)ocal or keep (r)emote? m | |
933 | subrepository sources for t differ |
|
933 | subrepository sources for t differ | |
934 | use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? |
|
934 | use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? | |
935 | l |
|
935 | l | |
936 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
936 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
937 | $ hg id |
|
937 | $ hg id | |
938 | 925c17564ef8+ tip |
|
938 | 925c17564ef8+ tip | |
939 | $ hg -R s id |
|
939 | $ hg -R s id | |
940 | fc627a69481f+ |
|
940 | fc627a69481f+ | |
941 | $ hg -R t id |
|
941 | $ hg -R t id | |
942 | e95bcfa18a35+ |
|
942 | e95bcfa18a35+ | |
943 | $ hg update --clean tip |
|
943 | $ hg update --clean tip | |
944 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
944 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
945 |
|
945 | |||
946 | Sticky subrepository, revision updates |
|
946 | Sticky subrepository, revision updates | |
947 | $ hg id |
|
947 | $ hg id | |
948 | 925c17564ef8 tip |
|
948 | 925c17564ef8 tip | |
949 | $ hg -R s id |
|
949 | $ hg -R s id | |
950 | 12a213df6fa9 tip |
|
950 | 12a213df6fa9 tip | |
951 | $ hg -R t id |
|
951 | $ hg -R t id | |
952 | 52c0adc0515a tip |
|
952 | 52c0adc0515a tip | |
953 | $ cd s |
|
953 | $ cd s | |
954 | $ hg update -r -2 |
|
954 | $ hg update -r -2 | |
955 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
955 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
956 | $ cd ../t |
|
956 | $ cd ../t | |
957 | $ hg update -r 2 |
|
957 | $ hg update -r 2 | |
958 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
958 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
959 | $ cd .. |
|
959 | $ cd .. | |
960 | $ hg update 10 |
|
960 | $ hg update 10 | |
961 | subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
|
961 | subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) | |
962 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
962 | (M)erge, keep (l)ocal or keep (r)emote? m | |
963 | subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) |
|
963 | subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) | |
964 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
964 | (M)erge, keep (l)ocal or keep (r)emote? m | |
965 | subrepository sources for t differ (in checked out version) |
|
965 | subrepository sources for t differ (in checked out version) | |
966 | use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? |
|
966 | use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? | |
967 | l |
|
967 | l | |
968 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
968 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
969 | $ hg id |
|
969 | $ hg id | |
970 | e45c8b14af55+ |
|
970 | e45c8b14af55+ | |
971 | $ hg -R s id |
|
971 | $ hg -R s id | |
972 | 02dcf1d70411 |
|
972 | 02dcf1d70411 | |
973 | $ hg -R t id |
|
973 | $ hg -R t id | |
974 | 7af322bc1198 |
|
974 | 7af322bc1198 | |
975 |
|
975 | |||
976 | Sticky subrepository, file changes and revision updates |
|
976 | Sticky subrepository, file changes and revision updates | |
977 | $ touch s/f1 |
|
977 | $ touch s/f1 | |
978 | $ touch t/f1 |
|
978 | $ touch t/f1 | |
979 | $ hg add -S s/f1 |
|
979 | $ hg add -S s/f1 | |
980 | $ hg add -S t/f1 |
|
980 | $ hg add -S t/f1 | |
981 | $ hg id |
|
981 | $ hg id | |
982 | e45c8b14af55+ |
|
982 | e45c8b14af55+ | |
983 | $ hg -R s id |
|
983 | $ hg -R s id | |
984 | 02dcf1d70411+ |
|
984 | 02dcf1d70411+ | |
985 | $ hg -R t id |
|
985 | $ hg -R t id | |
986 | 7af322bc1198+ |
|
986 | 7af322bc1198+ | |
987 | $ hg update tip |
|
987 | $ hg update tip | |
988 | subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) |
|
988 | subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) | |
989 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
989 | (M)erge, keep (l)ocal or keep (r)emote? m | |
990 | subrepository sources for s differ |
|
990 | subrepository sources for s differ | |
991 | use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)? |
|
991 | use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)? | |
992 | l |
|
992 | l | |
993 | subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) |
|
993 | subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) | |
994 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
994 | (M)erge, keep (l)ocal or keep (r)emote? m | |
995 | subrepository sources for t differ |
|
995 | subrepository sources for t differ | |
996 | use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? |
|
996 | use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? | |
997 | l |
|
997 | l | |
998 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
998 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
999 | $ hg id |
|
999 | $ hg id | |
1000 | 925c17564ef8+ tip |
|
1000 | 925c17564ef8+ tip | |
1001 | $ hg -R s id |
|
1001 | $ hg -R s id | |
1002 | 02dcf1d70411+ |
|
1002 | 02dcf1d70411+ | |
1003 | $ hg -R t id |
|
1003 | $ hg -R t id | |
1004 | 7af322bc1198+ |
|
1004 | 7af322bc1198+ | |
1005 |
|
1005 | |||
1006 | Sticky repository, update --clean |
|
1006 | Sticky repository, update --clean | |
1007 | $ hg update --clean tip |
|
1007 | $ hg update --clean tip | |
1008 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1008 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1009 | $ hg id |
|
1009 | $ hg id | |
1010 | 925c17564ef8 tip |
|
1010 | 925c17564ef8 tip | |
1011 | $ hg -R s id |
|
1011 | $ hg -R s id | |
1012 | 12a213df6fa9 tip |
|
1012 | 12a213df6fa9 tip | |
1013 | $ hg -R t id |
|
1013 | $ hg -R t id | |
1014 | 52c0adc0515a tip |
|
1014 | 52c0adc0515a tip | |
1015 |
|
1015 | |||
1016 | Test subrepo already at intended revision: |
|
1016 | Test subrepo already at intended revision: | |
1017 | $ cd s |
|
1017 | $ cd s | |
1018 | $ hg update fc627a69481f |
|
1018 | $ hg update fc627a69481f | |
1019 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1019 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1020 | $ cd .. |
|
1020 | $ cd .. | |
1021 | $ hg update 11 |
|
1021 | $ hg update 11 | |
1022 | subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
|
1022 | subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) | |
1023 | (M)erge, keep (l)ocal or keep (r)emote? m |
|
1023 | (M)erge, keep (l)ocal or keep (r)emote? m | |
1024 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1024 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1025 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1025 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1026 | $ hg id -n |
|
1026 | $ hg id -n | |
1027 | 11+ |
|
1027 | 11+ | |
1028 | $ hg -R s id |
|
1028 | $ hg -R s id | |
1029 | fc627a69481f |
|
1029 | fc627a69481f | |
1030 | $ hg -R t id |
|
1030 | $ hg -R t id | |
1031 | e95bcfa18a35 |
|
1031 | e95bcfa18a35 | |
1032 |
|
1032 | |||
1033 | Test that removing .hgsubstate doesn't break anything: |
|
1033 | Test that removing .hgsubstate doesn't break anything: | |
1034 |
|
1034 | |||
1035 | $ hg rm -f .hgsubstate |
|
1035 | $ hg rm -f .hgsubstate | |
1036 | $ hg ci -mrm |
|
1036 | $ hg ci -mrm | |
1037 | nothing changed |
|
1037 | nothing changed | |
1038 | [1] |
|
1038 | [1] | |
1039 | $ hg log -vr tip |
|
1039 | $ hg log -vr tip | |
1040 | changeset: 13:925c17564ef8 |
|
1040 | changeset: 13:925c17564ef8 | |
1041 | tag: tip |
|
1041 | tag: tip | |
1042 | user: test |
|
1042 | user: test | |
1043 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1043 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1044 | files: .hgsubstate |
|
1044 | files: .hgsubstate | |
1045 | description: |
|
1045 | description: | |
1046 | 13 |
|
1046 | 13 | |
1047 |
|
1047 | |||
1048 |
|
1048 | |||
1049 |
|
1049 | |||
1050 | Test that removing .hgsub removes .hgsubstate: |
|
1050 | Test that removing .hgsub removes .hgsubstate: | |
1051 |
|
1051 | |||
1052 | $ hg rm .hgsub |
|
1052 | $ hg rm .hgsub | |
1053 | $ hg ci -mrm2 |
|
1053 | $ hg ci -mrm2 | |
1054 | created new head |
|
1054 | created new head | |
1055 | $ hg log -vr tip |
|
1055 | $ hg log -vr tip | |
1056 | changeset: 14:2400bccd50af |
|
1056 | changeset: 14:2400bccd50af | |
1057 | tag: tip |
|
1057 | tag: tip | |
1058 | parent: 11:365661e5936a |
|
1058 | parent: 11:365661e5936a | |
1059 | user: test |
|
1059 | user: test | |
1060 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1060 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1061 | files: .hgsub .hgsubstate |
|
1061 | files: .hgsub .hgsubstate | |
1062 | description: |
|
1062 | description: | |
1063 | rm2 |
|
1063 | rm2 | |
1064 |
|
1064 | |||
1065 |
|
1065 | |||
1066 | Test issue3153: diff -S with deleted subrepos |
|
1066 | Test issue3153: diff -S with deleted subrepos | |
1067 |
|
1067 | |||
1068 | $ hg diff --nodates -S -c . |
|
1068 | $ hg diff --nodates -S -c . | |
1069 | diff -r 365661e5936a -r 2400bccd50af .hgsub |
|
1069 | diff -r 365661e5936a -r 2400bccd50af .hgsub | |
1070 | --- a/.hgsub |
|
1070 | --- a/.hgsub | |
1071 | +++ /dev/null |
|
1071 | +++ /dev/null | |
1072 | @@ -1,2 +0,0 @@ |
|
1072 | @@ -1,2 +0,0 @@ | |
1073 | -s = s |
|
1073 | -s = s | |
1074 | -t = t |
|
1074 | -t = t | |
1075 | diff -r 365661e5936a -r 2400bccd50af .hgsubstate |
|
1075 | diff -r 365661e5936a -r 2400bccd50af .hgsubstate | |
1076 | --- a/.hgsubstate |
|
1076 | --- a/.hgsubstate | |
1077 | +++ /dev/null |
|
1077 | +++ /dev/null | |
1078 | @@ -1,2 +0,0 @@ |
|
1078 | @@ -1,2 +0,0 @@ | |
1079 | -fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
|
1079 | -fc627a69481fcbe5f1135069e8a3881c023e4cf5 s | |
1080 | -e95bcfa18a358dc4936da981ebf4147b4cad1362 t |
|
1080 | -e95bcfa18a358dc4936da981ebf4147b4cad1362 t | |
1081 |
|
1081 | |||
1082 | Test behavior of add for explicit path in subrepo: |
|
1082 | Test behavior of add for explicit path in subrepo: | |
1083 | $ cd .. |
|
1083 | $ cd .. | |
1084 | $ hg init explicit |
|
1084 | $ hg init explicit | |
1085 | $ cd explicit |
|
1085 | $ cd explicit | |
1086 | $ echo s = s > .hgsub |
|
1086 | $ echo s = s > .hgsub | |
1087 | $ hg add .hgsub |
|
1087 | $ hg add .hgsub | |
1088 | $ hg init s |
|
1088 | $ hg init s | |
1089 | $ hg ci -m0 |
|
1089 | $ hg ci -m0 | |
1090 | Adding with an explicit path in a subrepo adds the file |
|
1090 | Adding with an explicit path in a subrepo adds the file | |
1091 | $ echo c1 > f1 |
|
1091 | $ echo c1 > f1 | |
1092 | $ echo c2 > s/f2 |
|
1092 | $ echo c2 > s/f2 | |
1093 | $ hg st -S |
|
1093 | $ hg st -S | |
1094 | ? f1 |
|
1094 | ? f1 | |
1095 | ? s/f2 |
|
1095 | ? s/f2 | |
1096 | $ hg add s/f2 |
|
1096 | $ hg add s/f2 | |
1097 | $ hg st -S |
|
1097 | $ hg st -S | |
1098 | A s/f2 |
|
1098 | A s/f2 | |
1099 | ? f1 |
|
1099 | ? f1 | |
1100 | $ hg ci -R s -m0 |
|
1100 | $ hg ci -R s -m0 | |
1101 | $ hg ci -Am1 |
|
1101 | $ hg ci -Am1 | |
1102 | adding f1 |
|
1102 | adding f1 | |
1103 | Adding with an explicit path in a subrepo with -S has the same behavior |
|
1103 | Adding with an explicit path in a subrepo with -S has the same behavior | |
1104 | $ echo c3 > f3 |
|
1104 | $ echo c3 > f3 | |
1105 | $ echo c4 > s/f4 |
|
1105 | $ echo c4 > s/f4 | |
1106 | $ hg st -S |
|
1106 | $ hg st -S | |
1107 | ? f3 |
|
1107 | ? f3 | |
1108 | ? s/f4 |
|
1108 | ? s/f4 | |
1109 | $ hg add -S s/f4 |
|
1109 | $ hg add -S s/f4 | |
1110 | $ hg st -S |
|
1110 | $ hg st -S | |
1111 | A s/f4 |
|
1111 | A s/f4 | |
1112 | ? f3 |
|
1112 | ? f3 | |
1113 | $ hg ci -R s -m1 |
|
1113 | $ hg ci -R s -m1 | |
1114 | $ hg ci -Ama2 |
|
1114 | $ hg ci -Ama2 | |
1115 | adding f3 |
|
1115 | adding f3 | |
1116 | Adding without a path or pattern silently ignores subrepos |
|
1116 | Adding without a path or pattern silently ignores subrepos | |
1117 | $ echo c5 > f5 |
|
1117 | $ echo c5 > f5 | |
1118 | $ echo c6 > s/f6 |
|
1118 | $ echo c6 > s/f6 | |
1119 | $ echo c7 > s/f7 |
|
1119 | $ echo c7 > s/f7 | |
1120 | $ hg st -S |
|
1120 | $ hg st -S | |
1121 | ? f5 |
|
1121 | ? f5 | |
1122 | ? s/f6 |
|
1122 | ? s/f6 | |
1123 | ? s/f7 |
|
1123 | ? s/f7 | |
1124 | $ hg add |
|
1124 | $ hg add | |
1125 | adding f5 |
|
1125 | adding f5 | |
1126 | $ hg st -S |
|
1126 | $ hg st -S | |
1127 | A f5 |
|
1127 | A f5 | |
1128 | ? s/f6 |
|
1128 | ? s/f6 | |
1129 | ? s/f7 |
|
1129 | ? s/f7 | |
1130 | $ hg ci -R s -Am2 |
|
1130 | $ hg ci -R s -Am2 | |
1131 | adding f6 |
|
1131 | adding f6 | |
1132 | adding f7 |
|
1132 | adding f7 | |
1133 | $ hg ci -m3 |
|
1133 | $ hg ci -m3 | |
1134 | Adding without a path or pattern with -S also adds files in subrepos |
|
1134 | Adding without a path or pattern with -S also adds files in subrepos | |
1135 | $ echo c8 > f8 |
|
1135 | $ echo c8 > f8 | |
1136 | $ echo c9 > s/f9 |
|
1136 | $ echo c9 > s/f9 | |
1137 | $ echo c10 > s/f10 |
|
1137 | $ echo c10 > s/f10 | |
1138 | $ hg st -S |
|
1138 | $ hg st -S | |
1139 | ? f8 |
|
1139 | ? f8 | |
1140 | ? s/f10 |
|
1140 | ? s/f10 | |
1141 | ? s/f9 |
|
1141 | ? s/f9 | |
1142 | $ hg add -S |
|
1142 | $ hg add -S | |
1143 | adding f8 |
|
1143 | adding f8 | |
1144 | adding s/f10 (glob) |
|
1144 | adding s/f10 (glob) | |
1145 | adding s/f9 (glob) |
|
1145 | adding s/f9 (glob) | |
1146 | $ hg st -S |
|
1146 | $ hg st -S | |
1147 | A f8 |
|
1147 | A f8 | |
1148 | A s/f10 |
|
1148 | A s/f10 | |
1149 | A s/f9 |
|
1149 | A s/f9 | |
1150 | $ hg ci -R s -m3 |
|
1150 | $ hg ci -R s -m3 | |
1151 | $ hg ci -m4 |
|
1151 | $ hg ci -m4 | |
1152 | Adding with a pattern silently ignores subrepos |
|
1152 | Adding with a pattern silently ignores subrepos | |
1153 | $ echo c11 > fm11 |
|
1153 | $ echo c11 > fm11 | |
1154 | $ echo c12 > fn12 |
|
1154 | $ echo c12 > fn12 | |
1155 | $ echo c13 > s/fm13 |
|
1155 | $ echo c13 > s/fm13 | |
1156 | $ echo c14 > s/fn14 |
|
1156 | $ echo c14 > s/fn14 | |
1157 | $ hg st -S |
|
1157 | $ hg st -S | |
1158 | ? fm11 |
|
1158 | ? fm11 | |
1159 | ? fn12 |
|
1159 | ? fn12 | |
1160 | ? s/fm13 |
|
1160 | ? s/fm13 | |
1161 | ? s/fn14 |
|
1161 | ? s/fn14 | |
1162 | $ hg add 'glob:**fm*' |
|
1162 | $ hg add 'glob:**fm*' | |
1163 | adding fm11 |
|
1163 | adding fm11 | |
1164 | $ hg st -S |
|
1164 | $ hg st -S | |
1165 | A fm11 |
|
1165 | A fm11 | |
1166 | ? fn12 |
|
1166 | ? fn12 | |
1167 | ? s/fm13 |
|
1167 | ? s/fm13 | |
1168 | ? s/fn14 |
|
1168 | ? s/fn14 | |
1169 | $ hg ci -R s -Am4 |
|
1169 | $ hg ci -R s -Am4 | |
1170 | adding fm13 |
|
1170 | adding fm13 | |
1171 | adding fn14 |
|
1171 | adding fn14 | |
1172 | $ hg ci -Am5 |
|
1172 | $ hg ci -Am5 | |
1173 | adding fn12 |
|
1173 | adding fn12 | |
1174 | Adding with a pattern with -S also adds matches in subrepos |
|
1174 | Adding with a pattern with -S also adds matches in subrepos | |
1175 | $ echo c15 > fm15 |
|
1175 | $ echo c15 > fm15 | |
1176 | $ echo c16 > fn16 |
|
1176 | $ echo c16 > fn16 | |
1177 | $ echo c17 > s/fm17 |
|
1177 | $ echo c17 > s/fm17 | |
1178 | $ echo c18 > s/fn18 |
|
1178 | $ echo c18 > s/fn18 | |
1179 | $ hg st -S |
|
1179 | $ hg st -S | |
1180 | ? fm15 |
|
1180 | ? fm15 | |
1181 | ? fn16 |
|
1181 | ? fn16 | |
1182 | ? s/fm17 |
|
1182 | ? s/fm17 | |
1183 | ? s/fn18 |
|
1183 | ? s/fn18 | |
1184 | $ hg add -S 'glob:**fm*' |
|
1184 | $ hg add -S 'glob:**fm*' | |
1185 | adding fm15 |
|
1185 | adding fm15 | |
1186 | adding s/fm17 (glob) |
|
1186 | adding s/fm17 (glob) | |
1187 | $ hg st -S |
|
1187 | $ hg st -S | |
1188 | A fm15 |
|
1188 | A fm15 | |
1189 | A s/fm17 |
|
1189 | A s/fm17 | |
1190 | ? fn16 |
|
1190 | ? fn16 | |
1191 | ? s/fn18 |
|
1191 | ? s/fn18 | |
1192 | $ hg ci -R s -Am5 |
|
1192 | $ hg ci -R s -Am5 | |
1193 | adding fn18 |
|
1193 | adding fn18 | |
1194 | $ hg ci -Am6 |
|
1194 | $ hg ci -Am6 | |
1195 | adding fn16 |
|
1195 | adding fn16 | |
1196 |
|
1196 | |||
1197 | Test behavior of forget for explicit path in subrepo: |
|
1197 | Test behavior of forget for explicit path in subrepo: | |
1198 | Forgetting an explicit path in a subrepo untracks the file |
|
1198 | Forgetting an explicit path in a subrepo untracks the file | |
1199 | $ echo c19 > s/f19 |
|
1199 | $ echo c19 > s/f19 | |
1200 | $ hg add s/f19 |
|
1200 | $ hg add s/f19 | |
1201 | $ hg st -S |
|
1201 | $ hg st -S | |
1202 | A s/f19 |
|
1202 | A s/f19 | |
1203 | $ hg forget s/f19 |
|
1203 | $ hg forget s/f19 | |
1204 | $ hg st -S |
|
1204 | $ hg st -S | |
1205 | ? s/f19 |
|
1205 | ? s/f19 | |
1206 | $ rm s/f19 |
|
1206 | $ rm s/f19 | |
1207 | $ cd .. |
|
1207 | $ cd .. | |
1208 |
|
1208 | |||
1209 | Courtesy phases synchronisation to publishing server does not block the push |
|
1209 | Courtesy phases synchronisation to publishing server does not block the push | |
1210 | (issue3781) |
|
1210 | (issue3781) | |
1211 |
|
1211 | |||
1212 | $ cp -r main issue3781 |
|
1212 | $ cp -r main issue3781 | |
1213 | $ cp -r main issue3781-dest |
|
1213 | $ cp -r main issue3781-dest | |
1214 | $ cd issue3781-dest/s |
|
1214 | $ cd issue3781-dest/s | |
1215 | $ hg phase tip # show we have draft changeset |
|
1215 | $ hg phase tip # show we have draft changeset | |
1216 | 5: draft |
|
1216 | 5: draft | |
1217 | $ chmod a-w .hg/store/phaseroots # prevent phase push |
|
1217 | $ chmod a-w .hg/store/phaseroots # prevent phase push | |
1218 | $ cd ../../issue3781 |
|
1218 | $ cd ../../issue3781 | |
1219 | $ cat >> .hg/hgrc << EOF |
|
1219 | $ cat >> .hg/hgrc << EOF | |
1220 | > [paths] |
|
1220 | > [paths] | |
1221 | > default=../issue3781-dest/ |
|
1221 | > default=../issue3781-dest/ | |
1222 | > EOF |
|
1222 | > EOF | |
1223 | $ hg push |
|
1223 | $ hg push | |
1224 | pushing to $TESTTMP/issue3781-dest (glob) |
|
1224 | pushing to $TESTTMP/issue3781-dest (glob) | |
1225 | pushing subrepo s to $TESTTMP/issue3781-dest/s |
|
1225 | pushing subrepo s to $TESTTMP/issue3781-dest/s | |
1226 | searching for changes |
|
1226 | searching for changes | |
1227 | no changes found |
|
1227 | no changes found | |
1228 | searching for changes |
|
1228 | searching for changes | |
1229 | no changes found |
|
1229 | no changes found | |
1230 | [1] |
|
1230 | [1] | |
1231 | $ cd .. |
|
1231 | $ cd .. | |
1232 |
|
1232 | |||
1233 | Test phase choice for newly created commit with "phases.subrepochecks" |
|
1233 | Test phase choice for newly created commit with "phases.subrepochecks" | |
1234 | configuration |
|
1234 | configuration | |
1235 |
|
1235 | |||
1236 | $ cd t |
|
1236 | $ cd t | |
1237 | $ hg update -q -r 12 |
|
1237 | $ hg update -q -r 12 | |
1238 |
|
1238 | |||
1239 | $ cat >> s/ss/.hg/hgrc <<EOF |
|
1239 | $ cat >> s/ss/.hg/hgrc <<EOF | |
1240 | > [phases] |
|
1240 | > [phases] | |
1241 | > new-commit = secret |
|
1241 | > new-commit = secret | |
1242 | > EOF |
|
1242 | > EOF | |
1243 | $ cat >> s/.hg/hgrc <<EOF |
|
1243 | $ cat >> s/.hg/hgrc <<EOF | |
1244 | > [phases] |
|
1244 | > [phases] | |
1245 | > new-commit = draft |
|
1245 | > new-commit = draft | |
1246 | > EOF |
|
1246 | > EOF | |
1247 | $ echo phasecheck1 >> s/ss/a |
|
1247 | $ echo phasecheck1 >> s/ss/a | |
1248 | $ hg -R s commit -S --config phases.checksubrepos=abort -m phasecheck1 |
|
1248 | $ hg -R s commit -S --config phases.checksubrepos=abort -m phasecheck1 | |
1249 | committing subrepository ss |
|
1249 | committing subrepository ss | |
1250 | transaction abort! |
|
1250 | transaction abort! | |
1251 | rollback completed |
|
1251 | rollback completed | |
1252 | abort: can't commit in draft phase conflicting secret from subrepository ss |
|
1252 | abort: can't commit in draft phase conflicting secret from subrepository ss | |
1253 | [255] |
|
1253 | [255] | |
1254 | $ echo phasecheck2 >> s/ss/a |
|
1254 | $ echo phasecheck2 >> s/ss/a | |
1255 | $ hg -R s commit -S --config phases.checksubrepos=ignore -m phasecheck2 |
|
1255 | $ hg -R s commit -S --config phases.checksubrepos=ignore -m phasecheck2 | |
1256 | committing subrepository ss |
|
1256 | committing subrepository ss | |
1257 | $ hg -R s/ss phase tip |
|
1257 | $ hg -R s/ss phase tip | |
1258 | 3: secret |
|
1258 | 3: secret | |
1259 | $ hg -R s phase tip |
|
1259 | $ hg -R s phase tip | |
1260 | 6: draft |
|
1260 | 6: draft | |
1261 | $ echo phasecheck3 >> s/ss/a |
|
1261 | $ echo phasecheck3 >> s/ss/a | |
1262 | $ hg -R s commit -S -m phasecheck3 |
|
1262 | $ hg -R s commit -S -m phasecheck3 | |
1263 | committing subrepository ss |
|
1263 | committing subrepository ss | |
1264 | warning: changes are committed in secret phase from subrepository ss |
|
1264 | warning: changes are committed in secret phase from subrepository ss | |
1265 | $ hg -R s/ss phase tip |
|
1265 | $ hg -R s/ss phase tip | |
1266 | 4: secret |
|
1266 | 4: secret | |
1267 | $ hg -R s phase tip |
|
1267 | $ hg -R s phase tip | |
1268 | 7: secret |
|
1268 | 7: secret | |
1269 |
|
1269 | |||
1270 | $ cat >> t/.hg/hgrc <<EOF |
|
1270 | $ cat >> t/.hg/hgrc <<EOF | |
1271 | > [phases] |
|
1271 | > [phases] | |
1272 | > new-commit = draft |
|
1272 | > new-commit = draft | |
1273 | > EOF |
|
1273 | > EOF | |
1274 | $ cat >> .hg/hgrc <<EOF |
|
1274 | $ cat >> .hg/hgrc <<EOF | |
1275 | > [phases] |
|
1275 | > [phases] | |
1276 | > new-commit = public |
|
1276 | > new-commit = public | |
1277 | > EOF |
|
1277 | > EOF | |
1278 | $ echo phasecheck4 >> s/ss/a |
|
1278 | $ echo phasecheck4 >> s/ss/a | |
1279 | $ echo phasecheck4 >> t/t |
|
1279 | $ echo phasecheck4 >> t/t | |
1280 | $ hg commit -S -m phasecheck4 |
|
1280 | $ hg commit -S -m phasecheck4 | |
1281 | committing subrepository s |
|
1281 | committing subrepository s | |
1282 | committing subrepository s/ss |
|
1282 | committing subrepository s/ss | |
1283 | warning: changes are committed in secret phase from subrepository ss |
|
1283 | warning: changes are committed in secret phase from subrepository ss | |
1284 | committing subrepository t |
|
1284 | committing subrepository t | |
1285 | warning: changes are committed in secret phase from subrepository s |
|
1285 | warning: changes are committed in secret phase from subrepository s | |
1286 | created new head |
|
1286 | created new head | |
1287 | $ hg -R s/ss phase tip |
|
1287 | $ hg -R s/ss phase tip | |
1288 | 5: secret |
|
1288 | 5: secret | |
1289 | $ hg -R s phase tip |
|
1289 | $ hg -R s phase tip | |
1290 | 8: secret |
|
1290 | 8: secret | |
1291 | $ hg -R t phase tip |
|
1291 | $ hg -R t phase tip | |
1292 | 6: draft |
|
1292 | 6: draft | |
1293 | $ hg phase tip |
|
1293 | $ hg phase tip | |
1294 | 15: secret |
|
1294 | 15: secret | |
1295 |
|
1295 | |||
1296 | $ cd .. |
|
1296 | $ cd .. | |
|
1297 | ||||
|
1298 | ||||
|
1299 | Test that comit --secret works on both repo and subrepo (issue4182) | |||
|
1300 | ||||
|
1301 | $ cd main | |||
|
1302 | $ echo secret >> b | |||
|
1303 | $ echo secret >> s/b | |||
|
1304 | $ hg commit --secret --subrepo -m "secret" | |||
|
1305 | committing subrepository s | |||
|
1306 | $ hg phase -r . | |||
|
1307 | 6: secret | |||
|
1308 | $ cd s | |||
|
1309 | $ hg phase -r . | |||
|
1310 | 6: secret | |||
|
1311 | $ cd ../../ |
General Comments 0
You need to be logged in to leave comments.
Login now