Show More
@@ -1,6811 +1,6811 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, nullhex, nullid, nullrev, short |
|
8 | from node import hex, bin, nullhex, 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, shlex |
|
11 | import os, re, difflib, time, tempfile, errno, shlex | |
12 | import sys, socket |
|
12 | import sys, socket | |
13 | import hg, scmutil, util, revlog, copies, error, bookmarks |
|
13 | import hg, scmutil, util, revlog, copies, error, bookmarks | |
14 | import patch, help, encoding, templatekw, discovery |
|
14 | import patch, help, encoding, templatekw, discovery | |
15 | import archival, changegroup, cmdutil, hbisect |
|
15 | import archival, changegroup, cmdutil, hbisect | |
16 | import sshserver, hgweb |
|
16 | import sshserver, hgweb | |
17 | import extensions |
|
17 | import extensions | |
18 | import merge as mergemod |
|
18 | import merge as mergemod | |
19 | import minirst, revset, fileset |
|
19 | import minirst, revset, fileset | |
20 | import dagparser, context, simplemerge, graphmod, copies |
|
20 | import dagparser, context, simplemerge, graphmod, copies | |
21 | import random, operator |
|
21 | import random, operator | |
22 | import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil |
|
22 | import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil | |
23 | import phases, obsolete, exchange, bundle2, repair, lock as lockmod |
|
23 | import phases, obsolete, exchange, bundle2, repair, lock as lockmod | |
24 | import ui as uimod |
|
24 | import ui as uimod | |
25 | import streamclone |
|
25 | import streamclone | |
26 |
|
26 | |||
27 | table = {} |
|
27 | table = {} | |
28 |
|
28 | |||
29 | command = cmdutil.command(table) |
|
29 | command = cmdutil.command(table) | |
30 |
|
30 | |||
31 | # Space delimited list of commands that don't require local repositories. |
|
31 | # Space delimited list of commands that don't require local repositories. | |
32 | # This should be populated by passing norepo=True into the @command decorator. |
|
32 | # This should be populated by passing norepo=True into the @command decorator. | |
33 | norepo = '' |
|
33 | norepo = '' | |
34 | # Space delimited list of commands that optionally require local repositories. |
|
34 | # Space delimited list of commands that optionally require local repositories. | |
35 | # This should be populated by passing optionalrepo=True into the @command |
|
35 | # This should be populated by passing optionalrepo=True into the @command | |
36 | # decorator. |
|
36 | # decorator. | |
37 | optionalrepo = '' |
|
37 | optionalrepo = '' | |
38 | # Space delimited list of commands that will examine arguments looking for |
|
38 | # Space delimited list of commands that will examine arguments looking for | |
39 | # a repository. This should be populated by passing inferrepo=True into the |
|
39 | # a repository. This should be populated by passing inferrepo=True into the | |
40 | # @command decorator. |
|
40 | # @command decorator. | |
41 | inferrepo = '' |
|
41 | inferrepo = '' | |
42 |
|
42 | |||
43 | # label constants |
|
43 | # label constants | |
44 | # until 3.5, bookmarks.current was the advertised name, not |
|
44 | # until 3.5, bookmarks.current was the advertised name, not | |
45 | # bookmarks.active, so we must use both to avoid breaking old |
|
45 | # bookmarks.active, so we must use both to avoid breaking old | |
46 | # custom styles |
|
46 | # custom styles | |
47 | activebookmarklabel = 'bookmarks.active bookmarks.current' |
|
47 | activebookmarklabel = 'bookmarks.active bookmarks.current' | |
48 |
|
48 | |||
49 | # common command options |
|
49 | # common command options | |
50 |
|
50 | |||
51 | globalopts = [ |
|
51 | globalopts = [ | |
52 | ('R', 'repository', '', |
|
52 | ('R', 'repository', '', | |
53 | _('repository root directory or name of overlay bundle file'), |
|
53 | _('repository root directory or name of overlay bundle file'), | |
54 | _('REPO')), |
|
54 | _('REPO')), | |
55 | ('', 'cwd', '', |
|
55 | ('', 'cwd', '', | |
56 | _('change working directory'), _('DIR')), |
|
56 | _('change working directory'), _('DIR')), | |
57 | ('y', 'noninteractive', None, |
|
57 | ('y', 'noninteractive', None, | |
58 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
58 | _('do not prompt, automatically pick the first choice for all prompts')), | |
59 | ('q', 'quiet', None, _('suppress output')), |
|
59 | ('q', 'quiet', None, _('suppress output')), | |
60 | ('v', 'verbose', None, _('enable additional output')), |
|
60 | ('v', 'verbose', None, _('enable additional output')), | |
61 | ('', 'config', [], |
|
61 | ('', 'config', [], | |
62 | _('set/override config option (use \'section.name=value\')'), |
|
62 | _('set/override config option (use \'section.name=value\')'), | |
63 | _('CONFIG')), |
|
63 | _('CONFIG')), | |
64 | ('', 'debug', None, _('enable debugging output')), |
|
64 | ('', 'debug', None, _('enable debugging output')), | |
65 | ('', 'debugger', None, _('start debugger')), |
|
65 | ('', 'debugger', None, _('start debugger')), | |
66 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
66 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
67 | _('ENCODE')), |
|
67 | _('ENCODE')), | |
68 | ('', 'encodingmode', encoding.encodingmode, |
|
68 | ('', 'encodingmode', encoding.encodingmode, | |
69 | _('set the charset encoding mode'), _('MODE')), |
|
69 | _('set the charset encoding mode'), _('MODE')), | |
70 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
70 | ('', 'traceback', None, _('always print a traceback on exception')), | |
71 | ('', 'time', None, _('time how long the command takes')), |
|
71 | ('', 'time', None, _('time how long the command takes')), | |
72 | ('', 'profile', None, _('print command execution profile')), |
|
72 | ('', 'profile', None, _('print command execution profile')), | |
73 | ('', 'version', None, _('output version information and exit')), |
|
73 | ('', 'version', None, _('output version information and exit')), | |
74 | ('h', 'help', None, _('display help and exit')), |
|
74 | ('h', 'help', None, _('display help and exit')), | |
75 | ('', 'hidden', False, _('consider hidden changesets')), |
|
75 | ('', 'hidden', False, _('consider hidden changesets')), | |
76 | ] |
|
76 | ] | |
77 |
|
77 | |||
78 | dryrunopts = [('n', 'dry-run', None, |
|
78 | dryrunopts = [('n', 'dry-run', None, | |
79 | _('do not perform actions, just print output'))] |
|
79 | _('do not perform actions, just print output'))] | |
80 |
|
80 | |||
81 | remoteopts = [ |
|
81 | remoteopts = [ | |
82 | ('e', 'ssh', '', |
|
82 | ('e', 'ssh', '', | |
83 | _('specify ssh command to use'), _('CMD')), |
|
83 | _('specify ssh command to use'), _('CMD')), | |
84 | ('', 'remotecmd', '', |
|
84 | ('', 'remotecmd', '', | |
85 | _('specify hg command to run on the remote side'), _('CMD')), |
|
85 | _('specify hg command to run on the remote side'), _('CMD')), | |
86 | ('', 'insecure', None, |
|
86 | ('', 'insecure', None, | |
87 | _('do not verify server certificate (ignoring web.cacerts config)')), |
|
87 | _('do not verify server certificate (ignoring web.cacerts config)')), | |
88 | ] |
|
88 | ] | |
89 |
|
89 | |||
90 | walkopts = [ |
|
90 | walkopts = [ | |
91 | ('I', 'include', [], |
|
91 | ('I', 'include', [], | |
92 | _('include names matching the given patterns'), _('PATTERN')), |
|
92 | _('include names matching the given patterns'), _('PATTERN')), | |
93 | ('X', 'exclude', [], |
|
93 | ('X', 'exclude', [], | |
94 | _('exclude names matching the given patterns'), _('PATTERN')), |
|
94 | _('exclude names matching the given patterns'), _('PATTERN')), | |
95 | ] |
|
95 | ] | |
96 |
|
96 | |||
97 | commitopts = [ |
|
97 | commitopts = [ | |
98 | ('m', 'message', '', |
|
98 | ('m', 'message', '', | |
99 | _('use text as commit message'), _('TEXT')), |
|
99 | _('use text as commit message'), _('TEXT')), | |
100 | ('l', 'logfile', '', |
|
100 | ('l', 'logfile', '', | |
101 | _('read commit message from file'), _('FILE')), |
|
101 | _('read commit message from file'), _('FILE')), | |
102 | ] |
|
102 | ] | |
103 |
|
103 | |||
104 | commitopts2 = [ |
|
104 | commitopts2 = [ | |
105 | ('d', 'date', '', |
|
105 | ('d', 'date', '', | |
106 | _('record the specified date as commit date'), _('DATE')), |
|
106 | _('record the specified date as commit date'), _('DATE')), | |
107 | ('u', 'user', '', |
|
107 | ('u', 'user', '', | |
108 | _('record the specified user as committer'), _('USER')), |
|
108 | _('record the specified user as committer'), _('USER')), | |
109 | ] |
|
109 | ] | |
110 |
|
110 | |||
111 | # hidden for now |
|
111 | # hidden for now | |
112 | formatteropts = [ |
|
112 | formatteropts = [ | |
113 | ('T', 'template', '', |
|
113 | ('T', 'template', '', | |
114 | _('display with template (EXPERIMENTAL)'), _('TEMPLATE')), |
|
114 | _('display with template (EXPERIMENTAL)'), _('TEMPLATE')), | |
115 | ] |
|
115 | ] | |
116 |
|
116 | |||
117 | templateopts = [ |
|
117 | templateopts = [ | |
118 | ('', 'style', '', |
|
118 | ('', 'style', '', | |
119 | _('display using template map file (DEPRECATED)'), _('STYLE')), |
|
119 | _('display using template map file (DEPRECATED)'), _('STYLE')), | |
120 | ('T', 'template', '', |
|
120 | ('T', 'template', '', | |
121 | _('display with template'), _('TEMPLATE')), |
|
121 | _('display with template'), _('TEMPLATE')), | |
122 | ] |
|
122 | ] | |
123 |
|
123 | |||
124 | logopts = [ |
|
124 | logopts = [ | |
125 | ('p', 'patch', None, _('show patch')), |
|
125 | ('p', 'patch', None, _('show patch')), | |
126 | ('g', 'git', None, _('use git extended diff format')), |
|
126 | ('g', 'git', None, _('use git extended diff format')), | |
127 | ('l', 'limit', '', |
|
127 | ('l', 'limit', '', | |
128 | _('limit number of changes displayed'), _('NUM')), |
|
128 | _('limit number of changes displayed'), _('NUM')), | |
129 | ('M', 'no-merges', None, _('do not show merges')), |
|
129 | ('M', 'no-merges', None, _('do not show merges')), | |
130 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
130 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
131 | ('G', 'graph', None, _("show the revision DAG")), |
|
131 | ('G', 'graph', None, _("show the revision DAG")), | |
132 | ] + templateopts |
|
132 | ] + templateopts | |
133 |
|
133 | |||
134 | diffopts = [ |
|
134 | diffopts = [ | |
135 | ('a', 'text', None, _('treat all files as text')), |
|
135 | ('a', 'text', None, _('treat all files as text')), | |
136 | ('g', 'git', None, _('use git extended diff format')), |
|
136 | ('g', 'git', None, _('use git extended diff format')), | |
137 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
137 | ('', 'nodates', None, _('omit dates from diff headers')) | |
138 | ] |
|
138 | ] | |
139 |
|
139 | |||
140 | diffwsopts = [ |
|
140 | diffwsopts = [ | |
141 | ('w', 'ignore-all-space', None, |
|
141 | ('w', 'ignore-all-space', None, | |
142 | _('ignore white space when comparing lines')), |
|
142 | _('ignore white space when comparing lines')), | |
143 | ('b', 'ignore-space-change', None, |
|
143 | ('b', 'ignore-space-change', None, | |
144 | _('ignore changes in the amount of white space')), |
|
144 | _('ignore changes in the amount of white space')), | |
145 | ('B', 'ignore-blank-lines', None, |
|
145 | ('B', 'ignore-blank-lines', None, | |
146 | _('ignore changes whose lines are all blank')), |
|
146 | _('ignore changes whose lines are all blank')), | |
147 | ] |
|
147 | ] | |
148 |
|
148 | |||
149 | diffopts2 = [ |
|
149 | diffopts2 = [ | |
150 | ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')), |
|
150 | ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')), | |
151 | ('p', 'show-function', None, _('show which function each change is in')), |
|
151 | ('p', 'show-function', None, _('show which function each change is in')), | |
152 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
152 | ('', 'reverse', None, _('produce a diff that undoes the changes')), | |
153 | ] + diffwsopts + [ |
|
153 | ] + diffwsopts + [ | |
154 | ('U', 'unified', '', |
|
154 | ('U', 'unified', '', | |
155 | _('number of lines of context to show'), _('NUM')), |
|
155 | _('number of lines of context to show'), _('NUM')), | |
156 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
156 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
157 | ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')), |
|
157 | ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')), | |
158 | ] |
|
158 | ] | |
159 |
|
159 | |||
160 | mergetoolopts = [ |
|
160 | mergetoolopts = [ | |
161 | ('t', 'tool', '', _('specify merge tool')), |
|
161 | ('t', 'tool', '', _('specify merge tool')), | |
162 | ] |
|
162 | ] | |
163 |
|
163 | |||
164 | similarityopts = [ |
|
164 | similarityopts = [ | |
165 | ('s', 'similarity', '', |
|
165 | ('s', 'similarity', '', | |
166 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
|
166 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) | |
167 | ] |
|
167 | ] | |
168 |
|
168 | |||
169 | subrepoopts = [ |
|
169 | subrepoopts = [ | |
170 | ('S', 'subrepos', None, |
|
170 | ('S', 'subrepos', None, | |
171 | _('recurse into subrepositories')) |
|
171 | _('recurse into subrepositories')) | |
172 | ] |
|
172 | ] | |
173 |
|
173 | |||
174 | # Commands start here, listed alphabetically |
|
174 | # Commands start here, listed alphabetically | |
175 |
|
175 | |||
176 | @command('^add', |
|
176 | @command('^add', | |
177 | walkopts + subrepoopts + dryrunopts, |
|
177 | walkopts + subrepoopts + dryrunopts, | |
178 | _('[OPTION]... [FILE]...'), |
|
178 | _('[OPTION]... [FILE]...'), | |
179 | inferrepo=True) |
|
179 | inferrepo=True) | |
180 | def add(ui, repo, *pats, **opts): |
|
180 | def add(ui, repo, *pats, **opts): | |
181 | """add the specified files on the next commit |
|
181 | """add the specified files on the next commit | |
182 |
|
182 | |||
183 | Schedule files to be version controlled and added to the |
|
183 | Schedule files to be version controlled and added to the | |
184 | repository. |
|
184 | repository. | |
185 |
|
185 | |||
186 | The files will be added to the repository at the next commit. To |
|
186 | The files will be added to the repository at the next commit. To | |
187 | undo an add before that, see :hg:`forget`. |
|
187 | undo an add before that, see :hg:`forget`. | |
188 |
|
188 | |||
189 | If no names are given, add all files to the repository. |
|
189 | If no names are given, add all files to the repository. | |
190 |
|
190 | |||
191 | .. container:: verbose |
|
191 | .. container:: verbose | |
192 |
|
192 | |||
193 | Examples: |
|
193 | Examples: | |
194 |
|
194 | |||
195 | - New (unknown) files are added |
|
195 | - New (unknown) files are added | |
196 | automatically by :hg:`add`:: |
|
196 | automatically by :hg:`add`:: | |
197 |
|
197 | |||
198 | $ ls |
|
198 | $ ls | |
199 | foo.c |
|
199 | foo.c | |
200 | $ hg status |
|
200 | $ hg status | |
201 | ? foo.c |
|
201 | ? foo.c | |
202 | $ hg add |
|
202 | $ hg add | |
203 | adding foo.c |
|
203 | adding foo.c | |
204 | $ hg status |
|
204 | $ hg status | |
205 | A foo.c |
|
205 | A foo.c | |
206 |
|
206 | |||
207 | - Specific files to be added can be specified:: |
|
207 | - Specific files to be added can be specified:: | |
208 |
|
208 | |||
209 | $ ls |
|
209 | $ ls | |
210 | bar.c foo.c |
|
210 | bar.c foo.c | |
211 | $ hg status |
|
211 | $ hg status | |
212 | ? bar.c |
|
212 | ? bar.c | |
213 | ? foo.c |
|
213 | ? foo.c | |
214 | $ hg add bar.c |
|
214 | $ hg add bar.c | |
215 | $ hg status |
|
215 | $ hg status | |
216 | A bar.c |
|
216 | A bar.c | |
217 | ? foo.c |
|
217 | ? foo.c | |
218 |
|
218 | |||
219 | Returns 0 if all files are successfully added. |
|
219 | Returns 0 if all files are successfully added. | |
220 | """ |
|
220 | """ | |
221 |
|
221 | |||
222 | m = scmutil.match(repo[None], pats, opts) |
|
222 | m = scmutil.match(repo[None], pats, opts) | |
223 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) |
|
223 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) | |
224 | return rejected and 1 or 0 |
|
224 | return rejected and 1 or 0 | |
225 |
|
225 | |||
226 | @command('addremove', |
|
226 | @command('addremove', | |
227 | similarityopts + subrepoopts + walkopts + dryrunopts, |
|
227 | similarityopts + subrepoopts + walkopts + dryrunopts, | |
228 | _('[OPTION]... [FILE]...'), |
|
228 | _('[OPTION]... [FILE]...'), | |
229 | inferrepo=True) |
|
229 | inferrepo=True) | |
230 | def addremove(ui, repo, *pats, **opts): |
|
230 | def addremove(ui, repo, *pats, **opts): | |
231 | """add all new files, delete all missing files |
|
231 | """add all new files, delete all missing files | |
232 |
|
232 | |||
233 | Add all new files and remove all missing files from the |
|
233 | Add all new files and remove all missing files from the | |
234 | repository. |
|
234 | repository. | |
235 |
|
235 | |||
236 | New files are ignored if they match any of the patterns in |
|
236 | New files are ignored if they match any of the patterns in | |
237 | ``.hgignore``. As with add, these changes take effect at the next |
|
237 | ``.hgignore``. As with add, these changes take effect at the next | |
238 | commit. |
|
238 | commit. | |
239 |
|
239 | |||
240 | Use the -s/--similarity option to detect renamed files. This |
|
240 | Use the -s/--similarity option to detect renamed files. This | |
241 | option takes a percentage between 0 (disabled) and 100 (files must |
|
241 | option takes a percentage between 0 (disabled) and 100 (files must | |
242 | be identical) as its parameter. With a parameter greater than 0, |
|
242 | be identical) as its parameter. With a parameter greater than 0, | |
243 | this compares every removed file with every added file and records |
|
243 | this compares every removed file with every added file and records | |
244 | those similar enough as renames. Detecting renamed files this way |
|
244 | those similar enough as renames. Detecting renamed files this way | |
245 | can be expensive. After using this option, :hg:`status -C` can be |
|
245 | can be expensive. After using this option, :hg:`status -C` can be | |
246 | used to check which files were identified as moved or renamed. If |
|
246 | used to check which files were identified as moved or renamed. If | |
247 | not specified, -s/--similarity defaults to 100 and only renames of |
|
247 | not specified, -s/--similarity defaults to 100 and only renames of | |
248 | identical files are detected. |
|
248 | identical files are detected. | |
249 |
|
249 | |||
250 | .. container:: verbose |
|
250 | .. container:: verbose | |
251 |
|
251 | |||
252 | Examples: |
|
252 | Examples: | |
253 |
|
253 | |||
254 | - A number of files (bar.c and foo.c) are new, |
|
254 | - A number of files (bar.c and foo.c) are new, | |
255 | while foobar.c has been removed (without using :hg:`remove`) |
|
255 | while foobar.c has been removed (without using :hg:`remove`) | |
256 | from the repository:: |
|
256 | from the repository:: | |
257 |
|
257 | |||
258 | $ ls |
|
258 | $ ls | |
259 | bar.c foo.c |
|
259 | bar.c foo.c | |
260 | $ hg status |
|
260 | $ hg status | |
261 | ! foobar.c |
|
261 | ! foobar.c | |
262 | ? bar.c |
|
262 | ? bar.c | |
263 | ? foo.c |
|
263 | ? foo.c | |
264 | $ hg addremove |
|
264 | $ hg addremove | |
265 | adding bar.c |
|
265 | adding bar.c | |
266 | adding foo.c |
|
266 | adding foo.c | |
267 | removing foobar.c |
|
267 | removing foobar.c | |
268 | $ hg status |
|
268 | $ hg status | |
269 | A bar.c |
|
269 | A bar.c | |
270 | A foo.c |
|
270 | A foo.c | |
271 | R foobar.c |
|
271 | R foobar.c | |
272 |
|
272 | |||
273 | - A file foobar.c was moved to foo.c without using :hg:`rename`. |
|
273 | - A file foobar.c was moved to foo.c without using :hg:`rename`. | |
274 | Afterwards, it was edited slightly:: |
|
274 | Afterwards, it was edited slightly:: | |
275 |
|
275 | |||
276 | $ ls |
|
276 | $ ls | |
277 | foo.c |
|
277 | foo.c | |
278 | $ hg status |
|
278 | $ hg status | |
279 | ! foobar.c |
|
279 | ! foobar.c | |
280 | ? foo.c |
|
280 | ? foo.c | |
281 | $ hg addremove --similarity 90 |
|
281 | $ hg addremove --similarity 90 | |
282 | removing foobar.c |
|
282 | removing foobar.c | |
283 | adding foo.c |
|
283 | adding foo.c | |
284 | recording removal of foobar.c as rename to foo.c (94% similar) |
|
284 | recording removal of foobar.c as rename to foo.c (94% similar) | |
285 | $ hg status -C |
|
285 | $ hg status -C | |
286 | A foo.c |
|
286 | A foo.c | |
287 | foobar.c |
|
287 | foobar.c | |
288 | R foobar.c |
|
288 | R foobar.c | |
289 |
|
289 | |||
290 | Returns 0 if all files are successfully added. |
|
290 | Returns 0 if all files are successfully added. | |
291 | """ |
|
291 | """ | |
292 | try: |
|
292 | try: | |
293 | sim = float(opts.get('similarity') or 100) |
|
293 | sim = float(opts.get('similarity') or 100) | |
294 | except ValueError: |
|
294 | except ValueError: | |
295 | raise error.Abort(_('similarity must be a number')) |
|
295 | raise error.Abort(_('similarity must be a number')) | |
296 | if sim < 0 or sim > 100: |
|
296 | if sim < 0 or sim > 100: | |
297 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
297 | raise error.Abort(_('similarity must be between 0 and 100')) | |
298 | matcher = scmutil.match(repo[None], pats, opts) |
|
298 | matcher = scmutil.match(repo[None], pats, opts) | |
299 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) |
|
299 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) | |
300 |
|
300 | |||
301 | @command('^annotate|blame', |
|
301 | @command('^annotate|blame', | |
302 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
302 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
303 | ('', 'follow', None, |
|
303 | ('', 'follow', None, | |
304 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
304 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
305 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
305 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
306 | ('a', 'text', None, _('treat all files as text')), |
|
306 | ('a', 'text', None, _('treat all files as text')), | |
307 | ('u', 'user', None, _('list the author (long with -v)')), |
|
307 | ('u', 'user', None, _('list the author (long with -v)')), | |
308 | ('f', 'file', None, _('list the filename')), |
|
308 | ('f', 'file', None, _('list the filename')), | |
309 | ('d', 'date', None, _('list the date (short with -q)')), |
|
309 | ('d', 'date', None, _('list the date (short with -q)')), | |
310 | ('n', 'number', None, _('list the revision number (default)')), |
|
310 | ('n', 'number', None, _('list the revision number (default)')), | |
311 | ('c', 'changeset', None, _('list the changeset')), |
|
311 | ('c', 'changeset', None, _('list the changeset')), | |
312 | ('l', 'line-number', None, _('show line number at the first appearance')) |
|
312 | ('l', 'line-number', None, _('show line number at the first appearance')) | |
313 | ] + diffwsopts + walkopts + formatteropts, |
|
313 | ] + diffwsopts + walkopts + formatteropts, | |
314 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), |
|
314 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), | |
315 | inferrepo=True) |
|
315 | inferrepo=True) | |
316 | def annotate(ui, repo, *pats, **opts): |
|
316 | def annotate(ui, repo, *pats, **opts): | |
317 | """show changeset information by line for each file |
|
317 | """show changeset information by line for each file | |
318 |
|
318 | |||
319 | List changes in files, showing the revision id responsible for |
|
319 | List changes in files, showing the revision id responsible for | |
320 | each line |
|
320 | each line | |
321 |
|
321 | |||
322 | This command is useful for discovering when a change was made and |
|
322 | This command is useful for discovering when a change was made and | |
323 | by whom. |
|
323 | by whom. | |
324 |
|
324 | |||
325 | Without the -a/--text option, annotate will avoid processing files |
|
325 | Without the -a/--text option, annotate will avoid processing files | |
326 | it detects as binary. With -a, annotate will annotate the file |
|
326 | it detects as binary. With -a, annotate will annotate the file | |
327 | anyway, although the results will probably be neither useful |
|
327 | anyway, although the results will probably be neither useful | |
328 | nor desirable. |
|
328 | nor desirable. | |
329 |
|
329 | |||
330 | Returns 0 on success. |
|
330 | Returns 0 on success. | |
331 | """ |
|
331 | """ | |
332 | if not pats: |
|
332 | if not pats: | |
333 | raise error.Abort(_('at least one filename or pattern is required')) |
|
333 | raise error.Abort(_('at least one filename or pattern is required')) | |
334 |
|
334 | |||
335 | if opts.get('follow'): |
|
335 | if opts.get('follow'): | |
336 | # --follow is deprecated and now just an alias for -f/--file |
|
336 | # --follow is deprecated and now just an alias for -f/--file | |
337 | # to mimic the behavior of Mercurial before version 1.5 |
|
337 | # to mimic the behavior of Mercurial before version 1.5 | |
338 | opts['file'] = True |
|
338 | opts['file'] = True | |
339 |
|
339 | |||
340 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
340 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
341 |
|
341 | |||
342 | fm = ui.formatter('annotate', opts) |
|
342 | fm = ui.formatter('annotate', opts) | |
343 | if ui.quiet: |
|
343 | if ui.quiet: | |
344 | datefunc = util.shortdate |
|
344 | datefunc = util.shortdate | |
345 | else: |
|
345 | else: | |
346 | datefunc = util.datestr |
|
346 | datefunc = util.datestr | |
347 | if ctx.rev() is None: |
|
347 | if ctx.rev() is None: | |
348 | def hexfn(node): |
|
348 | def hexfn(node): | |
349 | if node is None: |
|
349 | if node is None: | |
350 | return None |
|
350 | return None | |
351 | else: |
|
351 | else: | |
352 | return fm.hexfunc(node) |
|
352 | return fm.hexfunc(node) | |
353 | if opts.get('changeset'): |
|
353 | if opts.get('changeset'): | |
354 | # omit "+" suffix which is appended to node hex |
|
354 | # omit "+" suffix which is appended to node hex | |
355 | def formatrev(rev): |
|
355 | def formatrev(rev): | |
356 | if rev is None: |
|
356 | if rev is None: | |
357 | return '%d' % ctx.p1().rev() |
|
357 | return '%d' % ctx.p1().rev() | |
358 | else: |
|
358 | else: | |
359 | return '%d' % rev |
|
359 | return '%d' % rev | |
360 | else: |
|
360 | else: | |
361 | def formatrev(rev): |
|
361 | def formatrev(rev): | |
362 | if rev is None: |
|
362 | if rev is None: | |
363 | return '%d+' % ctx.p1().rev() |
|
363 | return '%d+' % ctx.p1().rev() | |
364 | else: |
|
364 | else: | |
365 | return '%d ' % rev |
|
365 | return '%d ' % rev | |
366 | def formathex(hex): |
|
366 | def formathex(hex): | |
367 | if hex is None: |
|
367 | if hex is None: | |
368 | return '%s+' % fm.hexfunc(ctx.p1().node()) |
|
368 | return '%s+' % fm.hexfunc(ctx.p1().node()) | |
369 | else: |
|
369 | else: | |
370 | return '%s ' % hex |
|
370 | return '%s ' % hex | |
371 | else: |
|
371 | else: | |
372 | hexfn = fm.hexfunc |
|
372 | hexfn = fm.hexfunc | |
373 | formatrev = formathex = str |
|
373 | formatrev = formathex = str | |
374 |
|
374 | |||
375 | opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser), |
|
375 | opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser), | |
376 | ('number', ' ', lambda x: x[0].rev(), formatrev), |
|
376 | ('number', ' ', lambda x: x[0].rev(), formatrev), | |
377 | ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex), |
|
377 | ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex), | |
378 | ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)), |
|
378 | ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)), | |
379 | ('file', ' ', lambda x: x[0].path(), str), |
|
379 | ('file', ' ', lambda x: x[0].path(), str), | |
380 | ('line_number', ':', lambda x: x[1], str), |
|
380 | ('line_number', ':', lambda x: x[1], str), | |
381 | ] |
|
381 | ] | |
382 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} |
|
382 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} | |
383 |
|
383 | |||
384 | if (not opts.get('user') and not opts.get('changeset') |
|
384 | if (not opts.get('user') and not opts.get('changeset') | |
385 | and not opts.get('date') and not opts.get('file')): |
|
385 | and not opts.get('date') and not opts.get('file')): | |
386 | opts['number'] = True |
|
386 | opts['number'] = True | |
387 |
|
387 | |||
388 | linenumber = opts.get('line_number') is not None |
|
388 | linenumber = opts.get('line_number') is not None | |
389 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
389 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
390 | raise error.Abort(_('at least one of -n/-c is required for -l')) |
|
390 | raise error.Abort(_('at least one of -n/-c is required for -l')) | |
391 |
|
391 | |||
392 | if fm: |
|
392 | if fm: | |
393 | def makefunc(get, fmt): |
|
393 | def makefunc(get, fmt): | |
394 | return get |
|
394 | return get | |
395 | else: |
|
395 | else: | |
396 | def makefunc(get, fmt): |
|
396 | def makefunc(get, fmt): | |
397 | return lambda x: fmt(get(x)) |
|
397 | return lambda x: fmt(get(x)) | |
398 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap |
|
398 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap | |
399 | if opts.get(op)] |
|
399 | if opts.get(op)] | |
400 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
400 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
401 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap |
|
401 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap | |
402 | if opts.get(op)) |
|
402 | if opts.get(op)) | |
403 |
|
403 | |||
404 | def bad(x, y): |
|
404 | def bad(x, y): | |
405 | raise error.Abort("%s: %s" % (x, y)) |
|
405 | raise error.Abort("%s: %s" % (x, y)) | |
406 |
|
406 | |||
407 | m = scmutil.match(ctx, pats, opts, badfn=bad) |
|
407 | m = scmutil.match(ctx, pats, opts, badfn=bad) | |
408 |
|
408 | |||
409 | follow = not opts.get('no_follow') |
|
409 | follow = not opts.get('no_follow') | |
410 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
|
410 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', | |
411 | whitespace=True) |
|
411 | whitespace=True) | |
412 | for abs in ctx.walk(m): |
|
412 | for abs in ctx.walk(m): | |
413 | fctx = ctx[abs] |
|
413 | fctx = ctx[abs] | |
414 | if not opts.get('text') and util.binary(fctx.data()): |
|
414 | if not opts.get('text') and util.binary(fctx.data()): | |
415 | fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
415 | fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) | |
416 | continue |
|
416 | continue | |
417 |
|
417 | |||
418 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
418 | lines = fctx.annotate(follow=follow, linenumber=linenumber, | |
419 | diffopts=diffopts) |
|
419 | diffopts=diffopts) | |
420 | formats = [] |
|
420 | formats = [] | |
421 | pieces = [] |
|
421 | pieces = [] | |
422 |
|
422 | |||
423 | for f, sep in funcmap: |
|
423 | for f, sep in funcmap: | |
424 | l = [f(n) for n, dummy in lines] |
|
424 | l = [f(n) for n, dummy in lines] | |
425 | if l: |
|
425 | if l: | |
426 | if fm: |
|
426 | if fm: | |
427 | formats.append(['%s' for x in l]) |
|
427 | formats.append(['%s' for x in l]) | |
428 | else: |
|
428 | else: | |
429 | sizes = [encoding.colwidth(x) for x in l] |
|
429 | sizes = [encoding.colwidth(x) for x in l] | |
430 | ml = max(sizes) |
|
430 | ml = max(sizes) | |
431 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) |
|
431 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) | |
432 | pieces.append(l) |
|
432 | pieces.append(l) | |
433 |
|
433 | |||
434 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): |
|
434 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): | |
435 | fm.startitem() |
|
435 | fm.startitem() | |
436 | fm.write(fields, "".join(f), *p) |
|
436 | fm.write(fields, "".join(f), *p) | |
437 | fm.write('line', ": %s", l[1]) |
|
437 | fm.write('line', ": %s", l[1]) | |
438 |
|
438 | |||
439 | if lines and not lines[-1][1].endswith('\n'): |
|
439 | if lines and not lines[-1][1].endswith('\n'): | |
440 | fm.plain('\n') |
|
440 | fm.plain('\n') | |
441 |
|
441 | |||
442 | fm.end() |
|
442 | fm.end() | |
443 |
|
443 | |||
444 | @command('archive', |
|
444 | @command('archive', | |
445 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
445 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
446 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
446 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
447 | _('PREFIX')), |
|
447 | _('PREFIX')), | |
448 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
448 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
449 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
449 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
450 | ] + subrepoopts + walkopts, |
|
450 | ] + subrepoopts + walkopts, | |
451 | _('[OPTION]... DEST')) |
|
451 | _('[OPTION]... DEST')) | |
452 | def archive(ui, repo, dest, **opts): |
|
452 | def archive(ui, repo, dest, **opts): | |
453 | '''create an unversioned archive of a repository revision |
|
453 | '''create an unversioned archive of a repository revision | |
454 |
|
454 | |||
455 | By default, the revision used is the parent of the working |
|
455 | By default, the revision used is the parent of the working | |
456 | directory; use -r/--rev to specify a different revision. |
|
456 | directory; use -r/--rev to specify a different revision. | |
457 |
|
457 | |||
458 | The archive type is automatically detected based on file |
|
458 | The archive type is automatically detected based on file | |
459 | extension (or override using -t/--type). |
|
459 | extension (or override using -t/--type). | |
460 |
|
460 | |||
461 | .. container:: verbose |
|
461 | .. container:: verbose | |
462 |
|
462 | |||
463 | Examples: |
|
463 | Examples: | |
464 |
|
464 | |||
465 | - create a zip file containing the 1.0 release:: |
|
465 | - create a zip file containing the 1.0 release:: | |
466 |
|
466 | |||
467 | hg archive -r 1.0 project-1.0.zip |
|
467 | hg archive -r 1.0 project-1.0.zip | |
468 |
|
468 | |||
469 | - create a tarball excluding .hg files:: |
|
469 | - create a tarball excluding .hg files:: | |
470 |
|
470 | |||
471 | hg archive project.tar.gz -X ".hg*" |
|
471 | hg archive project.tar.gz -X ".hg*" | |
472 |
|
472 | |||
473 | Valid types are: |
|
473 | Valid types are: | |
474 |
|
474 | |||
475 | :``files``: a directory full of files (default) |
|
475 | :``files``: a directory full of files (default) | |
476 | :``tar``: tar archive, uncompressed |
|
476 | :``tar``: tar archive, uncompressed | |
477 | :``tbz2``: tar archive, compressed using bzip2 |
|
477 | :``tbz2``: tar archive, compressed using bzip2 | |
478 | :``tgz``: tar archive, compressed using gzip |
|
478 | :``tgz``: tar archive, compressed using gzip | |
479 | :``uzip``: zip archive, uncompressed |
|
479 | :``uzip``: zip archive, uncompressed | |
480 | :``zip``: zip archive, compressed using deflate |
|
480 | :``zip``: zip archive, compressed using deflate | |
481 |
|
481 | |||
482 | The exact name of the destination archive or directory is given |
|
482 | The exact name of the destination archive or directory is given | |
483 | using a format string; see :hg:`help export` for details. |
|
483 | using a format string; see :hg:`help export` for details. | |
484 |
|
484 | |||
485 | Each member added to an archive file has a directory prefix |
|
485 | Each member added to an archive file has a directory prefix | |
486 | prepended. Use -p/--prefix to specify a format string for the |
|
486 | prepended. Use -p/--prefix to specify a format string for the | |
487 | prefix. The default is the basename of the archive, with suffixes |
|
487 | prefix. The default is the basename of the archive, with suffixes | |
488 | removed. |
|
488 | removed. | |
489 |
|
489 | |||
490 | Returns 0 on success. |
|
490 | Returns 0 on success. | |
491 | ''' |
|
491 | ''' | |
492 |
|
492 | |||
493 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
493 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
494 | if not ctx: |
|
494 | if not ctx: | |
495 | raise error.Abort(_('no working directory: please specify a revision')) |
|
495 | raise error.Abort(_('no working directory: please specify a revision')) | |
496 | node = ctx.node() |
|
496 | node = ctx.node() | |
497 | dest = cmdutil.makefilename(repo, dest, node) |
|
497 | dest = cmdutil.makefilename(repo, dest, node) | |
498 | if os.path.realpath(dest) == repo.root: |
|
498 | if os.path.realpath(dest) == repo.root: | |
499 | raise error.Abort(_('repository root cannot be destination')) |
|
499 | raise error.Abort(_('repository root cannot be destination')) | |
500 |
|
500 | |||
501 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
501 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
502 | prefix = opts.get('prefix') |
|
502 | prefix = opts.get('prefix') | |
503 |
|
503 | |||
504 | if dest == '-': |
|
504 | if dest == '-': | |
505 | if kind == 'files': |
|
505 | if kind == 'files': | |
506 | raise error.Abort(_('cannot archive plain files to stdout')) |
|
506 | raise error.Abort(_('cannot archive plain files to stdout')) | |
507 | dest = cmdutil.makefileobj(repo, dest) |
|
507 | dest = cmdutil.makefileobj(repo, dest) | |
508 | if not prefix: |
|
508 | if not prefix: | |
509 | prefix = os.path.basename(repo.root) + '-%h' |
|
509 | prefix = os.path.basename(repo.root) + '-%h' | |
510 |
|
510 | |||
511 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
511 | prefix = cmdutil.makefilename(repo, prefix, node) | |
512 | matchfn = scmutil.match(ctx, [], opts) |
|
512 | matchfn = scmutil.match(ctx, [], opts) | |
513 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
513 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
514 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
514 | matchfn, prefix, subrepos=opts.get('subrepos')) | |
515 |
|
515 | |||
516 | @command('backout', |
|
516 | @command('backout', | |
517 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
517 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
518 | ('', 'commit', None, _('commit if no conflicts were encountered')), |
|
518 | ('', 'commit', None, _('commit if no conflicts were encountered')), | |
519 | ('', 'parent', '', |
|
519 | ('', 'parent', '', | |
520 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
520 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
521 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
521 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
522 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
522 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
523 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
523 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
524 | _('[OPTION]... [-r] REV')) |
|
524 | _('[OPTION]... [-r] REV')) | |
525 | def backout(ui, repo, node=None, rev=None, commit=False, **opts): |
|
525 | def backout(ui, repo, node=None, rev=None, commit=False, **opts): | |
526 | '''reverse effect of earlier changeset |
|
526 | '''reverse effect of earlier changeset | |
527 |
|
527 | |||
528 | Prepare a new changeset with the effect of REV undone in the |
|
528 | Prepare a new changeset with the effect of REV undone in the | |
529 | current working directory. |
|
529 | current working directory. | |
530 |
|
530 | |||
531 | If REV is the parent of the working directory, then this new changeset |
|
531 | If REV is the parent of the working directory, then this new changeset | |
532 | is committed automatically. Otherwise, hg needs to merge the |
|
532 | is committed automatically. Otherwise, hg needs to merge the | |
533 | changes and the merged result is left uncommitted. |
|
533 | changes and the merged result is left uncommitted. | |
534 |
|
534 | |||
535 | .. note:: |
|
535 | .. note:: | |
536 |
|
536 | |||
537 | backout cannot be used to fix either an unwanted or |
|
537 | backout cannot be used to fix either an unwanted or | |
538 | incorrect merge. |
|
538 | incorrect merge. | |
539 |
|
539 | |||
540 | .. container:: verbose |
|
540 | .. container:: verbose | |
541 |
|
541 | |||
542 | Examples: |
|
542 | Examples: | |
543 |
|
543 | |||
544 | - Reverse the effect of the parent of the working directory. |
|
544 | - Reverse the effect of the parent of the working directory. | |
545 | This backout will be committed immediately:: |
|
545 | This backout will be committed immediately:: | |
546 |
|
546 | |||
547 | hg backout -r . |
|
547 | hg backout -r . | |
548 |
|
548 | |||
549 | - Reverse the effect of previous bad revision 23:: |
|
549 | - Reverse the effect of previous bad revision 23:: | |
550 |
|
550 | |||
551 | hg backout -r 23 |
|
551 | hg backout -r 23 | |
552 | hg commit -m "Backout revision 23" |
|
552 | hg commit -m "Backout revision 23" | |
553 |
|
553 | |||
554 | - Reverse the effect of previous bad revision 23 and |
|
554 | - Reverse the effect of previous bad revision 23 and | |
555 | commit the backout immediately:: |
|
555 | commit the backout immediately:: | |
556 |
|
556 | |||
557 | hg backout -r 23 --commit |
|
557 | hg backout -r 23 --commit | |
558 |
|
558 | |||
559 | By default, the pending changeset will have one parent, |
|
559 | By default, the pending changeset will have one parent, | |
560 | maintaining a linear history. With --merge, the pending |
|
560 | maintaining a linear history. With --merge, the pending | |
561 | changeset will instead have two parents: the old parent of the |
|
561 | changeset will instead have two parents: the old parent of the | |
562 | working directory and a new child of REV that simply undoes REV. |
|
562 | working directory and a new child of REV that simply undoes REV. | |
563 |
|
563 | |||
564 | Before version 1.7, the behavior without --merge was equivalent |
|
564 | Before version 1.7, the behavior without --merge was equivalent | |
565 | to specifying --merge followed by :hg:`update --clean .` to |
|
565 | to specifying --merge followed by :hg:`update --clean .` to | |
566 | cancel the merge and leave the child of REV as a head to be |
|
566 | cancel the merge and leave the child of REV as a head to be | |
567 | merged separately. |
|
567 | merged separately. | |
568 |
|
568 | |||
569 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
569 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
570 |
|
570 | |||
571 | See :hg:`help revert` for a way to restore files to the state |
|
571 | See :hg:`help revert` for a way to restore files to the state | |
572 | of another revision. |
|
572 | of another revision. | |
573 |
|
573 | |||
574 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
574 | Returns 0 on success, 1 if nothing to backout or there are unresolved | |
575 | files. |
|
575 | files. | |
576 | ''' |
|
576 | ''' | |
577 | if rev and node: |
|
577 | if rev and node: | |
578 | raise error.Abort(_("please specify just one revision")) |
|
578 | raise error.Abort(_("please specify just one revision")) | |
579 |
|
579 | |||
580 | if not rev: |
|
580 | if not rev: | |
581 | rev = node |
|
581 | rev = node | |
582 |
|
582 | |||
583 | if not rev: |
|
583 | if not rev: | |
584 | raise error.Abort(_("please specify a revision to backout")) |
|
584 | raise error.Abort(_("please specify a revision to backout")) | |
585 |
|
585 | |||
586 | date = opts.get('date') |
|
586 | date = opts.get('date') | |
587 | if date: |
|
587 | if date: | |
588 | opts['date'] = util.parsedate(date) |
|
588 | opts['date'] = util.parsedate(date) | |
589 |
|
589 | |||
590 | cmdutil.checkunfinished(repo) |
|
590 | cmdutil.checkunfinished(repo) | |
591 | cmdutil.bailifchanged(repo) |
|
591 | cmdutil.bailifchanged(repo) | |
592 | node = scmutil.revsingle(repo, rev).node() |
|
592 | node = scmutil.revsingle(repo, rev).node() | |
593 |
|
593 | |||
594 | op1, op2 = repo.dirstate.parents() |
|
594 | op1, op2 = repo.dirstate.parents() | |
595 | if not repo.changelog.isancestor(node, op1): |
|
595 | if not repo.changelog.isancestor(node, op1): | |
596 | raise error.Abort(_('cannot backout change that is not an ancestor')) |
|
596 | raise error.Abort(_('cannot backout change that is not an ancestor')) | |
597 |
|
597 | |||
598 | p1, p2 = repo.changelog.parents(node) |
|
598 | p1, p2 = repo.changelog.parents(node) | |
599 | if p1 == nullid: |
|
599 | if p1 == nullid: | |
600 | raise error.Abort(_('cannot backout a change with no parents')) |
|
600 | raise error.Abort(_('cannot backout a change with no parents')) | |
601 | if p2 != nullid: |
|
601 | if p2 != nullid: | |
602 | if not opts.get('parent'): |
|
602 | if not opts.get('parent'): | |
603 | raise error.Abort(_('cannot backout a merge changeset')) |
|
603 | raise error.Abort(_('cannot backout a merge changeset')) | |
604 | p = repo.lookup(opts['parent']) |
|
604 | p = repo.lookup(opts['parent']) | |
605 | if p not in (p1, p2): |
|
605 | if p not in (p1, p2): | |
606 | raise error.Abort(_('%s is not a parent of %s') % |
|
606 | raise error.Abort(_('%s is not a parent of %s') % | |
607 | (short(p), short(node))) |
|
607 | (short(p), short(node))) | |
608 | parent = p |
|
608 | parent = p | |
609 | else: |
|
609 | else: | |
610 | if opts.get('parent'): |
|
610 | if opts.get('parent'): | |
611 | raise error.Abort(_('cannot use --parent on non-merge changeset')) |
|
611 | raise error.Abort(_('cannot use --parent on non-merge changeset')) | |
612 | parent = p1 |
|
612 | parent = p1 | |
613 |
|
613 | |||
614 | # the backout should appear on the same branch |
|
614 | # the backout should appear on the same branch | |
615 | wlock = repo.wlock() |
|
615 | wlock = repo.wlock() | |
616 | try: |
|
616 | try: | |
617 | branch = repo.dirstate.branch() |
|
617 | branch = repo.dirstate.branch() | |
618 | bheads = repo.branchheads(branch) |
|
618 | bheads = repo.branchheads(branch) | |
619 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
619 | rctx = scmutil.revsingle(repo, hex(parent)) | |
620 | if not opts.get('merge') and op1 != node: |
|
620 | if not opts.get('merge') and op1 != node: | |
621 | dsguard = cmdutil.dirstateguard(repo, 'backout') |
|
621 | dsguard = cmdutil.dirstateguard(repo, 'backout') | |
622 | try: |
|
622 | try: | |
623 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
623 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
624 | 'backout') |
|
624 | 'backout') | |
625 | stats = mergemod.update(repo, parent, True, True, False, |
|
625 | stats = mergemod.update(repo, parent, True, True, False, | |
626 | node, False) |
|
626 | node, False) | |
627 | repo.setparents(op1, op2) |
|
627 | repo.setparents(op1, op2) | |
628 | dsguard.close() |
|
628 | dsguard.close() | |
629 | hg._showstats(repo, stats) |
|
629 | hg._showstats(repo, stats) | |
630 | if stats[3]: |
|
630 | if stats[3]: | |
631 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
631 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
632 | "file merges\n")) |
|
632 | "file merges\n")) | |
633 | return 1 |
|
633 | return 1 | |
634 | elif not commit: |
|
634 | elif not commit: | |
635 | msg = _("changeset %s backed out, " |
|
635 | msg = _("changeset %s backed out, " | |
636 | "don't forget to commit.\n") |
|
636 | "don't forget to commit.\n") | |
637 | ui.status(msg % short(node)) |
|
637 | ui.status(msg % short(node)) | |
638 | return 0 |
|
638 | return 0 | |
639 | finally: |
|
639 | finally: | |
640 | ui.setconfig('ui', 'forcemerge', '', '') |
|
640 | ui.setconfig('ui', 'forcemerge', '', '') | |
641 | lockmod.release(dsguard) |
|
641 | lockmod.release(dsguard) | |
642 | else: |
|
642 | else: | |
643 | hg.clean(repo, node, show_stats=False) |
|
643 | hg.clean(repo, node, show_stats=False) | |
644 | repo.dirstate.setbranch(branch) |
|
644 | repo.dirstate.setbranch(branch) | |
645 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
645 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
646 |
|
646 | |||
647 |
|
647 | |||
648 | def commitfunc(ui, repo, message, match, opts): |
|
648 | def commitfunc(ui, repo, message, match, opts): | |
649 | editform = 'backout' |
|
649 | editform = 'backout' | |
650 | e = cmdutil.getcommiteditor(editform=editform, **opts) |
|
650 | e = cmdutil.getcommiteditor(editform=editform, **opts) | |
651 | if not message: |
|
651 | if not message: | |
652 | # we don't translate commit messages |
|
652 | # we don't translate commit messages | |
653 | message = "Backed out changeset %s" % short(node) |
|
653 | message = "Backed out changeset %s" % short(node) | |
654 | e = cmdutil.getcommiteditor(edit=True, editform=editform) |
|
654 | e = cmdutil.getcommiteditor(edit=True, editform=editform) | |
655 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
655 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
656 | match, editor=e) |
|
656 | match, editor=e) | |
657 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
657 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
658 | if not newnode: |
|
658 | if not newnode: | |
659 | ui.status(_("nothing changed\n")) |
|
659 | ui.status(_("nothing changed\n")) | |
660 | return 1 |
|
660 | return 1 | |
661 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
661 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
662 |
|
662 | |||
663 | def nice(node): |
|
663 | def nice(node): | |
664 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
664 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
665 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
665 | ui.status(_('changeset %s backs out changeset %s\n') % | |
666 | (nice(repo.changelog.tip()), nice(node))) |
|
666 | (nice(repo.changelog.tip()), nice(node))) | |
667 | if opts.get('merge') and op1 != node: |
|
667 | if opts.get('merge') and op1 != node: | |
668 | hg.clean(repo, op1, show_stats=False) |
|
668 | hg.clean(repo, op1, show_stats=False) | |
669 | ui.status(_('merging with changeset %s\n') |
|
669 | ui.status(_('merging with changeset %s\n') | |
670 | % nice(repo.changelog.tip())) |
|
670 | % nice(repo.changelog.tip())) | |
671 | try: |
|
671 | try: | |
672 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
672 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
673 | 'backout') |
|
673 | 'backout') | |
674 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
674 | return hg.merge(repo, hex(repo.changelog.tip())) | |
675 | finally: |
|
675 | finally: | |
676 | ui.setconfig('ui', 'forcemerge', '', '') |
|
676 | ui.setconfig('ui', 'forcemerge', '', '') | |
677 | finally: |
|
677 | finally: | |
678 | wlock.release() |
|
678 | wlock.release() | |
679 | return 0 |
|
679 | return 0 | |
680 |
|
680 | |||
681 | @command('bisect', |
|
681 | @command('bisect', | |
682 | [('r', 'reset', False, _('reset bisect state')), |
|
682 | [('r', 'reset', False, _('reset bisect state')), | |
683 | ('g', 'good', False, _('mark changeset good')), |
|
683 | ('g', 'good', False, _('mark changeset good')), | |
684 | ('b', 'bad', False, _('mark changeset bad')), |
|
684 | ('b', 'bad', False, _('mark changeset bad')), | |
685 | ('s', 'skip', False, _('skip testing changeset')), |
|
685 | ('s', 'skip', False, _('skip testing changeset')), | |
686 | ('e', 'extend', False, _('extend the bisect range')), |
|
686 | ('e', 'extend', False, _('extend the bisect range')), | |
687 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
687 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
688 | ('U', 'noupdate', False, _('do not update to target'))], |
|
688 | ('U', 'noupdate', False, _('do not update to target'))], | |
689 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
689 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
690 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
690 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
691 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
691 | reset=None, good=None, bad=None, skip=None, extend=None, | |
692 | noupdate=None): |
|
692 | noupdate=None): | |
693 | """subdivision search of changesets |
|
693 | """subdivision search of changesets | |
694 |
|
694 | |||
695 | This command helps to find changesets which introduce problems. To |
|
695 | This command helps to find changesets which introduce problems. To | |
696 | use, mark the earliest changeset you know exhibits the problem as |
|
696 | use, mark the earliest changeset you know exhibits the problem as | |
697 | bad, then mark the latest changeset which is free from the problem |
|
697 | bad, then mark the latest changeset which is free from the problem | |
698 | as good. Bisect will update your working directory to a revision |
|
698 | as good. Bisect will update your working directory to a revision | |
699 | for testing (unless the -U/--noupdate option is specified). Once |
|
699 | for testing (unless the -U/--noupdate option is specified). Once | |
700 | you have performed tests, mark the working directory as good or |
|
700 | you have performed tests, mark the working directory as good or | |
701 | bad, and bisect will either update to another candidate changeset |
|
701 | bad, and bisect will either update to another candidate changeset | |
702 | or announce that it has found the bad revision. |
|
702 | or announce that it has found the bad revision. | |
703 |
|
703 | |||
704 | As a shortcut, you can also use the revision argument to mark a |
|
704 | As a shortcut, you can also use the revision argument to mark a | |
705 | revision as good or bad without checking it out first. |
|
705 | revision as good or bad without checking it out first. | |
706 |
|
706 | |||
707 | If you supply a command, it will be used for automatic bisection. |
|
707 | If you supply a command, it will be used for automatic bisection. | |
708 | The environment variable HG_NODE will contain the ID of the |
|
708 | The environment variable HG_NODE will contain the ID of the | |
709 | changeset being tested. The exit status of the command will be |
|
709 | changeset being tested. The exit status of the command will be | |
710 | used to mark revisions as good or bad: status 0 means good, 125 |
|
710 | used to mark revisions as good or bad: status 0 means good, 125 | |
711 | means to skip the revision, 127 (command not found) will abort the |
|
711 | means to skip the revision, 127 (command not found) will abort the | |
712 | bisection, and any other non-zero exit status means the revision |
|
712 | bisection, and any other non-zero exit status means the revision | |
713 | is bad. |
|
713 | is bad. | |
714 |
|
714 | |||
715 | .. container:: verbose |
|
715 | .. container:: verbose | |
716 |
|
716 | |||
717 | Some examples: |
|
717 | Some examples: | |
718 |
|
718 | |||
719 | - start a bisection with known bad revision 34, and good revision 12:: |
|
719 | - start a bisection with known bad revision 34, and good revision 12:: | |
720 |
|
720 | |||
721 | hg bisect --bad 34 |
|
721 | hg bisect --bad 34 | |
722 | hg bisect --good 12 |
|
722 | hg bisect --good 12 | |
723 |
|
723 | |||
724 | - advance the current bisection by marking current revision as good or |
|
724 | - advance the current bisection by marking current revision as good or | |
725 | bad:: |
|
725 | bad:: | |
726 |
|
726 | |||
727 | hg bisect --good |
|
727 | hg bisect --good | |
728 | hg bisect --bad |
|
728 | hg bisect --bad | |
729 |
|
729 | |||
730 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
730 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
731 | that revision is not usable because of another issue):: |
|
731 | that revision is not usable because of another issue):: | |
732 |
|
732 | |||
733 | hg bisect --skip |
|
733 | hg bisect --skip | |
734 | hg bisect --skip 23 |
|
734 | hg bisect --skip 23 | |
735 |
|
735 | |||
736 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
736 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
737 |
|
737 | |||
738 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
738 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
739 |
|
739 | |||
740 | - forget the current bisection:: |
|
740 | - forget the current bisection:: | |
741 |
|
741 | |||
742 | hg bisect --reset |
|
742 | hg bisect --reset | |
743 |
|
743 | |||
744 | - use 'make && make tests' to automatically find the first broken |
|
744 | - use 'make && make tests' to automatically find the first broken | |
745 | revision:: |
|
745 | revision:: | |
746 |
|
746 | |||
747 | hg bisect --reset |
|
747 | hg bisect --reset | |
748 | hg bisect --bad 34 |
|
748 | hg bisect --bad 34 | |
749 | hg bisect --good 12 |
|
749 | hg bisect --good 12 | |
750 | hg bisect --command "make && make tests" |
|
750 | hg bisect --command "make && make tests" | |
751 |
|
751 | |||
752 | - see all changesets whose states are already known in the current |
|
752 | - see all changesets whose states are already known in the current | |
753 | bisection:: |
|
753 | bisection:: | |
754 |
|
754 | |||
755 | hg log -r "bisect(pruned)" |
|
755 | hg log -r "bisect(pruned)" | |
756 |
|
756 | |||
757 | - see the changeset currently being bisected (especially useful |
|
757 | - see the changeset currently being bisected (especially useful | |
758 | if running with -U/--noupdate):: |
|
758 | if running with -U/--noupdate):: | |
759 |
|
759 | |||
760 | hg log -r "bisect(current)" |
|
760 | hg log -r "bisect(current)" | |
761 |
|
761 | |||
762 | - see all changesets that took part in the current bisection:: |
|
762 | - see all changesets that took part in the current bisection:: | |
763 |
|
763 | |||
764 | hg log -r "bisect(range)" |
|
764 | hg log -r "bisect(range)" | |
765 |
|
765 | |||
766 | - you can even get a nice graph:: |
|
766 | - you can even get a nice graph:: | |
767 |
|
767 | |||
768 | hg log --graph -r "bisect(range)" |
|
768 | hg log --graph -r "bisect(range)" | |
769 |
|
769 | |||
770 | See :hg:`help revsets` for more about the `bisect()` keyword. |
|
770 | See :hg:`help revsets` for more about the `bisect()` keyword. | |
771 |
|
771 | |||
772 | Returns 0 on success. |
|
772 | Returns 0 on success. | |
773 | """ |
|
773 | """ | |
774 | def extendbisectrange(nodes, good): |
|
774 | def extendbisectrange(nodes, good): | |
775 | # bisect is incomplete when it ends on a merge node and |
|
775 | # bisect is incomplete when it ends on a merge node and | |
776 | # one of the parent was not checked. |
|
776 | # one of the parent was not checked. | |
777 | parents = repo[nodes[0]].parents() |
|
777 | parents = repo[nodes[0]].parents() | |
778 | if len(parents) > 1: |
|
778 | if len(parents) > 1: | |
779 | if good: |
|
779 | if good: | |
780 | side = state['bad'] |
|
780 | side = state['bad'] | |
781 | else: |
|
781 | else: | |
782 | side = state['good'] |
|
782 | side = state['good'] | |
783 | num = len(set(i.node() for i in parents) & set(side)) |
|
783 | num = len(set(i.node() for i in parents) & set(side)) | |
784 | if num == 1: |
|
784 | if num == 1: | |
785 | return parents[0].ancestor(parents[1]) |
|
785 | return parents[0].ancestor(parents[1]) | |
786 | return None |
|
786 | return None | |
787 |
|
787 | |||
788 | def print_result(nodes, good): |
|
788 | def print_result(nodes, good): | |
789 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
789 | displayer = cmdutil.show_changeset(ui, repo, {}) | |
790 | if len(nodes) == 1: |
|
790 | if len(nodes) == 1: | |
791 | # narrowed it down to a single revision |
|
791 | # narrowed it down to a single revision | |
792 | if good: |
|
792 | if good: | |
793 | ui.write(_("The first good revision is:\n")) |
|
793 | ui.write(_("The first good revision is:\n")) | |
794 | else: |
|
794 | else: | |
795 | ui.write(_("The first bad revision is:\n")) |
|
795 | ui.write(_("The first bad revision is:\n")) | |
796 | displayer.show(repo[nodes[0]]) |
|
796 | displayer.show(repo[nodes[0]]) | |
797 | extendnode = extendbisectrange(nodes, good) |
|
797 | extendnode = extendbisectrange(nodes, good) | |
798 | if extendnode is not None: |
|
798 | if extendnode is not None: | |
799 | ui.write(_('Not all ancestors of this changeset have been' |
|
799 | ui.write(_('Not all ancestors of this changeset have been' | |
800 | ' checked.\nUse bisect --extend to continue the ' |
|
800 | ' checked.\nUse bisect --extend to continue the ' | |
801 | 'bisection from\nthe common ancestor, %s.\n') |
|
801 | 'bisection from\nthe common ancestor, %s.\n') | |
802 | % extendnode) |
|
802 | % extendnode) | |
803 | else: |
|
803 | else: | |
804 | # multiple possible revisions |
|
804 | # multiple possible revisions | |
805 | if good: |
|
805 | if good: | |
806 | ui.write(_("Due to skipped revisions, the first " |
|
806 | ui.write(_("Due to skipped revisions, the first " | |
807 | "good revision could be any of:\n")) |
|
807 | "good revision could be any of:\n")) | |
808 | else: |
|
808 | else: | |
809 | ui.write(_("Due to skipped revisions, the first " |
|
809 | ui.write(_("Due to skipped revisions, the first " | |
810 | "bad revision could be any of:\n")) |
|
810 | "bad revision could be any of:\n")) | |
811 | for n in nodes: |
|
811 | for n in nodes: | |
812 | displayer.show(repo[n]) |
|
812 | displayer.show(repo[n]) | |
813 | displayer.close() |
|
813 | displayer.close() | |
814 |
|
814 | |||
815 | def check_state(state, interactive=True): |
|
815 | def check_state(state, interactive=True): | |
816 | if not state['good'] or not state['bad']: |
|
816 | if not state['good'] or not state['bad']: | |
817 | if (good or bad or skip or reset) and interactive: |
|
817 | if (good or bad or skip or reset) and interactive: | |
818 | return |
|
818 | return | |
819 | if not state['good']: |
|
819 | if not state['good']: | |
820 | raise error.Abort(_('cannot bisect (no known good revisions)')) |
|
820 | raise error.Abort(_('cannot bisect (no known good revisions)')) | |
821 | else: |
|
821 | else: | |
822 | raise error.Abort(_('cannot bisect (no known bad revisions)')) |
|
822 | raise error.Abort(_('cannot bisect (no known bad revisions)')) | |
823 | return True |
|
823 | return True | |
824 |
|
824 | |||
825 | # backward compatibility |
|
825 | # backward compatibility | |
826 | if rev in "good bad reset init".split(): |
|
826 | if rev in "good bad reset init".split(): | |
827 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
827 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
828 | cmd, rev, extra = rev, extra, None |
|
828 | cmd, rev, extra = rev, extra, None | |
829 | if cmd == "good": |
|
829 | if cmd == "good": | |
830 | good = True |
|
830 | good = True | |
831 | elif cmd == "bad": |
|
831 | elif cmd == "bad": | |
832 | bad = True |
|
832 | bad = True | |
833 | else: |
|
833 | else: | |
834 | reset = True |
|
834 | reset = True | |
835 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: |
|
835 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: | |
836 | raise error.Abort(_('incompatible arguments')) |
|
836 | raise error.Abort(_('incompatible arguments')) | |
837 |
|
837 | |||
838 | cmdutil.checkunfinished(repo) |
|
838 | cmdutil.checkunfinished(repo) | |
839 |
|
839 | |||
840 | if reset: |
|
840 | if reset: | |
841 | p = repo.join("bisect.state") |
|
841 | p = repo.join("bisect.state") | |
842 | if os.path.exists(p): |
|
842 | if os.path.exists(p): | |
843 | os.unlink(p) |
|
843 | os.unlink(p) | |
844 | return |
|
844 | return | |
845 |
|
845 | |||
846 | state = hbisect.load_state(repo) |
|
846 | state = hbisect.load_state(repo) | |
847 |
|
847 | |||
848 | if command: |
|
848 | if command: | |
849 | changesets = 1 |
|
849 | changesets = 1 | |
850 | if noupdate: |
|
850 | if noupdate: | |
851 | try: |
|
851 | try: | |
852 | node = state['current'][0] |
|
852 | node = state['current'][0] | |
853 | except LookupError: |
|
853 | except LookupError: | |
854 | raise error.Abort(_('current bisect revision is unknown - ' |
|
854 | raise error.Abort(_('current bisect revision is unknown - ' | |
855 | 'start a new bisect to fix')) |
|
855 | 'start a new bisect to fix')) | |
856 | else: |
|
856 | else: | |
857 | node, p2 = repo.dirstate.parents() |
|
857 | node, p2 = repo.dirstate.parents() | |
858 | if p2 != nullid: |
|
858 | if p2 != nullid: | |
859 | raise error.Abort(_('current bisect revision is a merge')) |
|
859 | raise error.Abort(_('current bisect revision is a merge')) | |
860 | try: |
|
860 | try: | |
861 | while changesets: |
|
861 | while changesets: | |
862 | # update state |
|
862 | # update state | |
863 | state['current'] = [node] |
|
863 | state['current'] = [node] | |
864 | hbisect.save_state(repo, state) |
|
864 | hbisect.save_state(repo, state) | |
865 | status = ui.system(command, environ={'HG_NODE': hex(node)}) |
|
865 | status = ui.system(command, environ={'HG_NODE': hex(node)}) | |
866 | if status == 125: |
|
866 | if status == 125: | |
867 | transition = "skip" |
|
867 | transition = "skip" | |
868 | elif status == 0: |
|
868 | elif status == 0: | |
869 | transition = "good" |
|
869 | transition = "good" | |
870 | # status < 0 means process was killed |
|
870 | # status < 0 means process was killed | |
871 | elif status == 127: |
|
871 | elif status == 127: | |
872 | raise error.Abort(_("failed to execute %s") % command) |
|
872 | raise error.Abort(_("failed to execute %s") % command) | |
873 | elif status < 0: |
|
873 | elif status < 0: | |
874 | raise error.Abort(_("%s killed") % command) |
|
874 | raise error.Abort(_("%s killed") % command) | |
875 | else: |
|
875 | else: | |
876 | transition = "bad" |
|
876 | transition = "bad" | |
877 | ctx = scmutil.revsingle(repo, rev, node) |
|
877 | ctx = scmutil.revsingle(repo, rev, node) | |
878 | rev = None # clear for future iterations |
|
878 | rev = None # clear for future iterations | |
879 | state[transition].append(ctx.node()) |
|
879 | state[transition].append(ctx.node()) | |
880 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
880 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
881 | check_state(state, interactive=False) |
|
881 | check_state(state, interactive=False) | |
882 | # bisect |
|
882 | # bisect | |
883 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) |
|
883 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) | |
884 | # update to next check |
|
884 | # update to next check | |
885 | node = nodes[0] |
|
885 | node = nodes[0] | |
886 | if not noupdate: |
|
886 | if not noupdate: | |
887 | cmdutil.bailifchanged(repo) |
|
887 | cmdutil.bailifchanged(repo) | |
888 | hg.clean(repo, node, show_stats=False) |
|
888 | hg.clean(repo, node, show_stats=False) | |
889 | finally: |
|
889 | finally: | |
890 | state['current'] = [node] |
|
890 | state['current'] = [node] | |
891 | hbisect.save_state(repo, state) |
|
891 | hbisect.save_state(repo, state) | |
892 | print_result(nodes, bgood) |
|
892 | print_result(nodes, bgood) | |
893 | return |
|
893 | return | |
894 |
|
894 | |||
895 | # update state |
|
895 | # update state | |
896 |
|
896 | |||
897 | if rev: |
|
897 | if rev: | |
898 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
898 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
899 | else: |
|
899 | else: | |
900 | nodes = [repo.lookup('.')] |
|
900 | nodes = [repo.lookup('.')] | |
901 |
|
901 | |||
902 | if good or bad or skip: |
|
902 | if good or bad or skip: | |
903 | if good: |
|
903 | if good: | |
904 | state['good'] += nodes |
|
904 | state['good'] += nodes | |
905 | elif bad: |
|
905 | elif bad: | |
906 | state['bad'] += nodes |
|
906 | state['bad'] += nodes | |
907 | elif skip: |
|
907 | elif skip: | |
908 | state['skip'] += nodes |
|
908 | state['skip'] += nodes | |
909 | hbisect.save_state(repo, state) |
|
909 | hbisect.save_state(repo, state) | |
910 |
|
910 | |||
911 | if not check_state(state): |
|
911 | if not check_state(state): | |
912 | return |
|
912 | return | |
913 |
|
913 | |||
914 | # actually bisect |
|
914 | # actually bisect | |
915 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
915 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) | |
916 | if extend: |
|
916 | if extend: | |
917 | if not changesets: |
|
917 | if not changesets: | |
918 | extendnode = extendbisectrange(nodes, good) |
|
918 | extendnode = extendbisectrange(nodes, good) | |
919 | if extendnode is not None: |
|
919 | if extendnode is not None: | |
920 | ui.write(_("Extending search to changeset %d:%s\n") |
|
920 | ui.write(_("Extending search to changeset %d:%s\n") | |
921 | % (extendnode.rev(), extendnode)) |
|
921 | % (extendnode.rev(), extendnode)) | |
922 | state['current'] = [extendnode.node()] |
|
922 | state['current'] = [extendnode.node()] | |
923 | hbisect.save_state(repo, state) |
|
923 | hbisect.save_state(repo, state) | |
924 | if noupdate: |
|
924 | if noupdate: | |
925 | return |
|
925 | return | |
926 | cmdutil.bailifchanged(repo) |
|
926 | cmdutil.bailifchanged(repo) | |
927 | return hg.clean(repo, extendnode.node()) |
|
927 | return hg.clean(repo, extendnode.node()) | |
928 | raise error.Abort(_("nothing to extend")) |
|
928 | raise error.Abort(_("nothing to extend")) | |
929 |
|
929 | |||
930 | if changesets == 0: |
|
930 | if changesets == 0: | |
931 | print_result(nodes, good) |
|
931 | print_result(nodes, good) | |
932 | else: |
|
932 | else: | |
933 | assert len(nodes) == 1 # only a single node can be tested next |
|
933 | assert len(nodes) == 1 # only a single node can be tested next | |
934 | node = nodes[0] |
|
934 | node = nodes[0] | |
935 | # compute the approximate number of remaining tests |
|
935 | # compute the approximate number of remaining tests | |
936 | tests, size = 0, 2 |
|
936 | tests, size = 0, 2 | |
937 | while size <= changesets: |
|
937 | while size <= changesets: | |
938 | tests, size = tests + 1, size * 2 |
|
938 | tests, size = tests + 1, size * 2 | |
939 | rev = repo.changelog.rev(node) |
|
939 | rev = repo.changelog.rev(node) | |
940 | ui.write(_("Testing changeset %d:%s " |
|
940 | ui.write(_("Testing changeset %d:%s " | |
941 | "(%d changesets remaining, ~%d tests)\n") |
|
941 | "(%d changesets remaining, ~%d tests)\n") | |
942 | % (rev, short(node), changesets, tests)) |
|
942 | % (rev, short(node), changesets, tests)) | |
943 | state['current'] = [node] |
|
943 | state['current'] = [node] | |
944 | hbisect.save_state(repo, state) |
|
944 | hbisect.save_state(repo, state) | |
945 | if not noupdate: |
|
945 | if not noupdate: | |
946 | cmdutil.bailifchanged(repo) |
|
946 | cmdutil.bailifchanged(repo) | |
947 | return hg.clean(repo, node) |
|
947 | return hg.clean(repo, node) | |
948 |
|
948 | |||
949 | @command('bookmarks|bookmark', |
|
949 | @command('bookmarks|bookmark', | |
950 | [('f', 'force', False, _('force')), |
|
950 | [('f', 'force', False, _('force')), | |
951 | ('r', 'rev', '', _('revision'), _('REV')), |
|
951 | ('r', 'rev', '', _('revision'), _('REV')), | |
952 | ('d', 'delete', False, _('delete a given bookmark')), |
|
952 | ('d', 'delete', False, _('delete a given bookmark')), | |
953 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), |
|
953 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), | |
954 | ('i', 'inactive', False, _('mark a bookmark inactive')), |
|
954 | ('i', 'inactive', False, _('mark a bookmark inactive')), | |
955 | ] + formatteropts, |
|
955 | ] + formatteropts, | |
956 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
956 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
957 | def bookmark(ui, repo, *names, **opts): |
|
957 | def bookmark(ui, repo, *names, **opts): | |
958 | '''create a new bookmark or list existing bookmarks |
|
958 | '''create a new bookmark or list existing bookmarks | |
959 |
|
959 | |||
960 | Bookmarks are labels on changesets to help track lines of development. |
|
960 | Bookmarks are labels on changesets to help track lines of development. | |
961 | Bookmarks are unversioned and can be moved, renamed and deleted. |
|
961 | Bookmarks are unversioned and can be moved, renamed and deleted. | |
962 | Deleting or moving a bookmark has no effect on the associated changesets. |
|
962 | Deleting or moving a bookmark has no effect on the associated changesets. | |
963 |
|
963 | |||
964 | Creating or updating to a bookmark causes it to be marked as 'active'. |
|
964 | Creating or updating to a bookmark causes it to be marked as 'active'. | |
965 | The active bookmark is indicated with a '*'. |
|
965 | The active bookmark is indicated with a '*'. | |
966 | When a commit is made, the active bookmark will advance to the new commit. |
|
966 | When a commit is made, the active bookmark will advance to the new commit. | |
967 | A plain :hg:`update` will also advance an active bookmark, if possible. |
|
967 | A plain :hg:`update` will also advance an active bookmark, if possible. | |
968 | Updating away from a bookmark will cause it to be deactivated. |
|
968 | Updating away from a bookmark will cause it to be deactivated. | |
969 |
|
969 | |||
970 | Bookmarks can be pushed and pulled between repositories (see |
|
970 | Bookmarks can be pushed and pulled between repositories (see | |
971 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
|
971 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has | |
972 | diverged, a new 'divergent bookmark' of the form 'name@path' will |
|
972 | diverged, a new 'divergent bookmark' of the form 'name@path' will | |
973 | be created. Using :hg:`merge` will resolve the divergence. |
|
973 | be created. Using :hg:`merge` will resolve the divergence. | |
974 |
|
974 | |||
975 | A bookmark named '@' has the special property that :hg:`clone` will |
|
975 | A bookmark named '@' has the special property that :hg:`clone` will | |
976 | check it out by default if it exists. |
|
976 | check it out by default if it exists. | |
977 |
|
977 | |||
978 | .. container:: verbose |
|
978 | .. container:: verbose | |
979 |
|
979 | |||
980 | Examples: |
|
980 | Examples: | |
981 |
|
981 | |||
982 | - create an active bookmark for a new line of development:: |
|
982 | - create an active bookmark for a new line of development:: | |
983 |
|
983 | |||
984 | hg book new-feature |
|
984 | hg book new-feature | |
985 |
|
985 | |||
986 | - create an inactive bookmark as a place marker:: |
|
986 | - create an inactive bookmark as a place marker:: | |
987 |
|
987 | |||
988 | hg book -i reviewed |
|
988 | hg book -i reviewed | |
989 |
|
989 | |||
990 | - create an inactive bookmark on another changeset:: |
|
990 | - create an inactive bookmark on another changeset:: | |
991 |
|
991 | |||
992 | hg book -r .^ tested |
|
992 | hg book -r .^ tested | |
993 |
|
993 | |||
994 | - rename bookmark turkey to dinner:: |
|
994 | - rename bookmark turkey to dinner:: | |
995 |
|
995 | |||
996 | hg book -m turkey dinner |
|
996 | hg book -m turkey dinner | |
997 |
|
997 | |||
998 | - move the '@' bookmark from another branch:: |
|
998 | - move the '@' bookmark from another branch:: | |
999 |
|
999 | |||
1000 | hg book -f @ |
|
1000 | hg book -f @ | |
1001 | ''' |
|
1001 | ''' | |
1002 | force = opts.get('force') |
|
1002 | force = opts.get('force') | |
1003 | rev = opts.get('rev') |
|
1003 | rev = opts.get('rev') | |
1004 | delete = opts.get('delete') |
|
1004 | delete = opts.get('delete') | |
1005 | rename = opts.get('rename') |
|
1005 | rename = opts.get('rename') | |
1006 | inactive = opts.get('inactive') |
|
1006 | inactive = opts.get('inactive') | |
1007 |
|
1007 | |||
1008 | def checkformat(mark): |
|
1008 | def checkformat(mark): | |
1009 | mark = mark.strip() |
|
1009 | mark = mark.strip() | |
1010 | if not mark: |
|
1010 | if not mark: | |
1011 | raise error.Abort(_("bookmark names cannot consist entirely of " |
|
1011 | raise error.Abort(_("bookmark names cannot consist entirely of " | |
1012 | "whitespace")) |
|
1012 | "whitespace")) | |
1013 | scmutil.checknewlabel(repo, mark, 'bookmark') |
|
1013 | scmutil.checknewlabel(repo, mark, 'bookmark') | |
1014 | return mark |
|
1014 | return mark | |
1015 |
|
1015 | |||
1016 | def checkconflict(repo, mark, cur, force=False, target=None): |
|
1016 | def checkconflict(repo, mark, cur, force=False, target=None): | |
1017 | if mark in marks and not force: |
|
1017 | if mark in marks and not force: | |
1018 | if target: |
|
1018 | if target: | |
1019 | if marks[mark] == target and target == cur: |
|
1019 | if marks[mark] == target and target == cur: | |
1020 | # re-activating a bookmark |
|
1020 | # re-activating a bookmark | |
1021 | return |
|
1021 | return | |
1022 | anc = repo.changelog.ancestors([repo[target].rev()]) |
|
1022 | anc = repo.changelog.ancestors([repo[target].rev()]) | |
1023 | bmctx = repo[marks[mark]] |
|
1023 | bmctx = repo[marks[mark]] | |
1024 | divs = [repo[b].node() for b in marks |
|
1024 | divs = [repo[b].node() for b in marks | |
1025 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] |
|
1025 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] | |
1026 |
|
1026 | |||
1027 | # allow resolving a single divergent bookmark even if moving |
|
1027 | # allow resolving a single divergent bookmark even if moving | |
1028 | # the bookmark across branches when a revision is specified |
|
1028 | # the bookmark across branches when a revision is specified | |
1029 | # that contains a divergent bookmark |
|
1029 | # that contains a divergent bookmark | |
1030 | if bmctx.rev() not in anc and target in divs: |
|
1030 | if bmctx.rev() not in anc and target in divs: | |
1031 | bookmarks.deletedivergent(repo, [target], mark) |
|
1031 | bookmarks.deletedivergent(repo, [target], mark) | |
1032 | return |
|
1032 | return | |
1033 |
|
1033 | |||
1034 | deletefrom = [b for b in divs |
|
1034 | deletefrom = [b for b in divs | |
1035 | if repo[b].rev() in anc or b == target] |
|
1035 | if repo[b].rev() in anc or b == target] | |
1036 | bookmarks.deletedivergent(repo, deletefrom, mark) |
|
1036 | bookmarks.deletedivergent(repo, deletefrom, mark) | |
1037 | if bookmarks.validdest(repo, bmctx, repo[target]): |
|
1037 | if bookmarks.validdest(repo, bmctx, repo[target]): | |
1038 | ui.status(_("moving bookmark '%s' forward from %s\n") % |
|
1038 | ui.status(_("moving bookmark '%s' forward from %s\n") % | |
1039 | (mark, short(bmctx.node()))) |
|
1039 | (mark, short(bmctx.node()))) | |
1040 | return |
|
1040 | return | |
1041 | raise error.Abort(_("bookmark '%s' already exists " |
|
1041 | raise error.Abort(_("bookmark '%s' already exists " | |
1042 | "(use -f to force)") % mark) |
|
1042 | "(use -f to force)") % mark) | |
1043 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) |
|
1043 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) | |
1044 | and not force): |
|
1044 | and not force): | |
1045 | raise error.Abort( |
|
1045 | raise error.Abort( | |
1046 | _("a bookmark cannot have the name of an existing branch")) |
|
1046 | _("a bookmark cannot have the name of an existing branch")) | |
1047 |
|
1047 | |||
1048 | if delete and rename: |
|
1048 | if delete and rename: | |
1049 | raise error.Abort(_("--delete and --rename are incompatible")) |
|
1049 | raise error.Abort(_("--delete and --rename are incompatible")) | |
1050 | if delete and rev: |
|
1050 | if delete and rev: | |
1051 | raise error.Abort(_("--rev is incompatible with --delete")) |
|
1051 | raise error.Abort(_("--rev is incompatible with --delete")) | |
1052 | if rename and rev: |
|
1052 | if rename and rev: | |
1053 | raise error.Abort(_("--rev is incompatible with --rename")) |
|
1053 | raise error.Abort(_("--rev is incompatible with --rename")) | |
1054 | if not names and (delete or rev): |
|
1054 | if not names and (delete or rev): | |
1055 | raise error.Abort(_("bookmark name required")) |
|
1055 | raise error.Abort(_("bookmark name required")) | |
1056 |
|
1056 | |||
1057 | if delete or rename or names or inactive: |
|
1057 | if delete or rename or names or inactive: | |
1058 | wlock = lock = tr = None |
|
1058 | wlock = lock = tr = None | |
1059 | try: |
|
1059 | try: | |
1060 | wlock = repo.wlock() |
|
1060 | wlock = repo.wlock() | |
1061 | lock = repo.lock() |
|
1061 | lock = repo.lock() | |
1062 | cur = repo.changectx('.').node() |
|
1062 | cur = repo.changectx('.').node() | |
1063 | marks = repo._bookmarks |
|
1063 | marks = repo._bookmarks | |
1064 | if delete: |
|
1064 | if delete: | |
1065 | tr = repo.transaction('bookmark') |
|
1065 | tr = repo.transaction('bookmark') | |
1066 | for mark in names: |
|
1066 | for mark in names: | |
1067 | if mark not in marks: |
|
1067 | if mark not in marks: | |
1068 | raise error.Abort(_("bookmark '%s' does not exist") % |
|
1068 | raise error.Abort(_("bookmark '%s' does not exist") % | |
1069 | mark) |
|
1069 | mark) | |
1070 | if mark == repo._activebookmark: |
|
1070 | if mark == repo._activebookmark: | |
1071 | bookmarks.deactivate(repo) |
|
1071 | bookmarks.deactivate(repo) | |
1072 | del marks[mark] |
|
1072 | del marks[mark] | |
1073 |
|
1073 | |||
1074 | elif rename: |
|
1074 | elif rename: | |
1075 | tr = repo.transaction('bookmark') |
|
1075 | tr = repo.transaction('bookmark') | |
1076 | if not names: |
|
1076 | if not names: | |
1077 | raise error.Abort(_("new bookmark name required")) |
|
1077 | raise error.Abort(_("new bookmark name required")) | |
1078 | elif len(names) > 1: |
|
1078 | elif len(names) > 1: | |
1079 | raise error.Abort(_("only one new bookmark name allowed")) |
|
1079 | raise error.Abort(_("only one new bookmark name allowed")) | |
1080 | mark = checkformat(names[0]) |
|
1080 | mark = checkformat(names[0]) | |
1081 | if rename not in marks: |
|
1081 | if rename not in marks: | |
1082 | raise error.Abort(_("bookmark '%s' does not exist") |
|
1082 | raise error.Abort(_("bookmark '%s' does not exist") | |
1083 | % rename) |
|
1083 | % rename) | |
1084 | checkconflict(repo, mark, cur, force) |
|
1084 | checkconflict(repo, mark, cur, force) | |
1085 | marks[mark] = marks[rename] |
|
1085 | marks[mark] = marks[rename] | |
1086 | if repo._activebookmark == rename and not inactive: |
|
1086 | if repo._activebookmark == rename and not inactive: | |
1087 | bookmarks.activate(repo, mark) |
|
1087 | bookmarks.activate(repo, mark) | |
1088 | del marks[rename] |
|
1088 | del marks[rename] | |
1089 | elif names: |
|
1089 | elif names: | |
1090 | tr = repo.transaction('bookmark') |
|
1090 | tr = repo.transaction('bookmark') | |
1091 | newact = None |
|
1091 | newact = None | |
1092 | for mark in names: |
|
1092 | for mark in names: | |
1093 | mark = checkformat(mark) |
|
1093 | mark = checkformat(mark) | |
1094 | if newact is None: |
|
1094 | if newact is None: | |
1095 | newact = mark |
|
1095 | newact = mark | |
1096 | if inactive and mark == repo._activebookmark: |
|
1096 | if inactive and mark == repo._activebookmark: | |
1097 | bookmarks.deactivate(repo) |
|
1097 | bookmarks.deactivate(repo) | |
1098 | return |
|
1098 | return | |
1099 | tgt = cur |
|
1099 | tgt = cur | |
1100 | if rev: |
|
1100 | if rev: | |
1101 | tgt = scmutil.revsingle(repo, rev).node() |
|
1101 | tgt = scmutil.revsingle(repo, rev).node() | |
1102 | checkconflict(repo, mark, cur, force, tgt) |
|
1102 | checkconflict(repo, mark, cur, force, tgt) | |
1103 | marks[mark] = tgt |
|
1103 | marks[mark] = tgt | |
1104 | if not inactive and cur == marks[newact] and not rev: |
|
1104 | if not inactive and cur == marks[newact] and not rev: | |
1105 | bookmarks.activate(repo, newact) |
|
1105 | bookmarks.activate(repo, newact) | |
1106 | elif cur != tgt and newact == repo._activebookmark: |
|
1106 | elif cur != tgt and newact == repo._activebookmark: | |
1107 | bookmarks.deactivate(repo) |
|
1107 | bookmarks.deactivate(repo) | |
1108 | elif inactive: |
|
1108 | elif inactive: | |
1109 | if len(marks) == 0: |
|
1109 | if len(marks) == 0: | |
1110 | ui.status(_("no bookmarks set\n")) |
|
1110 | ui.status(_("no bookmarks set\n")) | |
1111 | elif not repo._activebookmark: |
|
1111 | elif not repo._activebookmark: | |
1112 | ui.status(_("no active bookmark\n")) |
|
1112 | ui.status(_("no active bookmark\n")) | |
1113 | else: |
|
1113 | else: | |
1114 | bookmarks.deactivate(repo) |
|
1114 | bookmarks.deactivate(repo) | |
1115 | if tr is not None: |
|
1115 | if tr is not None: | |
1116 | marks.recordchange(tr) |
|
1116 | marks.recordchange(tr) | |
1117 | tr.close() |
|
1117 | tr.close() | |
1118 | finally: |
|
1118 | finally: | |
1119 | lockmod.release(tr, lock, wlock) |
|
1119 | lockmod.release(tr, lock, wlock) | |
1120 | else: # show bookmarks |
|
1120 | else: # show bookmarks | |
1121 | fm = ui.formatter('bookmarks', opts) |
|
1121 | fm = ui.formatter('bookmarks', opts) | |
1122 | hexfn = fm.hexfunc |
|
1122 | hexfn = fm.hexfunc | |
1123 | marks = repo._bookmarks |
|
1123 | marks = repo._bookmarks | |
1124 | if len(marks) == 0 and not fm: |
|
1124 | if len(marks) == 0 and not fm: | |
1125 | ui.status(_("no bookmarks set\n")) |
|
1125 | ui.status(_("no bookmarks set\n")) | |
1126 | for bmark, n in sorted(marks.iteritems()): |
|
1126 | for bmark, n in sorted(marks.iteritems()): | |
1127 | active = repo._activebookmark |
|
1127 | active = repo._activebookmark | |
1128 | if bmark == active: |
|
1128 | if bmark == active: | |
1129 | prefix, label = '*', activebookmarklabel |
|
1129 | prefix, label = '*', activebookmarklabel | |
1130 | else: |
|
1130 | else: | |
1131 | prefix, label = ' ', '' |
|
1131 | prefix, label = ' ', '' | |
1132 |
|
1132 | |||
1133 | fm.startitem() |
|
1133 | fm.startitem() | |
1134 | if not ui.quiet: |
|
1134 | if not ui.quiet: | |
1135 | fm.plain(' %s ' % prefix, label=label) |
|
1135 | fm.plain(' %s ' % prefix, label=label) | |
1136 | fm.write('bookmark', '%s', bmark, label=label) |
|
1136 | fm.write('bookmark', '%s', bmark, label=label) | |
1137 | pad = " " * (25 - encoding.colwidth(bmark)) |
|
1137 | pad = " " * (25 - encoding.colwidth(bmark)) | |
1138 | fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s', |
|
1138 | fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s', | |
1139 | repo.changelog.rev(n), hexfn(n), label=label) |
|
1139 | repo.changelog.rev(n), hexfn(n), label=label) | |
1140 | fm.data(active=(bmark == active)) |
|
1140 | fm.data(active=(bmark == active)) | |
1141 | fm.plain('\n') |
|
1141 | fm.plain('\n') | |
1142 | fm.end() |
|
1142 | fm.end() | |
1143 |
|
1143 | |||
1144 | @command('branch', |
|
1144 | @command('branch', | |
1145 | [('f', 'force', None, |
|
1145 | [('f', 'force', None, | |
1146 | _('set branch name even if it shadows an existing branch')), |
|
1146 | _('set branch name even if it shadows an existing branch')), | |
1147 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
1147 | ('C', 'clean', None, _('reset branch name to parent branch name'))], | |
1148 | _('[-fC] [NAME]')) |
|
1148 | _('[-fC] [NAME]')) | |
1149 | def branch(ui, repo, label=None, **opts): |
|
1149 | def branch(ui, repo, label=None, **opts): | |
1150 | """set or show the current branch name |
|
1150 | """set or show the current branch name | |
1151 |
|
1151 | |||
1152 | .. note:: |
|
1152 | .. note:: | |
1153 |
|
1153 | |||
1154 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
1154 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
1155 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
1155 | light-weight bookmark instead. See :hg:`help glossary` for more | |
1156 | information about named branches and bookmarks. |
|
1156 | information about named branches and bookmarks. | |
1157 |
|
1157 | |||
1158 | With no argument, show the current branch name. With one argument, |
|
1158 | With no argument, show the current branch name. With one argument, | |
1159 | set the working directory branch name (the branch will not exist |
|
1159 | set the working directory branch name (the branch will not exist | |
1160 | in the repository until the next commit). Standard practice |
|
1160 | in the repository until the next commit). Standard practice | |
1161 | recommends that primary development take place on the 'default' |
|
1161 | recommends that primary development take place on the 'default' | |
1162 | branch. |
|
1162 | branch. | |
1163 |
|
1163 | |||
1164 | Unless -f/--force is specified, branch will not let you set a |
|
1164 | Unless -f/--force is specified, branch will not let you set a | |
1165 | branch name that already exists. |
|
1165 | branch name that already exists. | |
1166 |
|
1166 | |||
1167 | Use -C/--clean to reset the working directory branch to that of |
|
1167 | Use -C/--clean to reset the working directory branch to that of | |
1168 | the parent of the working directory, negating a previous branch |
|
1168 | the parent of the working directory, negating a previous branch | |
1169 | change. |
|
1169 | change. | |
1170 |
|
1170 | |||
1171 | Use the command :hg:`update` to switch to an existing branch. Use |
|
1171 | Use the command :hg:`update` to switch to an existing branch. Use | |
1172 | :hg:`commit --close-branch` to mark this branch head as closed. |
|
1172 | :hg:`commit --close-branch` to mark this branch head as closed. | |
1173 | When all heads of the branch are closed, the branch will be |
|
1173 | When all heads of the branch are closed, the branch will be | |
1174 | considered closed. |
|
1174 | considered closed. | |
1175 |
|
1175 | |||
1176 | Returns 0 on success. |
|
1176 | Returns 0 on success. | |
1177 | """ |
|
1177 | """ | |
1178 | if label: |
|
1178 | if label: | |
1179 | label = label.strip() |
|
1179 | label = label.strip() | |
1180 |
|
1180 | |||
1181 | if not opts.get('clean') and not label: |
|
1181 | if not opts.get('clean') and not label: | |
1182 | ui.write("%s\n" % repo.dirstate.branch()) |
|
1182 | ui.write("%s\n" % repo.dirstate.branch()) | |
1183 | return |
|
1183 | return | |
1184 |
|
1184 | |||
1185 | wlock = repo.wlock() |
|
1185 | wlock = repo.wlock() | |
1186 | try: |
|
1186 | try: | |
1187 | if opts.get('clean'): |
|
1187 | if opts.get('clean'): | |
1188 | label = repo[None].p1().branch() |
|
1188 | label = repo[None].p1().branch() | |
1189 | repo.dirstate.setbranch(label) |
|
1189 | repo.dirstate.setbranch(label) | |
1190 | ui.status(_('reset working directory to branch %s\n') % label) |
|
1190 | ui.status(_('reset working directory to branch %s\n') % label) | |
1191 | elif label: |
|
1191 | elif label: | |
1192 | if not opts.get('force') and label in repo.branchmap(): |
|
1192 | if not opts.get('force') and label in repo.branchmap(): | |
1193 | if label not in [p.branch() for p in repo.parents()]: |
|
1193 | if label not in [p.branch() for p in repo.parents()]: | |
1194 | raise error.Abort(_('a branch of the same name already' |
|
1194 | raise error.Abort(_('a branch of the same name already' | |
1195 | ' exists'), |
|
1195 | ' exists'), | |
1196 | # i18n: "it" refers to an existing branch |
|
1196 | # i18n: "it" refers to an existing branch | |
1197 | hint=_("use 'hg update' to switch to it")) |
|
1197 | hint=_("use 'hg update' to switch to it")) | |
1198 | scmutil.checknewlabel(repo, label, 'branch') |
|
1198 | scmutil.checknewlabel(repo, label, 'branch') | |
1199 | repo.dirstate.setbranch(label) |
|
1199 | repo.dirstate.setbranch(label) | |
1200 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1200 | ui.status(_('marked working directory as branch %s\n') % label) | |
1201 |
|
1201 | |||
1202 | # find any open named branches aside from default |
|
1202 | # find any open named branches aside from default | |
1203 | others = [n for n, h, t, c in repo.branchmap().iterbranches() |
|
1203 | others = [n for n, h, t, c in repo.branchmap().iterbranches() | |
1204 | if n != "default" and not c] |
|
1204 | if n != "default" and not c] | |
1205 | if not others: |
|
1205 | if not others: | |
1206 | ui.status(_('(branches are permanent and global, ' |
|
1206 | ui.status(_('(branches are permanent and global, ' | |
1207 | 'did you want a bookmark?)\n')) |
|
1207 | 'did you want a bookmark?)\n')) | |
1208 | finally: |
|
1208 | finally: | |
1209 | wlock.release() |
|
1209 | wlock.release() | |
1210 |
|
1210 | |||
1211 | @command('branches', |
|
1211 | @command('branches', | |
1212 | [('a', 'active', False, |
|
1212 | [('a', 'active', False, | |
1213 | _('show only branches that have unmerged heads (DEPRECATED)')), |
|
1213 | _('show only branches that have unmerged heads (DEPRECATED)')), | |
1214 | ('c', 'closed', False, _('show normal and closed branches')), |
|
1214 | ('c', 'closed', False, _('show normal and closed branches')), | |
1215 | ] + formatteropts, |
|
1215 | ] + formatteropts, | |
1216 | _('[-ac]')) |
|
1216 | _('[-ac]')) | |
1217 | def branches(ui, repo, active=False, closed=False, **opts): |
|
1217 | def branches(ui, repo, active=False, closed=False, **opts): | |
1218 | """list repository named branches |
|
1218 | """list repository named branches | |
1219 |
|
1219 | |||
1220 | List the repository's named branches, indicating which ones are |
|
1220 | List the repository's named branches, indicating which ones are | |
1221 | inactive. If -c/--closed is specified, also list branches which have |
|
1221 | inactive. If -c/--closed is specified, also list branches which have | |
1222 | been marked closed (see :hg:`commit --close-branch`). |
|
1222 | been marked closed (see :hg:`commit --close-branch`). | |
1223 |
|
1223 | |||
1224 | Use the command :hg:`update` to switch to an existing branch. |
|
1224 | Use the command :hg:`update` to switch to an existing branch. | |
1225 |
|
1225 | |||
1226 | Returns 0. |
|
1226 | Returns 0. | |
1227 | """ |
|
1227 | """ | |
1228 |
|
1228 | |||
1229 | fm = ui.formatter('branches', opts) |
|
1229 | fm = ui.formatter('branches', opts) | |
1230 | hexfunc = fm.hexfunc |
|
1230 | hexfunc = fm.hexfunc | |
1231 |
|
1231 | |||
1232 | allheads = set(repo.heads()) |
|
1232 | allheads = set(repo.heads()) | |
1233 | branches = [] |
|
1233 | branches = [] | |
1234 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1234 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1235 | isactive = not isclosed and bool(set(heads) & allheads) |
|
1235 | isactive = not isclosed and bool(set(heads) & allheads) | |
1236 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1236 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1237 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1237 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1238 | reverse=True) |
|
1238 | reverse=True) | |
1239 |
|
1239 | |||
1240 | for tag, ctx, isactive, isopen in branches: |
|
1240 | for tag, ctx, isactive, isopen in branches: | |
1241 | if active and not isactive: |
|
1241 | if active and not isactive: | |
1242 | continue |
|
1242 | continue | |
1243 | if isactive: |
|
1243 | if isactive: | |
1244 | label = 'branches.active' |
|
1244 | label = 'branches.active' | |
1245 | notice = '' |
|
1245 | notice = '' | |
1246 | elif not isopen: |
|
1246 | elif not isopen: | |
1247 | if not closed: |
|
1247 | if not closed: | |
1248 | continue |
|
1248 | continue | |
1249 | label = 'branches.closed' |
|
1249 | label = 'branches.closed' | |
1250 | notice = _(' (closed)') |
|
1250 | notice = _(' (closed)') | |
1251 | else: |
|
1251 | else: | |
1252 | label = 'branches.inactive' |
|
1252 | label = 'branches.inactive' | |
1253 | notice = _(' (inactive)') |
|
1253 | notice = _(' (inactive)') | |
1254 | current = (tag == repo.dirstate.branch()) |
|
1254 | current = (tag == repo.dirstate.branch()) | |
1255 | if current: |
|
1255 | if current: | |
1256 | label = 'branches.current' |
|
1256 | label = 'branches.current' | |
1257 |
|
1257 | |||
1258 | fm.startitem() |
|
1258 | fm.startitem() | |
1259 | fm.write('branch', '%s', tag, label=label) |
|
1259 | fm.write('branch', '%s', tag, label=label) | |
1260 | rev = ctx.rev() |
|
1260 | rev = ctx.rev() | |
1261 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) |
|
1261 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) | |
1262 | fmt = ' ' * padsize + ' %d:%s' |
|
1262 | fmt = ' ' * padsize + ' %d:%s' | |
1263 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), |
|
1263 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), | |
1264 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
1264 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
1265 | fm.data(active=isactive, closed=not isopen, current=current) |
|
1265 | fm.data(active=isactive, closed=not isopen, current=current) | |
1266 | if not ui.quiet: |
|
1266 | if not ui.quiet: | |
1267 | fm.plain(notice) |
|
1267 | fm.plain(notice) | |
1268 | fm.plain('\n') |
|
1268 | fm.plain('\n') | |
1269 | fm.end() |
|
1269 | fm.end() | |
1270 |
|
1270 | |||
1271 | @command('bundle', |
|
1271 | @command('bundle', | |
1272 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1272 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1273 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1273 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1274 | _('REV')), |
|
1274 | _('REV')), | |
1275 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1275 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1276 | _('BRANCH')), |
|
1276 | _('BRANCH')), | |
1277 | ('', 'base', [], |
|
1277 | ('', 'base', [], | |
1278 | _('a base changeset assumed to be available at the destination'), |
|
1278 | _('a base changeset assumed to be available at the destination'), | |
1279 | _('REV')), |
|
1279 | _('REV')), | |
1280 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1280 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1281 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1281 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1282 | ] + remoteopts, |
|
1282 | ] + remoteopts, | |
1283 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1283 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1284 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1284 | def bundle(ui, repo, fname, dest=None, **opts): | |
1285 | """create a changegroup file |
|
1285 | """create a changegroup file | |
1286 |
|
1286 | |||
1287 | Generate a compressed changegroup file collecting changesets not |
|
1287 | Generate a compressed changegroup file collecting changesets not | |
1288 | known to be in another repository. |
|
1288 | known to be in another repository. | |
1289 |
|
1289 | |||
1290 | If you omit the destination repository, then hg assumes the |
|
1290 | If you omit the destination repository, then hg assumes the | |
1291 | destination will have all the nodes you specify with --base |
|
1291 | destination will have all the nodes you specify with --base | |
1292 | parameters. To create a bundle containing all changesets, use |
|
1292 | parameters. To create a bundle containing all changesets, use | |
1293 | -a/--all (or --base null). |
|
1293 | -a/--all (or --base null). | |
1294 |
|
1294 | |||
1295 | You can change bundle format with the -t/--type option. You can |
|
1295 | You can change bundle format with the -t/--type option. You can | |
1296 | specify a compression, a bundle version or both using a dash |
|
1296 | specify a compression, a bundle version or both using a dash | |
1297 | (comp-version). The available compression methods are: none, bzip2, |
|
1297 | (comp-version). The available compression methods are: none, bzip2, | |
1298 | and gzip (by default, bundles are compressed using bzip2). The |
|
1298 | and gzip (by default, bundles are compressed using bzip2). The | |
1299 | available format are: v1, v2 (default to most suitable). |
|
1299 | available format are: v1, v2 (default to most suitable). | |
1300 |
|
1300 | |||
1301 | The bundle file can then be transferred using conventional means |
|
1301 | The bundle file can then be transferred using conventional means | |
1302 | and applied to another repository with the unbundle or pull |
|
1302 | and applied to another repository with the unbundle or pull | |
1303 | command. This is useful when direct push and pull are not |
|
1303 | command. This is useful when direct push and pull are not | |
1304 | available or when exporting an entire repository is undesirable. |
|
1304 | available or when exporting an entire repository is undesirable. | |
1305 |
|
1305 | |||
1306 | Applying bundles preserves all changeset contents including |
|
1306 | Applying bundles preserves all changeset contents including | |
1307 | permissions, copy/rename information, and revision history. |
|
1307 | permissions, copy/rename information, and revision history. | |
1308 |
|
1308 | |||
1309 | Returns 0 on success, 1 if no changes found. |
|
1309 | Returns 0 on success, 1 if no changes found. | |
1310 | """ |
|
1310 | """ | |
1311 | revs = None |
|
1311 | revs = None | |
1312 | if 'rev' in opts: |
|
1312 | if 'rev' in opts: | |
1313 | revs = scmutil.revrange(repo, opts['rev']) |
|
1313 | revs = scmutil.revrange(repo, opts['rev']) | |
1314 |
|
1314 | |||
1315 | bundletype = opts.get('type', 'bzip2').lower() |
|
1315 | bundletype = opts.get('type', 'bzip2').lower() | |
1316 | try: |
|
1316 | try: | |
1317 | bcompression, cgversion, params = exchange.parsebundlespec( |
|
1317 | bcompression, cgversion, params = exchange.parsebundlespec( | |
1318 | repo, bundletype, strict=False) |
|
1318 | repo, bundletype, strict=False) | |
1319 | except error.UnsupportedBundleSpecification as e: |
|
1319 | except error.UnsupportedBundleSpecification as e: | |
1320 | raise error.Abort(str(e), |
|
1320 | raise error.Abort(str(e), | |
1321 | hint=_('see "hg help bundle" for supported ' |
|
1321 | hint=_('see "hg help bundle" for supported ' | |
1322 | 'values for --type')) |
|
1322 | 'values for --type')) | |
1323 |
|
1323 | |||
1324 | # Packed bundles are a pseudo bundle format for now. |
|
1324 | # Packed bundles are a pseudo bundle format for now. | |
1325 | if cgversion == 's1': |
|
1325 | if cgversion == 's1': | |
1326 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), |
|
1326 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | |
1327 | hint=_('use "hg debugcreatestreamclonebundle"')) |
|
1327 | hint=_('use "hg debugcreatestreamclonebundle"')) | |
1328 |
|
1328 | |||
1329 | if opts.get('all'): |
|
1329 | if opts.get('all'): | |
1330 | base = ['null'] |
|
1330 | base = ['null'] | |
1331 | else: |
|
1331 | else: | |
1332 | base = scmutil.revrange(repo, opts.get('base')) |
|
1332 | base = scmutil.revrange(repo, opts.get('base')) | |
1333 | # TODO: get desired bundlecaps from command line. |
|
1333 | # TODO: get desired bundlecaps from command line. | |
1334 | bundlecaps = None |
|
1334 | bundlecaps = None | |
1335 | if base: |
|
1335 | if base: | |
1336 | if dest: |
|
1336 | if dest: | |
1337 | raise error.Abort(_("--base is incompatible with specifying " |
|
1337 | raise error.Abort(_("--base is incompatible with specifying " | |
1338 | "a destination")) |
|
1338 | "a destination")) | |
1339 | common = [repo.lookup(rev) for rev in base] |
|
1339 | common = [repo.lookup(rev) for rev in base] | |
1340 | heads = revs and map(repo.lookup, revs) or revs |
|
1340 | heads = revs and map(repo.lookup, revs) or revs | |
1341 | cg = changegroup.getchangegroup(repo, 'bundle', heads=heads, |
|
1341 | cg = changegroup.getchangegroup(repo, 'bundle', heads=heads, | |
1342 | common=common, bundlecaps=bundlecaps, |
|
1342 | common=common, bundlecaps=bundlecaps, | |
1343 | version=cgversion) |
|
1343 | version=cgversion) | |
1344 | outgoing = None |
|
1344 | outgoing = None | |
1345 | else: |
|
1345 | else: | |
1346 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1346 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1347 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1347 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1348 | other = hg.peer(repo, opts, dest) |
|
1348 | other = hg.peer(repo, opts, dest) | |
1349 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1349 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1350 | heads = revs and map(repo.lookup, revs) or revs |
|
1350 | heads = revs and map(repo.lookup, revs) or revs | |
1351 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1351 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1352 | onlyheads=heads, |
|
1352 | onlyheads=heads, | |
1353 | force=opts.get('force'), |
|
1353 | force=opts.get('force'), | |
1354 | portable=True) |
|
1354 | portable=True) | |
1355 | cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing, |
|
1355 | cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing, | |
1356 | bundlecaps, version=cgversion) |
|
1356 | bundlecaps, version=cgversion) | |
1357 | if not cg: |
|
1357 | if not cg: | |
1358 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) |
|
1358 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) | |
1359 | return 1 |
|
1359 | return 1 | |
1360 |
|
1360 | |||
1361 | if cgversion == '01': #bundle1 |
|
1361 | if cgversion == '01': #bundle1 | |
1362 | if bcompression is None: |
|
1362 | if bcompression is None: | |
1363 | bcompression = 'UN' |
|
1363 | bcompression = 'UN' | |
1364 | bversion = 'HG10' + bcompression |
|
1364 | bversion = 'HG10' + bcompression | |
1365 | bcompression = None |
|
1365 | bcompression = None | |
1366 | else: |
|
1366 | else: | |
1367 | assert cgversion == '02' |
|
1367 | assert cgversion == '02' | |
1368 | bversion = 'HG20' |
|
1368 | bversion = 'HG20' | |
1369 |
|
1369 | |||
1370 |
|
1370 | |||
1371 | changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression) |
|
1371 | changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression) | |
1372 |
|
1372 | |||
1373 | @command('cat', |
|
1373 | @command('cat', | |
1374 | [('o', 'output', '', |
|
1374 | [('o', 'output', '', | |
1375 | _('print output to file with formatted name'), _('FORMAT')), |
|
1375 | _('print output to file with formatted name'), _('FORMAT')), | |
1376 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1376 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1377 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1377 | ('', 'decode', None, _('apply any matching decode filter')), | |
1378 | ] + walkopts, |
|
1378 | ] + walkopts, | |
1379 | _('[OPTION]... FILE...'), |
|
1379 | _('[OPTION]... FILE...'), | |
1380 | inferrepo=True) |
|
1380 | inferrepo=True) | |
1381 | def cat(ui, repo, file1, *pats, **opts): |
|
1381 | def cat(ui, repo, file1, *pats, **opts): | |
1382 | """output the current or given revision of files |
|
1382 | """output the current or given revision of files | |
1383 |
|
1383 | |||
1384 | Print the specified files as they were at the given revision. If |
|
1384 | Print the specified files as they were at the given revision. If | |
1385 | no revision is given, the parent of the working directory is used. |
|
1385 | no revision is given, the parent of the working directory is used. | |
1386 |
|
1386 | |||
1387 | Output may be to a file, in which case the name of the file is |
|
1387 | Output may be to a file, in which case the name of the file is | |
1388 | given using a format string. The formatting rules as follows: |
|
1388 | given using a format string. The formatting rules as follows: | |
1389 |
|
1389 | |||
1390 | :``%%``: literal "%" character |
|
1390 | :``%%``: literal "%" character | |
1391 | :``%s``: basename of file being printed |
|
1391 | :``%s``: basename of file being printed | |
1392 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1392 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1393 | :``%p``: root-relative path name of file being printed |
|
1393 | :``%p``: root-relative path name of file being printed | |
1394 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1394 | :``%H``: changeset hash (40 hexadecimal digits) | |
1395 | :``%R``: changeset revision number |
|
1395 | :``%R``: changeset revision number | |
1396 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1396 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1397 | :``%r``: zero-padded changeset revision number |
|
1397 | :``%r``: zero-padded changeset revision number | |
1398 | :``%b``: basename of the exporting repository |
|
1398 | :``%b``: basename of the exporting repository | |
1399 |
|
1399 | |||
1400 | Returns 0 on success. |
|
1400 | Returns 0 on success. | |
1401 | """ |
|
1401 | """ | |
1402 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1402 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1403 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1403 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1404 |
|
1404 | |||
1405 | return cmdutil.cat(ui, repo, ctx, m, '', **opts) |
|
1405 | return cmdutil.cat(ui, repo, ctx, m, '', **opts) | |
1406 |
|
1406 | |||
1407 | @command('^clone', |
|
1407 | @command('^clone', | |
1408 | [('U', 'noupdate', None, _('the clone will include an empty working ' |
|
1408 | [('U', 'noupdate', None, _('the clone will include an empty working ' | |
1409 | 'directory (only a repository)')), |
|
1409 | 'directory (only a repository)')), | |
1410 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), |
|
1410 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), | |
1411 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1411 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1412 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1412 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
1413 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1413 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1414 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), |
|
1414 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), | |
1415 | ] + remoteopts, |
|
1415 | ] + remoteopts, | |
1416 | _('[OPTION]... SOURCE [DEST]'), |
|
1416 | _('[OPTION]... SOURCE [DEST]'), | |
1417 | norepo=True) |
|
1417 | norepo=True) | |
1418 | def clone(ui, source, dest=None, **opts): |
|
1418 | def clone(ui, source, dest=None, **opts): | |
1419 | """make a copy of an existing repository |
|
1419 | """make a copy of an existing repository | |
1420 |
|
1420 | |||
1421 | Create a copy of an existing repository in a new directory. |
|
1421 | Create a copy of an existing repository in a new directory. | |
1422 |
|
1422 | |||
1423 | If no destination directory name is specified, it defaults to the |
|
1423 | If no destination directory name is specified, it defaults to the | |
1424 | basename of the source. |
|
1424 | basename of the source. | |
1425 |
|
1425 | |||
1426 | The location of the source is added to the new repository's |
|
1426 | The location of the source is added to the new repository's | |
1427 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1427 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1428 |
|
1428 | |||
1429 | Only local paths and ``ssh://`` URLs are supported as |
|
1429 | Only local paths and ``ssh://`` URLs are supported as | |
1430 | destinations. For ``ssh://`` destinations, no working directory or |
|
1430 | destinations. For ``ssh://`` destinations, no working directory or | |
1431 | ``.hg/hgrc`` will be created on the remote side. |
|
1431 | ``.hg/hgrc`` will be created on the remote side. | |
1432 |
|
1432 | |||
1433 | To pull only a subset of changesets, specify one or more revisions |
|
1433 | To pull only a subset of changesets, specify one or more revisions | |
1434 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1434 | identifiers with -r/--rev or branches with -b/--branch. The | |
1435 | resulting clone will contain only the specified changesets and |
|
1435 | resulting clone will contain only the specified changesets and | |
1436 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1436 | their ancestors. These options (or 'clone src#rev dest') imply | |
1437 | --pull, even for local source repositories. Note that specifying a |
|
1437 | --pull, even for local source repositories. Note that specifying a | |
1438 | tag will include the tagged changeset but not the changeset |
|
1438 | tag will include the tagged changeset but not the changeset | |
1439 | containing the tag. |
|
1439 | containing the tag. | |
1440 |
|
1440 | |||
1441 | If the source repository has a bookmark called '@' set, that |
|
1441 | If the source repository has a bookmark called '@' set, that | |
1442 | revision will be checked out in the new repository by default. |
|
1442 | revision will be checked out in the new repository by default. | |
1443 |
|
1443 | |||
1444 | To check out a particular version, use -u/--update, or |
|
1444 | To check out a particular version, use -u/--update, or | |
1445 | -U/--noupdate to create a clone with no working directory. |
|
1445 | -U/--noupdate to create a clone with no working directory. | |
1446 |
|
1446 | |||
1447 | .. container:: verbose |
|
1447 | .. container:: verbose | |
1448 |
|
1448 | |||
1449 | For efficiency, hardlinks are used for cloning whenever the |
|
1449 | For efficiency, hardlinks are used for cloning whenever the | |
1450 | source and destination are on the same filesystem (note this |
|
1450 | source and destination are on the same filesystem (note this | |
1451 | applies only to the repository data, not to the working |
|
1451 | applies only to the repository data, not to the working | |
1452 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1452 | directory). Some filesystems, such as AFS, implement hardlinking | |
1453 | incorrectly, but do not report errors. In these cases, use the |
|
1453 | incorrectly, but do not report errors. In these cases, use the | |
1454 | --pull option to avoid hardlinking. |
|
1454 | --pull option to avoid hardlinking. | |
1455 |
|
1455 | |||
1456 | In some cases, you can clone repositories and the working |
|
1456 | In some cases, you can clone repositories and the working | |
1457 | directory using full hardlinks with :: |
|
1457 | directory using full hardlinks with :: | |
1458 |
|
1458 | |||
1459 | $ cp -al REPO REPOCLONE |
|
1459 | $ cp -al REPO REPOCLONE | |
1460 |
|
1460 | |||
1461 | This is the fastest way to clone, but it is not always safe. The |
|
1461 | This is the fastest way to clone, but it is not always safe. The | |
1462 | operation is not atomic (making sure REPO is not modified during |
|
1462 | operation is not atomic (making sure REPO is not modified during | |
1463 | the operation is up to you) and you have to make sure your |
|
1463 | the operation is up to you) and you have to make sure your | |
1464 | editor breaks hardlinks (Emacs and most Linux Kernel tools do |
|
1464 | editor breaks hardlinks (Emacs and most Linux Kernel tools do | |
1465 | so). Also, this is not compatible with certain extensions that |
|
1465 | so). Also, this is not compatible with certain extensions that | |
1466 | place their metadata under the .hg directory, such as mq. |
|
1466 | place their metadata under the .hg directory, such as mq. | |
1467 |
|
1467 | |||
1468 | Mercurial will update the working directory to the first applicable |
|
1468 | Mercurial will update the working directory to the first applicable | |
1469 | revision from this list: |
|
1469 | revision from this list: | |
1470 |
|
1470 | |||
1471 | a) null if -U or the source repository has no changesets |
|
1471 | a) null if -U or the source repository has no changesets | |
1472 | b) if -u . and the source repository is local, the first parent of |
|
1472 | b) if -u . and the source repository is local, the first parent of | |
1473 | the source repository's working directory |
|
1473 | the source repository's working directory | |
1474 | c) the changeset specified with -u (if a branch name, this means the |
|
1474 | c) the changeset specified with -u (if a branch name, this means the | |
1475 | latest head of that branch) |
|
1475 | latest head of that branch) | |
1476 | d) the changeset specified with -r |
|
1476 | d) the changeset specified with -r | |
1477 | e) the tipmost head specified with -b |
|
1477 | e) the tipmost head specified with -b | |
1478 | f) the tipmost head specified with the url#branch source syntax |
|
1478 | f) the tipmost head specified with the url#branch source syntax | |
1479 | g) the revision marked with the '@' bookmark, if present |
|
1479 | g) the revision marked with the '@' bookmark, if present | |
1480 | h) the tipmost head of the default branch |
|
1480 | h) the tipmost head of the default branch | |
1481 | i) tip |
|
1481 | i) tip | |
1482 |
|
1482 | |||
1483 | Examples: |
|
1483 | Examples: | |
1484 |
|
1484 | |||
1485 | - clone a remote repository to a new directory named hg/:: |
|
1485 | - clone a remote repository to a new directory named hg/:: | |
1486 |
|
1486 | |||
1487 | hg clone http://selenic.com/hg |
|
1487 | hg clone http://selenic.com/hg | |
1488 |
|
1488 | |||
1489 | - create a lightweight local clone:: |
|
1489 | - create a lightweight local clone:: | |
1490 |
|
1490 | |||
1491 | hg clone project/ project-feature/ |
|
1491 | hg clone project/ project-feature/ | |
1492 |
|
1492 | |||
1493 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1493 | - clone from an absolute path on an ssh server (note double-slash):: | |
1494 |
|
1494 | |||
1495 | hg clone ssh://user@server//home/projects/alpha/ |
|
1495 | hg clone ssh://user@server//home/projects/alpha/ | |
1496 |
|
1496 | |||
1497 | - do a high-speed clone over a LAN while checking out a |
|
1497 | - do a high-speed clone over a LAN while checking out a | |
1498 | specified version:: |
|
1498 | specified version:: | |
1499 |
|
1499 | |||
1500 | hg clone --uncompressed http://server/repo -u 1.5 |
|
1500 | hg clone --uncompressed http://server/repo -u 1.5 | |
1501 |
|
1501 | |||
1502 | - create a repository without changesets after a particular revision:: |
|
1502 | - create a repository without changesets after a particular revision:: | |
1503 |
|
1503 | |||
1504 | hg clone -r 04e544 experimental/ good/ |
|
1504 | hg clone -r 04e544 experimental/ good/ | |
1505 |
|
1505 | |||
1506 | - clone (and track) a particular named branch:: |
|
1506 | - clone (and track) a particular named branch:: | |
1507 |
|
1507 | |||
1508 | hg clone http://selenic.com/hg#stable |
|
1508 | hg clone http://selenic.com/hg#stable | |
1509 |
|
1509 | |||
1510 | See :hg:`help urls` for details on specifying URLs. |
|
1510 | See :hg:`help urls` for details on specifying URLs. | |
1511 |
|
1511 | |||
1512 | Returns 0 on success. |
|
1512 | Returns 0 on success. | |
1513 | """ |
|
1513 | """ | |
1514 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1514 | if opts.get('noupdate') and opts.get('updaterev'): | |
1515 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1515 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1516 |
|
1516 | |||
1517 | r = hg.clone(ui, opts, source, dest, |
|
1517 | r = hg.clone(ui, opts, source, dest, | |
1518 | pull=opts.get('pull'), |
|
1518 | pull=opts.get('pull'), | |
1519 | stream=opts.get('uncompressed'), |
|
1519 | stream=opts.get('uncompressed'), | |
1520 | rev=opts.get('rev'), |
|
1520 | rev=opts.get('rev'), | |
1521 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1521 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1522 | branch=opts.get('branch'), |
|
1522 | branch=opts.get('branch'), | |
1523 | shareopts=opts.get('shareopts')) |
|
1523 | shareopts=opts.get('shareopts')) | |
1524 |
|
1524 | |||
1525 | return r is None |
|
1525 | return r is None | |
1526 |
|
1526 | |||
1527 | @command('^commit|ci', |
|
1527 | @command('^commit|ci', | |
1528 | [('A', 'addremove', None, |
|
1528 | [('A', 'addremove', None, | |
1529 | _('mark new/missing files as added/removed before committing')), |
|
1529 | _('mark new/missing files as added/removed before committing')), | |
1530 | ('', 'close-branch', None, |
|
1530 | ('', 'close-branch', None, | |
1531 | _('mark a branch head as closed')), |
|
1531 | _('mark a branch head as closed')), | |
1532 | ('', 'amend', None, _('amend the parent of the working directory')), |
|
1532 | ('', 'amend', None, _('amend the parent of the working directory')), | |
1533 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1533 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1534 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
1534 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
1535 | ('i', 'interactive', None, _('use interactive mode')), |
|
1535 | ('i', 'interactive', None, _('use interactive mode')), | |
1536 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1536 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1537 | _('[OPTION]... [FILE]...'), |
|
1537 | _('[OPTION]... [FILE]...'), | |
1538 | inferrepo=True) |
|
1538 | inferrepo=True) | |
1539 | def commit(ui, repo, *pats, **opts): |
|
1539 | def commit(ui, repo, *pats, **opts): | |
1540 | """commit the specified files or all outstanding changes |
|
1540 | """commit the specified files or all outstanding changes | |
1541 |
|
1541 | |||
1542 | Commit changes to the given files into the repository. Unlike a |
|
1542 | Commit changes to the given files into the repository. Unlike a | |
1543 | centralized SCM, this operation is a local operation. See |
|
1543 | centralized SCM, this operation is a local operation. See | |
1544 | :hg:`push` for a way to actively distribute your changes. |
|
1544 | :hg:`push` for a way to actively distribute your changes. | |
1545 |
|
1545 | |||
1546 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1546 | If a list of files is omitted, all changes reported by :hg:`status` | |
1547 | will be committed. |
|
1547 | will be committed. | |
1548 |
|
1548 | |||
1549 | If you are committing the result of a merge, do not provide any |
|
1549 | If you are committing the result of a merge, do not provide any | |
1550 | filenames or -I/-X filters. |
|
1550 | filenames or -I/-X filters. | |
1551 |
|
1551 | |||
1552 | If no commit message is specified, Mercurial starts your |
|
1552 | If no commit message is specified, Mercurial starts your | |
1553 | configured editor where you can enter a message. In case your |
|
1553 | configured editor where you can enter a message. In case your | |
1554 | commit fails, you will find a backup of your message in |
|
1554 | commit fails, you will find a backup of your message in | |
1555 | ``.hg/last-message.txt``. |
|
1555 | ``.hg/last-message.txt``. | |
1556 |
|
1556 | |||
1557 | The --close-branch flag can be used to mark the current branch |
|
1557 | The --close-branch flag can be used to mark the current branch | |
1558 | head closed. When all heads of a branch are closed, the branch |
|
1558 | head closed. When all heads of a branch are closed, the branch | |
1559 | will be considered closed and no longer listed. |
|
1559 | will be considered closed and no longer listed. | |
1560 |
|
1560 | |||
1561 | The --amend flag can be used to amend the parent of the |
|
1561 | The --amend flag can be used to amend the parent of the | |
1562 | working directory with a new commit that contains the changes |
|
1562 | working directory with a new commit that contains the changes | |
1563 | in the parent in addition to those currently reported by :hg:`status`, |
|
1563 | in the parent in addition to those currently reported by :hg:`status`, | |
1564 | if there are any. The old commit is stored in a backup bundle in |
|
1564 | if there are any. The old commit is stored in a backup bundle in | |
1565 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1565 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1566 | on how to restore it). |
|
1566 | on how to restore it). | |
1567 |
|
1567 | |||
1568 | Message, user and date are taken from the amended commit unless |
|
1568 | Message, user and date are taken from the amended commit unless | |
1569 | specified. When a message isn't specified on the command line, |
|
1569 | specified. When a message isn't specified on the command line, | |
1570 | the editor will open with the message of the amended commit. |
|
1570 | the editor will open with the message of the amended commit. | |
1571 |
|
1571 | |||
1572 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1572 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1573 | or changesets that have children. |
|
1573 | or changesets that have children. | |
1574 |
|
1574 | |||
1575 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1575 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1576 |
|
1576 | |||
1577 | Returns 0 on success, 1 if nothing changed. |
|
1577 | Returns 0 on success, 1 if nothing changed. | |
1578 | """ |
|
1578 | """ | |
1579 | if opts.get('interactive'): |
|
1579 | if opts.get('interactive'): | |
1580 | opts.pop('interactive') |
|
1580 | opts.pop('interactive') | |
1581 | cmdutil.dorecord(ui, repo, commit, None, False, |
|
1581 | cmdutil.dorecord(ui, repo, commit, None, False, | |
1582 | cmdutil.recordfilter, *pats, **opts) |
|
1582 | cmdutil.recordfilter, *pats, **opts) | |
1583 | return |
|
1583 | return | |
1584 |
|
1584 | |||
1585 | if opts.get('subrepos'): |
|
1585 | if opts.get('subrepos'): | |
1586 | if opts.get('amend'): |
|
1586 | if opts.get('amend'): | |
1587 | raise error.Abort(_('cannot amend with --subrepos')) |
|
1587 | raise error.Abort(_('cannot amend with --subrepos')) | |
1588 | # Let --subrepos on the command line override config setting. |
|
1588 | # Let --subrepos on the command line override config setting. | |
1589 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') |
|
1589 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') | |
1590 |
|
1590 | |||
1591 | cmdutil.checkunfinished(repo, commit=True) |
|
1591 | cmdutil.checkunfinished(repo, commit=True) | |
1592 |
|
1592 | |||
1593 | branch = repo[None].branch() |
|
1593 | branch = repo[None].branch() | |
1594 | bheads = repo.branchheads(branch) |
|
1594 | bheads = repo.branchheads(branch) | |
1595 |
|
1595 | |||
1596 | extra = {} |
|
1596 | extra = {} | |
1597 | if opts.get('close_branch'): |
|
1597 | if opts.get('close_branch'): | |
1598 | extra['close'] = 1 |
|
1598 | extra['close'] = 1 | |
1599 |
|
1599 | |||
1600 | if not bheads: |
|
1600 | if not bheads: | |
1601 | raise error.Abort(_('can only close branch heads')) |
|
1601 | raise error.Abort(_('can only close branch heads')) | |
1602 | elif opts.get('amend'): |
|
1602 | elif opts.get('amend'): | |
1603 | if repo.parents()[0].p1().branch() != branch and \ |
|
1603 | if repo.parents()[0].p1().branch() != branch and \ | |
1604 | repo.parents()[0].p2().branch() != branch: |
|
1604 | repo.parents()[0].p2().branch() != branch: | |
1605 | raise error.Abort(_('can only close branch heads')) |
|
1605 | raise error.Abort(_('can only close branch heads')) | |
1606 |
|
1606 | |||
1607 | if opts.get('amend'): |
|
1607 | if opts.get('amend'): | |
1608 | if ui.configbool('ui', 'commitsubrepos'): |
|
1608 | if ui.configbool('ui', 'commitsubrepos'): | |
1609 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1609 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1610 |
|
1610 | |||
1611 | old = repo['.'] |
|
1611 | old = repo['.'] | |
1612 | if not old.mutable(): |
|
1612 | if not old.mutable(): | |
1613 | raise error.Abort(_('cannot amend public changesets')) |
|
1613 | raise error.Abort(_('cannot amend public changesets')) | |
1614 | if len(repo[None].parents()) > 1: |
|
1614 | if len(repo[None].parents()) > 1: | |
1615 | raise error.Abort(_('cannot amend while merging')) |
|
1615 | raise error.Abort(_('cannot amend while merging')) | |
1616 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) |
|
1616 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | |
1617 | if not allowunstable and old.children(): |
|
1617 | if not allowunstable and old.children(): | |
1618 | raise error.Abort(_('cannot amend changeset with children')) |
|
1618 | raise error.Abort(_('cannot amend changeset with children')) | |
1619 |
|
1619 | |||
1620 | # commitfunc is used only for temporary amend commit by cmdutil.amend |
|
1620 | # commitfunc is used only for temporary amend commit by cmdutil.amend | |
1621 | def commitfunc(ui, repo, message, match, opts): |
|
1621 | def commitfunc(ui, repo, message, match, opts): | |
1622 | return repo.commit(message, |
|
1622 | return repo.commit(message, | |
1623 | opts.get('user') or old.user(), |
|
1623 | opts.get('user') or old.user(), | |
1624 | opts.get('date') or old.date(), |
|
1624 | opts.get('date') or old.date(), | |
1625 | match, |
|
1625 | match, | |
1626 | extra=extra) |
|
1626 | extra=extra) | |
1627 |
|
1627 | |||
1628 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) |
|
1628 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) | |
1629 | if node == old.node(): |
|
1629 | if node == old.node(): | |
1630 | ui.status(_("nothing changed\n")) |
|
1630 | ui.status(_("nothing changed\n")) | |
1631 | return 1 |
|
1631 | return 1 | |
1632 | else: |
|
1632 | else: | |
1633 | def commitfunc(ui, repo, message, match, opts): |
|
1633 | def commitfunc(ui, repo, message, match, opts): | |
1634 | backup = ui.backupconfig('phases', 'new-commit') |
|
1634 | backup = ui.backupconfig('phases', 'new-commit') | |
1635 | baseui = repo.baseui |
|
1635 | baseui = repo.baseui | |
1636 | basebackup = baseui.backupconfig('phases', 'new-commit') |
|
1636 | basebackup = baseui.backupconfig('phases', 'new-commit') | |
1637 | try: |
|
1637 | try: | |
1638 | if opts.get('secret'): |
|
1638 | if opts.get('secret'): | |
1639 | ui.setconfig('phases', 'new-commit', 'secret', 'commit') |
|
1639 | ui.setconfig('phases', 'new-commit', 'secret', 'commit') | |
1640 | # Propagate to subrepos |
|
1640 | # Propagate to subrepos | |
1641 | baseui.setconfig('phases', 'new-commit', 'secret', 'commit') |
|
1641 | baseui.setconfig('phases', 'new-commit', 'secret', 'commit') | |
1642 |
|
1642 | |||
1643 | editform = cmdutil.mergeeditform(repo[None], 'commit.normal') |
|
1643 | editform = cmdutil.mergeeditform(repo[None], 'commit.normal') | |
1644 | editor = cmdutil.getcommiteditor(editform=editform, **opts) |
|
1644 | editor = cmdutil.getcommiteditor(editform=editform, **opts) | |
1645 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1645 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
1646 | match, |
|
1646 | match, | |
1647 | editor=editor, |
|
1647 | editor=editor, | |
1648 | extra=extra) |
|
1648 | extra=extra) | |
1649 | finally: |
|
1649 | finally: | |
1650 | ui.restoreconfig(backup) |
|
1650 | ui.restoreconfig(backup) | |
1651 | repo.baseui.restoreconfig(basebackup) |
|
1651 | repo.baseui.restoreconfig(basebackup) | |
1652 |
|
1652 | |||
1653 |
|
1653 | |||
1654 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1654 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1655 |
|
1655 | |||
1656 | if not node: |
|
1656 | if not node: | |
1657 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
|
1657 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) | |
1658 | if stat[3]: |
|
1658 | if stat[3]: | |
1659 | ui.status(_("nothing changed (%d missing files, see " |
|
1659 | ui.status(_("nothing changed (%d missing files, see " | |
1660 | "'hg status')\n") % len(stat[3])) |
|
1660 | "'hg status')\n") % len(stat[3])) | |
1661 | else: |
|
1661 | else: | |
1662 | ui.status(_("nothing changed\n")) |
|
1662 | ui.status(_("nothing changed\n")) | |
1663 | return 1 |
|
1663 | return 1 | |
1664 |
|
1664 | |||
1665 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1665 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1666 |
|
1666 | |||
1667 | @command('config|showconfig|debugconfig', |
|
1667 | @command('config|showconfig|debugconfig', | |
1668 | [('u', 'untrusted', None, _('show untrusted configuration options')), |
|
1668 | [('u', 'untrusted', None, _('show untrusted configuration options')), | |
1669 | ('e', 'edit', None, _('edit user config')), |
|
1669 | ('e', 'edit', None, _('edit user config')), | |
1670 | ('l', 'local', None, _('edit repository config')), |
|
1670 | ('l', 'local', None, _('edit repository config')), | |
1671 | ('g', 'global', None, _('edit global config'))], |
|
1671 | ('g', 'global', None, _('edit global config'))], | |
1672 | _('[-u] [NAME]...'), |
|
1672 | _('[-u] [NAME]...'), | |
1673 | optionalrepo=True) |
|
1673 | optionalrepo=True) | |
1674 | def config(ui, repo, *values, **opts): |
|
1674 | def config(ui, repo, *values, **opts): | |
1675 | """show combined config settings from all hgrc files |
|
1675 | """show combined config settings from all hgrc files | |
1676 |
|
1676 | |||
1677 | With no arguments, print names and values of all config items. |
|
1677 | With no arguments, print names and values of all config items. | |
1678 |
|
1678 | |||
1679 | With one argument of the form section.name, print just the value |
|
1679 | With one argument of the form section.name, print just the value | |
1680 | of that config item. |
|
1680 | of that config item. | |
1681 |
|
1681 | |||
1682 | With multiple arguments, print names and values of all config |
|
1682 | With multiple arguments, print names and values of all config | |
1683 | items with matching section names. |
|
1683 | items with matching section names. | |
1684 |
|
1684 | |||
1685 | With --edit, start an editor on the user-level config file. With |
|
1685 | With --edit, start an editor on the user-level config file. With | |
1686 | --global, edit the system-wide config file. With --local, edit the |
|
1686 | --global, edit the system-wide config file. With --local, edit the | |
1687 | repository-level config file. |
|
1687 | repository-level config file. | |
1688 |
|
1688 | |||
1689 | With --debug, the source (filename and line number) is printed |
|
1689 | With --debug, the source (filename and line number) is printed | |
1690 | for each config item. |
|
1690 | for each config item. | |
1691 |
|
1691 | |||
1692 | See :hg:`help config` for more information about config files. |
|
1692 | See :hg:`help config` for more information about config files. | |
1693 |
|
1693 | |||
1694 | Returns 0 on success, 1 if NAME does not exist. |
|
1694 | Returns 0 on success, 1 if NAME does not exist. | |
1695 |
|
1695 | |||
1696 | """ |
|
1696 | """ | |
1697 |
|
1697 | |||
1698 | if opts.get('edit') or opts.get('local') or opts.get('global'): |
|
1698 | if opts.get('edit') or opts.get('local') or opts.get('global'): | |
1699 | if opts.get('local') and opts.get('global'): |
|
1699 | if opts.get('local') and opts.get('global'): | |
1700 | raise error.Abort(_("can't use --local and --global together")) |
|
1700 | raise error.Abort(_("can't use --local and --global together")) | |
1701 |
|
1701 | |||
1702 | if opts.get('local'): |
|
1702 | if opts.get('local'): | |
1703 | if not repo: |
|
1703 | if not repo: | |
1704 | raise error.Abort(_("can't use --local outside a repository")) |
|
1704 | raise error.Abort(_("can't use --local outside a repository")) | |
1705 | paths = [repo.join('hgrc')] |
|
1705 | paths = [repo.join('hgrc')] | |
1706 | elif opts.get('global'): |
|
1706 | elif opts.get('global'): | |
1707 | paths = scmutil.systemrcpath() |
|
1707 | paths = scmutil.systemrcpath() | |
1708 | else: |
|
1708 | else: | |
1709 | paths = scmutil.userrcpath() |
|
1709 | paths = scmutil.userrcpath() | |
1710 |
|
1710 | |||
1711 | for f in paths: |
|
1711 | for f in paths: | |
1712 | if os.path.exists(f): |
|
1712 | if os.path.exists(f): | |
1713 | break |
|
1713 | break | |
1714 | else: |
|
1714 | else: | |
1715 | if opts.get('global'): |
|
1715 | if opts.get('global'): | |
1716 | samplehgrc = uimod.samplehgrcs['global'] |
|
1716 | samplehgrc = uimod.samplehgrcs['global'] | |
1717 | elif opts.get('local'): |
|
1717 | elif opts.get('local'): | |
1718 | samplehgrc = uimod.samplehgrcs['local'] |
|
1718 | samplehgrc = uimod.samplehgrcs['local'] | |
1719 | else: |
|
1719 | else: | |
1720 | samplehgrc = uimod.samplehgrcs['user'] |
|
1720 | samplehgrc = uimod.samplehgrcs['user'] | |
1721 |
|
1721 | |||
1722 | f = paths[0] |
|
1722 | f = paths[0] | |
1723 | fp = open(f, "w") |
|
1723 | fp = open(f, "w") | |
1724 | fp.write(samplehgrc) |
|
1724 | fp.write(samplehgrc) | |
1725 | fp.close() |
|
1725 | fp.close() | |
1726 |
|
1726 | |||
1727 | editor = ui.geteditor() |
|
1727 | editor = ui.geteditor() | |
1728 | ui.system("%s \"%s\"" % (editor, f), |
|
1728 | ui.system("%s \"%s\"" % (editor, f), | |
1729 | onerr=error.Abort, errprefix=_("edit failed")) |
|
1729 | onerr=error.Abort, errprefix=_("edit failed")) | |
1730 | return |
|
1730 | return | |
1731 |
|
1731 | |||
1732 | for f in scmutil.rcpath(): |
|
1732 | for f in scmutil.rcpath(): | |
1733 | ui.debug('read config from: %s\n' % f) |
|
1733 | ui.debug('read config from: %s\n' % f) | |
1734 | untrusted = bool(opts.get('untrusted')) |
|
1734 | untrusted = bool(opts.get('untrusted')) | |
1735 | if values: |
|
1735 | if values: | |
1736 | sections = [v for v in values if '.' not in v] |
|
1736 | sections = [v for v in values if '.' not in v] | |
1737 | items = [v for v in values if '.' in v] |
|
1737 | items = [v for v in values if '.' in v] | |
1738 | if len(items) > 1 or items and sections: |
|
1738 | if len(items) > 1 or items and sections: | |
1739 | raise error.Abort(_('only one config item permitted')) |
|
1739 | raise error.Abort(_('only one config item permitted')) | |
1740 | matched = False |
|
1740 | matched = False | |
1741 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1741 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
1742 | value = str(value).replace('\n', '\\n') |
|
1742 | value = str(value).replace('\n', '\\n') | |
1743 | sectname = section + '.' + name |
|
1743 | sectname = section + '.' + name | |
1744 | if values: |
|
1744 | if values: | |
1745 | for v in values: |
|
1745 | for v in values: | |
1746 | if v == section: |
|
1746 | if v == section: | |
1747 | ui.debug('%s: ' % |
|
1747 | ui.debug('%s: ' % | |
1748 | ui.configsource(section, name, untrusted)) |
|
1748 | ui.configsource(section, name, untrusted)) | |
1749 | ui.write('%s=%s\n' % (sectname, value)) |
|
1749 | ui.write('%s=%s\n' % (sectname, value)) | |
1750 | matched = True |
|
1750 | matched = True | |
1751 | elif v == sectname: |
|
1751 | elif v == sectname: | |
1752 | ui.debug('%s: ' % |
|
1752 | ui.debug('%s: ' % | |
1753 | ui.configsource(section, name, untrusted)) |
|
1753 | ui.configsource(section, name, untrusted)) | |
1754 | ui.write(value, '\n') |
|
1754 | ui.write(value, '\n') | |
1755 | matched = True |
|
1755 | matched = True | |
1756 | else: |
|
1756 | else: | |
1757 | ui.debug('%s: ' % |
|
1757 | ui.debug('%s: ' % | |
1758 | ui.configsource(section, name, untrusted)) |
|
1758 | ui.configsource(section, name, untrusted)) | |
1759 | ui.write('%s=%s\n' % (sectname, value)) |
|
1759 | ui.write('%s=%s\n' % (sectname, value)) | |
1760 | matched = True |
|
1760 | matched = True | |
1761 | if matched: |
|
1761 | if matched: | |
1762 | return 0 |
|
1762 | return 0 | |
1763 | return 1 |
|
1763 | return 1 | |
1764 |
|
1764 | |||
1765 | @command('copy|cp', |
|
1765 | @command('copy|cp', | |
1766 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1766 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1767 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1767 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1768 | ] + walkopts + dryrunopts, |
|
1768 | ] + walkopts + dryrunopts, | |
1769 | _('[OPTION]... [SOURCE]... DEST')) |
|
1769 | _('[OPTION]... [SOURCE]... DEST')) | |
1770 | def copy(ui, repo, *pats, **opts): |
|
1770 | def copy(ui, repo, *pats, **opts): | |
1771 | """mark files as copied for the next commit |
|
1771 | """mark files as copied for the next commit | |
1772 |
|
1772 | |||
1773 | Mark dest as having copies of source files. If dest is a |
|
1773 | Mark dest as having copies of source files. If dest is a | |
1774 | directory, copies are put in that directory. If dest is a file, |
|
1774 | directory, copies are put in that directory. If dest is a file, | |
1775 | the source must be a single file. |
|
1775 | the source must be a single file. | |
1776 |
|
1776 | |||
1777 | By default, this command copies the contents of files as they |
|
1777 | By default, this command copies the contents of files as they | |
1778 | exist in the working directory. If invoked with -A/--after, the |
|
1778 | exist in the working directory. If invoked with -A/--after, the | |
1779 | operation is recorded, but no copying is performed. |
|
1779 | operation is recorded, but no copying is performed. | |
1780 |
|
1780 | |||
1781 | This command takes effect with the next commit. To undo a copy |
|
1781 | This command takes effect with the next commit. To undo a copy | |
1782 | before that, see :hg:`revert`. |
|
1782 | before that, see :hg:`revert`. | |
1783 |
|
1783 | |||
1784 | Returns 0 on success, 1 if errors are encountered. |
|
1784 | Returns 0 on success, 1 if errors are encountered. | |
1785 | """ |
|
1785 | """ | |
1786 | wlock = repo.wlock(False) |
|
1786 | wlock = repo.wlock(False) | |
1787 | try: |
|
1787 | try: | |
1788 | return cmdutil.copy(ui, repo, pats, opts) |
|
1788 | return cmdutil.copy(ui, repo, pats, opts) | |
1789 | finally: |
|
1789 | finally: | |
1790 | wlock.release() |
|
1790 | wlock.release() | |
1791 |
|
1791 | |||
1792 | @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True) |
|
1792 | @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True) | |
1793 | def debugancestor(ui, repo, *args): |
|
1793 | def debugancestor(ui, repo, *args): | |
1794 | """find the ancestor revision of two revisions in a given index""" |
|
1794 | """find the ancestor revision of two revisions in a given index""" | |
1795 | if len(args) == 3: |
|
1795 | if len(args) == 3: | |
1796 | index, rev1, rev2 = args |
|
1796 | index, rev1, rev2 = args | |
1797 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) |
|
1797 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) | |
1798 | lookup = r.lookup |
|
1798 | lookup = r.lookup | |
1799 | elif len(args) == 2: |
|
1799 | elif len(args) == 2: | |
1800 | if not repo: |
|
1800 | if not repo: | |
1801 | raise error.Abort(_("there is no Mercurial repository here " |
|
1801 | raise error.Abort(_("there is no Mercurial repository here " | |
1802 | "(.hg not found)")) |
|
1802 | "(.hg not found)")) | |
1803 | rev1, rev2 = args |
|
1803 | rev1, rev2 = args | |
1804 | r = repo.changelog |
|
1804 | r = repo.changelog | |
1805 | lookup = repo.lookup |
|
1805 | lookup = repo.lookup | |
1806 | else: |
|
1806 | else: | |
1807 | raise error.Abort(_('either two or three arguments required')) |
|
1807 | raise error.Abort(_('either two or three arguments required')) | |
1808 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
1808 | a = r.ancestor(lookup(rev1), lookup(rev2)) | |
1809 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
1809 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
1810 |
|
1810 | |||
1811 | @command('debugbuilddag', |
|
1811 | @command('debugbuilddag', | |
1812 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
1812 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), | |
1813 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
1813 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), | |
1814 | ('n', 'new-file', None, _('add new file at each rev'))], |
|
1814 | ('n', 'new-file', None, _('add new file at each rev'))], | |
1815 | _('[OPTION]... [TEXT]')) |
|
1815 | _('[OPTION]... [TEXT]')) | |
1816 | def debugbuilddag(ui, repo, text=None, |
|
1816 | def debugbuilddag(ui, repo, text=None, | |
1817 | mergeable_file=False, |
|
1817 | mergeable_file=False, | |
1818 | overwritten_file=False, |
|
1818 | overwritten_file=False, | |
1819 | new_file=False): |
|
1819 | new_file=False): | |
1820 | """builds a repo with a given DAG from scratch in the current empty repo |
|
1820 | """builds a repo with a given DAG from scratch in the current empty repo | |
1821 |
|
1821 | |||
1822 | The description of the DAG is read from stdin if not given on the |
|
1822 | The description of the DAG is read from stdin if not given on the | |
1823 | command line. |
|
1823 | command line. | |
1824 |
|
1824 | |||
1825 | Elements: |
|
1825 | Elements: | |
1826 |
|
1826 | |||
1827 | - "+n" is a linear run of n nodes based on the current default parent |
|
1827 | - "+n" is a linear run of n nodes based on the current default parent | |
1828 | - "." is a single node based on the current default parent |
|
1828 | - "." is a single node based on the current default parent | |
1829 | - "$" resets the default parent to null (implied at the start); |
|
1829 | - "$" resets the default parent to null (implied at the start); | |
1830 | otherwise the default parent is always the last node created |
|
1830 | otherwise the default parent is always the last node created | |
1831 | - "<p" sets the default parent to the backref p |
|
1831 | - "<p" sets the default parent to the backref p | |
1832 | - "*p" is a fork at parent p, which is a backref |
|
1832 | - "*p" is a fork at parent p, which is a backref | |
1833 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs |
|
1833 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs | |
1834 | - "/p2" is a merge of the preceding node and p2 |
|
1834 | - "/p2" is a merge of the preceding node and p2 | |
1835 | - ":tag" defines a local tag for the preceding node |
|
1835 | - ":tag" defines a local tag for the preceding node | |
1836 | - "@branch" sets the named branch for subsequent nodes |
|
1836 | - "@branch" sets the named branch for subsequent nodes | |
1837 | - "#...\\n" is a comment up to the end of the line |
|
1837 | - "#...\\n" is a comment up to the end of the line | |
1838 |
|
1838 | |||
1839 | Whitespace between the above elements is ignored. |
|
1839 | Whitespace between the above elements is ignored. | |
1840 |
|
1840 | |||
1841 | A backref is either |
|
1841 | A backref is either | |
1842 |
|
1842 | |||
1843 | - a number n, which references the node curr-n, where curr is the current |
|
1843 | - a number n, which references the node curr-n, where curr is the current | |
1844 | node, or |
|
1844 | node, or | |
1845 | - the name of a local tag you placed earlier using ":tag", or |
|
1845 | - the name of a local tag you placed earlier using ":tag", or | |
1846 | - empty to denote the default parent. |
|
1846 | - empty to denote the default parent. | |
1847 |
|
1847 | |||
1848 | All string valued-elements are either strictly alphanumeric, or must |
|
1848 | All string valued-elements are either strictly alphanumeric, or must | |
1849 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
1849 | be enclosed in double quotes ("..."), with "\\" as escape character. | |
1850 | """ |
|
1850 | """ | |
1851 |
|
1851 | |||
1852 | if text is None: |
|
1852 | if text is None: | |
1853 | ui.status(_("reading DAG from stdin\n")) |
|
1853 | ui.status(_("reading DAG from stdin\n")) | |
1854 | text = ui.fin.read() |
|
1854 | text = ui.fin.read() | |
1855 |
|
1855 | |||
1856 | cl = repo.changelog |
|
1856 | cl = repo.changelog | |
1857 | if len(cl) > 0: |
|
1857 | if len(cl) > 0: | |
1858 | raise error.Abort(_('repository is not empty')) |
|
1858 | raise error.Abort(_('repository is not empty')) | |
1859 |
|
1859 | |||
1860 | # determine number of revs in DAG |
|
1860 | # determine number of revs in DAG | |
1861 | total = 0 |
|
1861 | total = 0 | |
1862 | for type, data in dagparser.parsedag(text): |
|
1862 | for type, data in dagparser.parsedag(text): | |
1863 | if type == 'n': |
|
1863 | if type == 'n': | |
1864 | total += 1 |
|
1864 | total += 1 | |
1865 |
|
1865 | |||
1866 | if mergeable_file: |
|
1866 | if mergeable_file: | |
1867 | linesperrev = 2 |
|
1867 | linesperrev = 2 | |
1868 | # make a file with k lines per rev |
|
1868 | # make a file with k lines per rev | |
1869 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] |
|
1869 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] | |
1870 | initialmergedlines.append("") |
|
1870 | initialmergedlines.append("") | |
1871 |
|
1871 | |||
1872 | tags = [] |
|
1872 | tags = [] | |
1873 |
|
1873 | |||
1874 | lock = tr = None |
|
1874 | lock = tr = None | |
1875 | try: |
|
1875 | try: | |
1876 | lock = repo.lock() |
|
1876 | lock = repo.lock() | |
1877 | tr = repo.transaction("builddag") |
|
1877 | tr = repo.transaction("builddag") | |
1878 |
|
1878 | |||
1879 | at = -1 |
|
1879 | at = -1 | |
1880 | atbranch = 'default' |
|
1880 | atbranch = 'default' | |
1881 | nodeids = [] |
|
1881 | nodeids = [] | |
1882 | id = 0 |
|
1882 | id = 0 | |
1883 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1883 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1884 | for type, data in dagparser.parsedag(text): |
|
1884 | for type, data in dagparser.parsedag(text): | |
1885 | if type == 'n': |
|
1885 | if type == 'n': | |
1886 | ui.note(('node %s\n' % str(data))) |
|
1886 | ui.note(('node %s\n' % str(data))) | |
1887 | id, ps = data |
|
1887 | id, ps = data | |
1888 |
|
1888 | |||
1889 | files = [] |
|
1889 | files = [] | |
1890 | fctxs = {} |
|
1890 | fctxs = {} | |
1891 |
|
1891 | |||
1892 | p2 = None |
|
1892 | p2 = None | |
1893 | if mergeable_file: |
|
1893 | if mergeable_file: | |
1894 | fn = "mf" |
|
1894 | fn = "mf" | |
1895 | p1 = repo[ps[0]] |
|
1895 | p1 = repo[ps[0]] | |
1896 | if len(ps) > 1: |
|
1896 | if len(ps) > 1: | |
1897 | p2 = repo[ps[1]] |
|
1897 | p2 = repo[ps[1]] | |
1898 | pa = p1.ancestor(p2) |
|
1898 | pa = p1.ancestor(p2) | |
1899 | base, local, other = [x[fn].data() for x in (pa, p1, |
|
1899 | base, local, other = [x[fn].data() for x in (pa, p1, | |
1900 | p2)] |
|
1900 | p2)] | |
1901 | m3 = simplemerge.Merge3Text(base, local, other) |
|
1901 | m3 = simplemerge.Merge3Text(base, local, other) | |
1902 | ml = [l.strip() for l in m3.merge_lines()] |
|
1902 | ml = [l.strip() for l in m3.merge_lines()] | |
1903 | ml.append("") |
|
1903 | ml.append("") | |
1904 | elif at > 0: |
|
1904 | elif at > 0: | |
1905 | ml = p1[fn].data().split("\n") |
|
1905 | ml = p1[fn].data().split("\n") | |
1906 | else: |
|
1906 | else: | |
1907 | ml = initialmergedlines |
|
1907 | ml = initialmergedlines | |
1908 | ml[id * linesperrev] += " r%i" % id |
|
1908 | ml[id * linesperrev] += " r%i" % id | |
1909 | mergedtext = "\n".join(ml) |
|
1909 | mergedtext = "\n".join(ml) | |
1910 | files.append(fn) |
|
1910 | files.append(fn) | |
1911 | fctxs[fn] = context.memfilectx(repo, fn, mergedtext) |
|
1911 | fctxs[fn] = context.memfilectx(repo, fn, mergedtext) | |
1912 |
|
1912 | |||
1913 | if overwritten_file: |
|
1913 | if overwritten_file: | |
1914 | fn = "of" |
|
1914 | fn = "of" | |
1915 | files.append(fn) |
|
1915 | files.append(fn) | |
1916 | fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id) |
|
1916 | fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id) | |
1917 |
|
1917 | |||
1918 | if new_file: |
|
1918 | if new_file: | |
1919 | fn = "nf%i" % id |
|
1919 | fn = "nf%i" % id | |
1920 | files.append(fn) |
|
1920 | files.append(fn) | |
1921 | fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id) |
|
1921 | fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id) | |
1922 | if len(ps) > 1: |
|
1922 | if len(ps) > 1: | |
1923 | if not p2: |
|
1923 | if not p2: | |
1924 | p2 = repo[ps[1]] |
|
1924 | p2 = repo[ps[1]] | |
1925 | for fn in p2: |
|
1925 | for fn in p2: | |
1926 | if fn.startswith("nf"): |
|
1926 | if fn.startswith("nf"): | |
1927 | files.append(fn) |
|
1927 | files.append(fn) | |
1928 | fctxs[fn] = p2[fn] |
|
1928 | fctxs[fn] = p2[fn] | |
1929 |
|
1929 | |||
1930 | def fctxfn(repo, cx, path): |
|
1930 | def fctxfn(repo, cx, path): | |
1931 | return fctxs.get(path) |
|
1931 | return fctxs.get(path) | |
1932 |
|
1932 | |||
1933 | if len(ps) == 0 or ps[0] < 0: |
|
1933 | if len(ps) == 0 or ps[0] < 0: | |
1934 | pars = [None, None] |
|
1934 | pars = [None, None] | |
1935 | elif len(ps) == 1: |
|
1935 | elif len(ps) == 1: | |
1936 | pars = [nodeids[ps[0]], None] |
|
1936 | pars = [nodeids[ps[0]], None] | |
1937 | else: |
|
1937 | else: | |
1938 | pars = [nodeids[p] for p in ps] |
|
1938 | pars = [nodeids[p] for p in ps] | |
1939 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, |
|
1939 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, | |
1940 | date=(id, 0), |
|
1940 | date=(id, 0), | |
1941 | user="debugbuilddag", |
|
1941 | user="debugbuilddag", | |
1942 | extra={'branch': atbranch}) |
|
1942 | extra={'branch': atbranch}) | |
1943 | nodeid = repo.commitctx(cx) |
|
1943 | nodeid = repo.commitctx(cx) | |
1944 | nodeids.append(nodeid) |
|
1944 | nodeids.append(nodeid) | |
1945 | at = id |
|
1945 | at = id | |
1946 | elif type == 'l': |
|
1946 | elif type == 'l': | |
1947 | id, name = data |
|
1947 | id, name = data | |
1948 | ui.note(('tag %s\n' % name)) |
|
1948 | ui.note(('tag %s\n' % name)) | |
1949 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) |
|
1949 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) | |
1950 | elif type == 'a': |
|
1950 | elif type == 'a': | |
1951 | ui.note(('branch %s\n' % data)) |
|
1951 | ui.note(('branch %s\n' % data)) | |
1952 | atbranch = data |
|
1952 | atbranch = data | |
1953 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1953 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1954 | tr.close() |
|
1954 | tr.close() | |
1955 |
|
1955 | |||
1956 | if tags: |
|
1956 | if tags: | |
1957 | repo.vfs.write("localtags", "".join(tags)) |
|
1957 | repo.vfs.write("localtags", "".join(tags)) | |
1958 | finally: |
|
1958 | finally: | |
1959 | ui.progress(_('building'), None) |
|
1959 | ui.progress(_('building'), None) | |
1960 | release(tr, lock) |
|
1960 | release(tr, lock) | |
1961 |
|
1961 | |||
1962 | @command('debugbundle', |
|
1962 | @command('debugbundle', | |
1963 | [('a', 'all', None, _('show all details'))], |
|
1963 | [('a', 'all', None, _('show all details'))], | |
1964 | _('FILE'), |
|
1964 | _('FILE'), | |
1965 | norepo=True) |
|
1965 | norepo=True) | |
1966 | def debugbundle(ui, bundlepath, all=None, **opts): |
|
1966 | def debugbundle(ui, bundlepath, all=None, **opts): | |
1967 | """lists the contents of a bundle""" |
|
1967 | """lists the contents of a bundle""" | |
1968 | f = hg.openpath(ui, bundlepath) |
|
1968 | f = hg.openpath(ui, bundlepath) | |
1969 | try: |
|
1969 | try: | |
1970 | gen = exchange.readbundle(ui, f, bundlepath) |
|
1970 | gen = exchange.readbundle(ui, f, bundlepath) | |
1971 | if isinstance(gen, bundle2.unbundle20): |
|
1971 | if isinstance(gen, bundle2.unbundle20): | |
1972 | return _debugbundle2(ui, gen, all=all, **opts) |
|
1972 | return _debugbundle2(ui, gen, all=all, **opts) | |
1973 | if all: |
|
1973 | if all: | |
1974 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) |
|
1974 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) | |
1975 |
|
1975 | |||
1976 | def showchunks(named): |
|
1976 | def showchunks(named): | |
1977 | ui.write("\n%s\n" % named) |
|
1977 | ui.write("\n%s\n" % named) | |
1978 | chain = None |
|
1978 | chain = None | |
1979 | while True: |
|
1979 | while True: | |
1980 | chunkdata = gen.deltachunk(chain) |
|
1980 | chunkdata = gen.deltachunk(chain) | |
1981 | if not chunkdata: |
|
1981 | if not chunkdata: | |
1982 | break |
|
1982 | break | |
1983 | node = chunkdata['node'] |
|
1983 | node = chunkdata['node'] | |
1984 | p1 = chunkdata['p1'] |
|
1984 | p1 = chunkdata['p1'] | |
1985 | p2 = chunkdata['p2'] |
|
1985 | p2 = chunkdata['p2'] | |
1986 | cs = chunkdata['cs'] |
|
1986 | cs = chunkdata['cs'] | |
1987 | deltabase = chunkdata['deltabase'] |
|
1987 | deltabase = chunkdata['deltabase'] | |
1988 | delta = chunkdata['delta'] |
|
1988 | delta = chunkdata['delta'] | |
1989 | ui.write("%s %s %s %s %s %s\n" % |
|
1989 | ui.write("%s %s %s %s %s %s\n" % | |
1990 | (hex(node), hex(p1), hex(p2), |
|
1990 | (hex(node), hex(p1), hex(p2), | |
1991 | hex(cs), hex(deltabase), len(delta))) |
|
1991 | hex(cs), hex(deltabase), len(delta))) | |
1992 | chain = node |
|
1992 | chain = node | |
1993 |
|
1993 | |||
1994 | chunkdata = gen.changelogheader() |
|
1994 | chunkdata = gen.changelogheader() | |
1995 | showchunks("changelog") |
|
1995 | showchunks("changelog") | |
1996 | chunkdata = gen.manifestheader() |
|
1996 | chunkdata = gen.manifestheader() | |
1997 | showchunks("manifest") |
|
1997 | showchunks("manifest") | |
1998 | while True: |
|
1998 | while True: | |
1999 | chunkdata = gen.filelogheader() |
|
1999 | chunkdata = gen.filelogheader() | |
2000 | if not chunkdata: |
|
2000 | if not chunkdata: | |
2001 | break |
|
2001 | break | |
2002 | fname = chunkdata['filename'] |
|
2002 | fname = chunkdata['filename'] | |
2003 | showchunks(fname) |
|
2003 | showchunks(fname) | |
2004 | else: |
|
2004 | else: | |
2005 | if isinstance(gen, bundle2.unbundle20): |
|
2005 | if isinstance(gen, bundle2.unbundle20): | |
2006 | raise error.Abort(_('use debugbundle2 for this file')) |
|
2006 | raise error.Abort(_('use debugbundle2 for this file')) | |
2007 | chunkdata = gen.changelogheader() |
|
2007 | chunkdata = gen.changelogheader() | |
2008 | chain = None |
|
2008 | chain = None | |
2009 | while True: |
|
2009 | while True: | |
2010 | chunkdata = gen.deltachunk(chain) |
|
2010 | chunkdata = gen.deltachunk(chain) | |
2011 | if not chunkdata: |
|
2011 | if not chunkdata: | |
2012 | break |
|
2012 | break | |
2013 | node = chunkdata['node'] |
|
2013 | node = chunkdata['node'] | |
2014 | ui.write("%s\n" % hex(node)) |
|
2014 | ui.write("%s\n" % hex(node)) | |
2015 | chain = node |
|
2015 | chain = node | |
2016 | finally: |
|
2016 | finally: | |
2017 | f.close() |
|
2017 | f.close() | |
2018 |
|
2018 | |||
2019 | def _debugbundle2(ui, gen, **opts): |
|
2019 | def _debugbundle2(ui, gen, **opts): | |
2020 | """lists the contents of a bundle2""" |
|
2020 | """lists the contents of a bundle2""" | |
2021 | if not isinstance(gen, bundle2.unbundle20): |
|
2021 | if not isinstance(gen, bundle2.unbundle20): | |
2022 | raise error.Abort(_('not a bundle2 file')) |
|
2022 | raise error.Abort(_('not a bundle2 file')) | |
2023 | ui.write(('Stream params: %s\n' % repr(gen.params))) |
|
2023 | ui.write(('Stream params: %s\n' % repr(gen.params))) | |
2024 | for part in gen.iterparts(): |
|
2024 | for part in gen.iterparts(): | |
2025 | ui.write('%s -- %r\n' % (part.type, repr(part.params))) |
|
2025 | ui.write('%s -- %r\n' % (part.type, repr(part.params))) | |
2026 | if part.type == 'changegroup': |
|
2026 | if part.type == 'changegroup': | |
2027 | version = part.params.get('version', '01') |
|
2027 | version = part.params.get('version', '01') | |
2028 | cg = changegroup.packermap[version][1](part, 'UN') |
|
2028 | cg = changegroup.packermap[version][1](part, 'UN') | |
2029 | chunkdata = cg.changelogheader() |
|
2029 | chunkdata = cg.changelogheader() | |
2030 | chain = None |
|
2030 | chain = None | |
2031 | while True: |
|
2031 | while True: | |
2032 | chunkdata = cg.deltachunk(chain) |
|
2032 | chunkdata = cg.deltachunk(chain) | |
2033 | if not chunkdata: |
|
2033 | if not chunkdata: | |
2034 | break |
|
2034 | break | |
2035 | node = chunkdata['node'] |
|
2035 | node = chunkdata['node'] | |
2036 | ui.write(" %s\n" % hex(node)) |
|
2036 | ui.write(" %s\n" % hex(node)) | |
2037 | chain = node |
|
2037 | chain = node | |
2038 |
|
2038 | |||
2039 | @command('debugcreatestreamclonebundle', [], 'FILE') |
|
2039 | @command('debugcreatestreamclonebundle', [], 'FILE') | |
2040 | def debugcreatestreamclonebundle(ui, repo, fname): |
|
2040 | def debugcreatestreamclonebundle(ui, repo, fname): | |
2041 | """create a stream clone bundle file |
|
2041 | """create a stream clone bundle file | |
2042 |
|
2042 | |||
2043 | Stream bundles are special bundles that are essentially archives of |
|
2043 | Stream bundles are special bundles that are essentially archives of | |
2044 | revlog files. They are commonly used for cloning very quickly. |
|
2044 | revlog files. They are commonly used for cloning very quickly. | |
2045 | """ |
|
2045 | """ | |
2046 | requirements, gen = streamclone.generatebundlev1(repo) |
|
2046 | requirements, gen = streamclone.generatebundlev1(repo) | |
2047 | changegroup.writechunks(ui, gen, fname) |
|
2047 | changegroup.writechunks(ui, gen, fname) | |
2048 |
|
2048 | |||
2049 | ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements))) |
|
2049 | ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements))) | |
2050 |
|
2050 | |||
2051 | @command('debugapplystreamclonebundle', [], 'FILE') |
|
2051 | @command('debugapplystreamclonebundle', [], 'FILE') | |
2052 | def debugapplystreamclonebundle(ui, repo, fname): |
|
2052 | def debugapplystreamclonebundle(ui, repo, fname): | |
2053 | """apply a stream clone bundle file""" |
|
2053 | """apply a stream clone bundle file""" | |
2054 | f = hg.openpath(ui, fname) |
|
2054 | f = hg.openpath(ui, fname) | |
2055 | gen = exchange.readbundle(ui, f, fname) |
|
2055 | gen = exchange.readbundle(ui, f, fname) | |
2056 | gen.apply(repo) |
|
2056 | gen.apply(repo) | |
2057 |
|
2057 | |||
2058 | @command('debugcheckstate', [], '') |
|
2058 | @command('debugcheckstate', [], '') | |
2059 | def debugcheckstate(ui, repo): |
|
2059 | def debugcheckstate(ui, repo): | |
2060 | """validate the correctness of the current dirstate""" |
|
2060 | """validate the correctness of the current dirstate""" | |
2061 | parent1, parent2 = repo.dirstate.parents() |
|
2061 | parent1, parent2 = repo.dirstate.parents() | |
2062 | m1 = repo[parent1].manifest() |
|
2062 | m1 = repo[parent1].manifest() | |
2063 | m2 = repo[parent2].manifest() |
|
2063 | m2 = repo[parent2].manifest() | |
2064 | errors = 0 |
|
2064 | errors = 0 | |
2065 | for f in repo.dirstate: |
|
2065 | for f in repo.dirstate: | |
2066 | state = repo.dirstate[f] |
|
2066 | state = repo.dirstate[f] | |
2067 | if state in "nr" and f not in m1: |
|
2067 | if state in "nr" and f not in m1: | |
2068 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
2068 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | |
2069 | errors += 1 |
|
2069 | errors += 1 | |
2070 | if state in "a" and f in m1: |
|
2070 | if state in "a" and f in m1: | |
2071 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
2071 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | |
2072 | errors += 1 |
|
2072 | errors += 1 | |
2073 | if state in "m" and f not in m1 and f not in m2: |
|
2073 | if state in "m" and f not in m1 and f not in m2: | |
2074 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
2074 | ui.warn(_("%s in state %s, but not in either manifest\n") % | |
2075 | (f, state)) |
|
2075 | (f, state)) | |
2076 | errors += 1 |
|
2076 | errors += 1 | |
2077 | for f in m1: |
|
2077 | for f in m1: | |
2078 | state = repo.dirstate[f] |
|
2078 | state = repo.dirstate[f] | |
2079 | if state not in "nrm": |
|
2079 | if state not in "nrm": | |
2080 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
2080 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | |
2081 | errors += 1 |
|
2081 | errors += 1 | |
2082 | if errors: |
|
2082 | if errors: | |
2083 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
2083 | error = _(".hg/dirstate inconsistent with current parent's manifest") | |
2084 | raise error.Abort(error) |
|
2084 | raise error.Abort(error) | |
2085 |
|
2085 | |||
2086 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) |
|
2086 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) | |
2087 | def debugcommands(ui, cmd='', *args): |
|
2087 | def debugcommands(ui, cmd='', *args): | |
2088 | """list all available commands and options""" |
|
2088 | """list all available commands and options""" | |
2089 | for cmd, vals in sorted(table.iteritems()): |
|
2089 | for cmd, vals in sorted(table.iteritems()): | |
2090 | cmd = cmd.split('|')[0].strip('^') |
|
2090 | cmd = cmd.split('|')[0].strip('^') | |
2091 | opts = ', '.join([i[1] for i in vals[1]]) |
|
2091 | opts = ', '.join([i[1] for i in vals[1]]) | |
2092 | ui.write('%s: %s\n' % (cmd, opts)) |
|
2092 | ui.write('%s: %s\n' % (cmd, opts)) | |
2093 |
|
2093 | |||
2094 | @command('debugcomplete', |
|
2094 | @command('debugcomplete', | |
2095 | [('o', 'options', None, _('show the command options'))], |
|
2095 | [('o', 'options', None, _('show the command options'))], | |
2096 | _('[-o] CMD'), |
|
2096 | _('[-o] CMD'), | |
2097 | norepo=True) |
|
2097 | norepo=True) | |
2098 | def debugcomplete(ui, cmd='', **opts): |
|
2098 | def debugcomplete(ui, cmd='', **opts): | |
2099 | """returns the completion list associated with the given command""" |
|
2099 | """returns the completion list associated with the given command""" | |
2100 |
|
2100 | |||
2101 | if opts.get('options'): |
|
2101 | if opts.get('options'): | |
2102 | options = [] |
|
2102 | options = [] | |
2103 | otables = [globalopts] |
|
2103 | otables = [globalopts] | |
2104 | if cmd: |
|
2104 | if cmd: | |
2105 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
2105 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
2106 | otables.append(entry[1]) |
|
2106 | otables.append(entry[1]) | |
2107 | for t in otables: |
|
2107 | for t in otables: | |
2108 | for o in t: |
|
2108 | for o in t: | |
2109 | if "(DEPRECATED)" in o[3]: |
|
2109 | if "(DEPRECATED)" in o[3]: | |
2110 | continue |
|
2110 | continue | |
2111 | if o[0]: |
|
2111 | if o[0]: | |
2112 | options.append('-%s' % o[0]) |
|
2112 | options.append('-%s' % o[0]) | |
2113 | options.append('--%s' % o[1]) |
|
2113 | options.append('--%s' % o[1]) | |
2114 | ui.write("%s\n" % "\n".join(options)) |
|
2114 | ui.write("%s\n" % "\n".join(options)) | |
2115 | return |
|
2115 | return | |
2116 |
|
2116 | |||
2117 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) |
|
2117 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) | |
2118 | if ui.verbose: |
|
2118 | if ui.verbose: | |
2119 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
2119 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
2120 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
2120 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
2121 |
|
2121 | |||
2122 | @command('debugdag', |
|
2122 | @command('debugdag', | |
2123 | [('t', 'tags', None, _('use tags as labels')), |
|
2123 | [('t', 'tags', None, _('use tags as labels')), | |
2124 | ('b', 'branches', None, _('annotate with branch names')), |
|
2124 | ('b', 'branches', None, _('annotate with branch names')), | |
2125 | ('', 'dots', None, _('use dots for runs')), |
|
2125 | ('', 'dots', None, _('use dots for runs')), | |
2126 | ('s', 'spaces', None, _('separate elements by spaces'))], |
|
2126 | ('s', 'spaces', None, _('separate elements by spaces'))], | |
2127 | _('[OPTION]... [FILE [REV]...]'), |
|
2127 | _('[OPTION]... [FILE [REV]...]'), | |
2128 | optionalrepo=True) |
|
2128 | optionalrepo=True) | |
2129 | def debugdag(ui, repo, file_=None, *revs, **opts): |
|
2129 | def debugdag(ui, repo, file_=None, *revs, **opts): | |
2130 | """format the changelog or an index DAG as a concise textual description |
|
2130 | """format the changelog or an index DAG as a concise textual description | |
2131 |
|
2131 | |||
2132 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
2132 | If you pass a revlog index, the revlog's DAG is emitted. If you list | |
2133 | revision numbers, they get labeled in the output as rN. |
|
2133 | revision numbers, they get labeled in the output as rN. | |
2134 |
|
2134 | |||
2135 | Otherwise, the changelog DAG of the current repo is emitted. |
|
2135 | Otherwise, the changelog DAG of the current repo is emitted. | |
2136 | """ |
|
2136 | """ | |
2137 | spaces = opts.get('spaces') |
|
2137 | spaces = opts.get('spaces') | |
2138 | dots = opts.get('dots') |
|
2138 | dots = opts.get('dots') | |
2139 | if file_: |
|
2139 | if file_: | |
2140 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
2140 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
2141 | revs = set((int(r) for r in revs)) |
|
2141 | revs = set((int(r) for r in revs)) | |
2142 | def events(): |
|
2142 | def events(): | |
2143 | for r in rlog: |
|
2143 | for r in rlog: | |
2144 | yield 'n', (r, list(p for p in rlog.parentrevs(r) |
|
2144 | yield 'n', (r, list(p for p in rlog.parentrevs(r) | |
2145 | if p != -1)) |
|
2145 | if p != -1)) | |
2146 | if r in revs: |
|
2146 | if r in revs: | |
2147 | yield 'l', (r, "r%i" % r) |
|
2147 | yield 'l', (r, "r%i" % r) | |
2148 | elif repo: |
|
2148 | elif repo: | |
2149 | cl = repo.changelog |
|
2149 | cl = repo.changelog | |
2150 | tags = opts.get('tags') |
|
2150 | tags = opts.get('tags') | |
2151 | branches = opts.get('branches') |
|
2151 | branches = opts.get('branches') | |
2152 | if tags: |
|
2152 | if tags: | |
2153 | labels = {} |
|
2153 | labels = {} | |
2154 | for l, n in repo.tags().items(): |
|
2154 | for l, n in repo.tags().items(): | |
2155 | labels.setdefault(cl.rev(n), []).append(l) |
|
2155 | labels.setdefault(cl.rev(n), []).append(l) | |
2156 | def events(): |
|
2156 | def events(): | |
2157 | b = "default" |
|
2157 | b = "default" | |
2158 | for r in cl: |
|
2158 | for r in cl: | |
2159 | if branches: |
|
2159 | if branches: | |
2160 | newb = cl.read(cl.node(r))[5]['branch'] |
|
2160 | newb = cl.read(cl.node(r))[5]['branch'] | |
2161 | if newb != b: |
|
2161 | if newb != b: | |
2162 | yield 'a', newb |
|
2162 | yield 'a', newb | |
2163 | b = newb |
|
2163 | b = newb | |
2164 | yield 'n', (r, list(p for p in cl.parentrevs(r) |
|
2164 | yield 'n', (r, list(p for p in cl.parentrevs(r) | |
2165 | if p != -1)) |
|
2165 | if p != -1)) | |
2166 | if tags: |
|
2166 | if tags: | |
2167 | ls = labels.get(r) |
|
2167 | ls = labels.get(r) | |
2168 | if ls: |
|
2168 | if ls: | |
2169 | for l in ls: |
|
2169 | for l in ls: | |
2170 | yield 'l', (r, l) |
|
2170 | yield 'l', (r, l) | |
2171 | else: |
|
2171 | else: | |
2172 | raise error.Abort(_('need repo for changelog dag')) |
|
2172 | raise error.Abort(_('need repo for changelog dag')) | |
2173 |
|
2173 | |||
2174 | for line in dagparser.dagtextlines(events(), |
|
2174 | for line in dagparser.dagtextlines(events(), | |
2175 | addspaces=spaces, |
|
2175 | addspaces=spaces, | |
2176 | wraplabels=True, |
|
2176 | wraplabels=True, | |
2177 | wrapannotations=True, |
|
2177 | wrapannotations=True, | |
2178 | wrapnonlinear=dots, |
|
2178 | wrapnonlinear=dots, | |
2179 | usedots=dots, |
|
2179 | usedots=dots, | |
2180 | maxlinewidth=70): |
|
2180 | maxlinewidth=70): | |
2181 | ui.write(line) |
|
2181 | ui.write(line) | |
2182 | ui.write("\n") |
|
2182 | ui.write("\n") | |
2183 |
|
2183 | |||
2184 | @command('debugdata', |
|
2184 | @command('debugdata', | |
2185 | [('c', 'changelog', False, _('open changelog')), |
|
2185 | [('c', 'changelog', False, _('open changelog')), | |
2186 | ('m', 'manifest', False, _('open manifest')), |
|
2186 | ('m', 'manifest', False, _('open manifest')), | |
2187 | ('', 'dir', False, _('open directory manifest'))], |
|
2187 | ('', 'dir', False, _('open directory manifest'))], | |
2188 | _('-c|-m|FILE REV')) |
|
2188 | _('-c|-m|FILE REV')) | |
2189 | def debugdata(ui, repo, file_, rev=None, **opts): |
|
2189 | def debugdata(ui, repo, file_, rev=None, **opts): | |
2190 | """dump the contents of a data file revision""" |
|
2190 | """dump the contents of a data file revision""" | |
2191 | if opts.get('changelog') or opts.get('manifest'): |
|
2191 | if opts.get('changelog') or opts.get('manifest'): | |
2192 | file_, rev = None, file_ |
|
2192 | file_, rev = None, file_ | |
2193 | elif rev is None: |
|
2193 | elif rev is None: | |
2194 | raise error.CommandError('debugdata', _('invalid arguments')) |
|
2194 | raise error.CommandError('debugdata', _('invalid arguments')) | |
2195 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) |
|
2195 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) | |
2196 | try: |
|
2196 | try: | |
2197 | ui.write(r.revision(r.lookup(rev))) |
|
2197 | ui.write(r.revision(r.lookup(rev))) | |
2198 | except KeyError: |
|
2198 | except KeyError: | |
2199 | raise error.Abort(_('invalid revision identifier %s') % rev) |
|
2199 | raise error.Abort(_('invalid revision identifier %s') % rev) | |
2200 |
|
2200 | |||
2201 | @command('debugdate', |
|
2201 | @command('debugdate', | |
2202 | [('e', 'extended', None, _('try extended date formats'))], |
|
2202 | [('e', 'extended', None, _('try extended date formats'))], | |
2203 | _('[-e] DATE [RANGE]'), |
|
2203 | _('[-e] DATE [RANGE]'), | |
2204 | norepo=True, optionalrepo=True) |
|
2204 | norepo=True, optionalrepo=True) | |
2205 | def debugdate(ui, date, range=None, **opts): |
|
2205 | def debugdate(ui, date, range=None, **opts): | |
2206 | """parse and display a date""" |
|
2206 | """parse and display a date""" | |
2207 | if opts["extended"]: |
|
2207 | if opts["extended"]: | |
2208 | d = util.parsedate(date, util.extendeddateformats) |
|
2208 | d = util.parsedate(date, util.extendeddateformats) | |
2209 | else: |
|
2209 | else: | |
2210 | d = util.parsedate(date) |
|
2210 | d = util.parsedate(date) | |
2211 | ui.write(("internal: %s %s\n") % d) |
|
2211 | ui.write(("internal: %s %s\n") % d) | |
2212 | ui.write(("standard: %s\n") % util.datestr(d)) |
|
2212 | ui.write(("standard: %s\n") % util.datestr(d)) | |
2213 | if range: |
|
2213 | if range: | |
2214 | m = util.matchdate(range) |
|
2214 | m = util.matchdate(range) | |
2215 | ui.write(("match: %s\n") % m(d[0])) |
|
2215 | ui.write(("match: %s\n") % m(d[0])) | |
2216 |
|
2216 | |||
2217 | @command('debugdiscovery', |
|
2217 | @command('debugdiscovery', | |
2218 | [('', 'old', None, _('use old-style discovery')), |
|
2218 | [('', 'old', None, _('use old-style discovery')), | |
2219 | ('', 'nonheads', None, |
|
2219 | ('', 'nonheads', None, | |
2220 | _('use old-style discovery with non-heads included')), |
|
2220 | _('use old-style discovery with non-heads included')), | |
2221 | ] + remoteopts, |
|
2221 | ] + remoteopts, | |
2222 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) |
|
2222 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) | |
2223 | def debugdiscovery(ui, repo, remoteurl="default", **opts): |
|
2223 | def debugdiscovery(ui, repo, remoteurl="default", **opts): | |
2224 | """runs the changeset discovery protocol in isolation""" |
|
2224 | """runs the changeset discovery protocol in isolation""" | |
2225 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), |
|
2225 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), | |
2226 | opts.get('branch')) |
|
2226 | opts.get('branch')) | |
2227 | remote = hg.peer(repo, opts, remoteurl) |
|
2227 | remote = hg.peer(repo, opts, remoteurl) | |
2228 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) |
|
2228 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) | |
2229 |
|
2229 | |||
2230 | # make sure tests are repeatable |
|
2230 | # make sure tests are repeatable | |
2231 | random.seed(12323) |
|
2231 | random.seed(12323) | |
2232 |
|
2232 | |||
2233 | def doit(localheads, remoteheads, remote=remote): |
|
2233 | def doit(localheads, remoteheads, remote=remote): | |
2234 | if opts.get('old'): |
|
2234 | if opts.get('old'): | |
2235 | if localheads: |
|
2235 | if localheads: | |
2236 | raise error.Abort('cannot use localheads with old style ' |
|
2236 | raise error.Abort('cannot use localheads with old style ' | |
2237 | 'discovery') |
|
2237 | 'discovery') | |
2238 | if not util.safehasattr(remote, 'branches'): |
|
2238 | if not util.safehasattr(remote, 'branches'): | |
2239 | # enable in-client legacy support |
|
2239 | # enable in-client legacy support | |
2240 | remote = localrepo.locallegacypeer(remote.local()) |
|
2240 | remote = localrepo.locallegacypeer(remote.local()) | |
2241 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, |
|
2241 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, | |
2242 | force=True) |
|
2242 | force=True) | |
2243 | common = set(common) |
|
2243 | common = set(common) | |
2244 | if not opts.get('nonheads'): |
|
2244 | if not opts.get('nonheads'): | |
2245 | ui.write(("unpruned common: %s\n") % |
|
2245 | ui.write(("unpruned common: %s\n") % | |
2246 | " ".join(sorted(short(n) for n in common))) |
|
2246 | " ".join(sorted(short(n) for n in common))) | |
2247 | dag = dagutil.revlogdag(repo.changelog) |
|
2247 | dag = dagutil.revlogdag(repo.changelog) | |
2248 | all = dag.ancestorset(dag.internalizeall(common)) |
|
2248 | all = dag.ancestorset(dag.internalizeall(common)) | |
2249 | common = dag.externalizeall(dag.headsetofconnecteds(all)) |
|
2249 | common = dag.externalizeall(dag.headsetofconnecteds(all)) | |
2250 | else: |
|
2250 | else: | |
2251 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) |
|
2251 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) | |
2252 | common = set(common) |
|
2252 | common = set(common) | |
2253 | rheads = set(hds) |
|
2253 | rheads = set(hds) | |
2254 | lheads = set(repo.heads()) |
|
2254 | lheads = set(repo.heads()) | |
2255 | ui.write(("common heads: %s\n") % |
|
2255 | ui.write(("common heads: %s\n") % | |
2256 | " ".join(sorted(short(n) for n in common))) |
|
2256 | " ".join(sorted(short(n) for n in common))) | |
2257 | if lheads <= common: |
|
2257 | if lheads <= common: | |
2258 | ui.write(("local is subset\n")) |
|
2258 | ui.write(("local is subset\n")) | |
2259 | elif rheads <= common: |
|
2259 | elif rheads <= common: | |
2260 | ui.write(("remote is subset\n")) |
|
2260 | ui.write(("remote is subset\n")) | |
2261 |
|
2261 | |||
2262 | serverlogs = opts.get('serverlog') |
|
2262 | serverlogs = opts.get('serverlog') | |
2263 | if serverlogs: |
|
2263 | if serverlogs: | |
2264 | for filename in serverlogs: |
|
2264 | for filename in serverlogs: | |
2265 | logfile = open(filename, 'r') |
|
2265 | logfile = open(filename, 'r') | |
2266 | try: |
|
2266 | try: | |
2267 | line = logfile.readline() |
|
2267 | line = logfile.readline() | |
2268 | while line: |
|
2268 | while line: | |
2269 | parts = line.strip().split(';') |
|
2269 | parts = line.strip().split(';') | |
2270 | op = parts[1] |
|
2270 | op = parts[1] | |
2271 | if op == 'cg': |
|
2271 | if op == 'cg': | |
2272 | pass |
|
2272 | pass | |
2273 | elif op == 'cgss': |
|
2273 | elif op == 'cgss': | |
2274 | doit(parts[2].split(' '), parts[3].split(' ')) |
|
2274 | doit(parts[2].split(' '), parts[3].split(' ')) | |
2275 | elif op == 'unb': |
|
2275 | elif op == 'unb': | |
2276 | doit(parts[3].split(' '), parts[2].split(' ')) |
|
2276 | doit(parts[3].split(' '), parts[2].split(' ')) | |
2277 | line = logfile.readline() |
|
2277 | line = logfile.readline() | |
2278 | finally: |
|
2278 | finally: | |
2279 | logfile.close() |
|
2279 | logfile.close() | |
2280 |
|
2280 | |||
2281 | else: |
|
2281 | else: | |
2282 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, |
|
2282 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, | |
2283 | opts.get('remote_head')) |
|
2283 | opts.get('remote_head')) | |
2284 | localrevs = opts.get('local_head') |
|
2284 | localrevs = opts.get('local_head') | |
2285 | doit(localrevs, remoterevs) |
|
2285 | doit(localrevs, remoterevs) | |
2286 |
|
2286 | |||
2287 | @command('debugextensions', formatteropts, [], norepo=True) |
|
2287 | @command('debugextensions', formatteropts, [], norepo=True) | |
2288 | def debugextensions(ui, **opts): |
|
2288 | def debugextensions(ui, **opts): | |
2289 | '''show information about active extensions''' |
|
2289 | '''show information about active extensions''' | |
2290 | exts = extensions.extensions(ui) |
|
2290 | exts = extensions.extensions(ui) | |
2291 | fm = ui.formatter('debugextensions', opts) |
|
2291 | fm = ui.formatter('debugextensions', opts) | |
2292 | for extname, extmod in sorted(exts, key=operator.itemgetter(0)): |
|
2292 | for extname, extmod in sorted(exts, key=operator.itemgetter(0)): | |
2293 | extsource = extmod.__file__ |
|
2293 | extsource = extmod.__file__ | |
2294 | exttestedwith = getattr(extmod, 'testedwith', None) |
|
2294 | exttestedwith = getattr(extmod, 'testedwith', None) | |
2295 | if exttestedwith is not None: |
|
2295 | if exttestedwith is not None: | |
2296 | exttestedwith = exttestedwith.split() |
|
2296 | exttestedwith = exttestedwith.split() | |
2297 | extbuglink = getattr(extmod, 'buglink', None) |
|
2297 | extbuglink = getattr(extmod, 'buglink', None) | |
2298 |
|
2298 | |||
2299 | fm.startitem() |
|
2299 | fm.startitem() | |
2300 |
|
2300 | |||
2301 | if ui.quiet or ui.verbose: |
|
2301 | if ui.quiet or ui.verbose: | |
2302 | fm.write('name', '%s\n', extname) |
|
2302 | fm.write('name', '%s\n', extname) | |
2303 | else: |
|
2303 | else: | |
2304 | fm.write('name', '%s', extname) |
|
2304 | fm.write('name', '%s', extname) | |
2305 | if not exttestedwith: |
|
2305 | if not exttestedwith: | |
2306 | fm.plain(_(' (untested!)\n')) |
|
2306 | fm.plain(_(' (untested!)\n')) | |
2307 | else: |
|
2307 | else: | |
2308 | if exttestedwith == ['internal'] or \ |
|
2308 | if exttestedwith == ['internal'] or \ | |
2309 | util.version() in exttestedwith: |
|
2309 | util.version() in exttestedwith: | |
2310 | fm.plain('\n') |
|
2310 | fm.plain('\n') | |
2311 | else: |
|
2311 | else: | |
2312 | lasttestedversion = exttestedwith[-1] |
|
2312 | lasttestedversion = exttestedwith[-1] | |
2313 | fm.plain(' (%s!)\n' % lasttestedversion) |
|
2313 | fm.plain(' (%s!)\n' % lasttestedversion) | |
2314 |
|
2314 | |||
2315 | fm.condwrite(ui.verbose and extsource, 'source', |
|
2315 | fm.condwrite(ui.verbose and extsource, 'source', | |
2316 | _(' location: %s\n'), extsource or "") |
|
2316 | _(' location: %s\n'), extsource or "") | |
2317 |
|
2317 | |||
2318 | fm.condwrite(ui.verbose and exttestedwith, 'testedwith', |
|
2318 | fm.condwrite(ui.verbose and exttestedwith, 'testedwith', | |
2319 | _(' tested with: %s\n'), ' '.join(exttestedwith or [])) |
|
2319 | _(' tested with: %s\n'), ' '.join(exttestedwith or [])) | |
2320 |
|
2320 | |||
2321 | fm.condwrite(ui.verbose and extbuglink, 'buglink', |
|
2321 | fm.condwrite(ui.verbose and extbuglink, 'buglink', | |
2322 | _(' bug reporting: %s\n'), extbuglink or "") |
|
2322 | _(' bug reporting: %s\n'), extbuglink or "") | |
2323 |
|
2323 | |||
2324 | fm.end() |
|
2324 | fm.end() | |
2325 |
|
2325 | |||
2326 | @command('debugfileset', |
|
2326 | @command('debugfileset', | |
2327 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], |
|
2327 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], | |
2328 | _('[-r REV] FILESPEC')) |
|
2328 | _('[-r REV] FILESPEC')) | |
2329 | def debugfileset(ui, repo, expr, **opts): |
|
2329 | def debugfileset(ui, repo, expr, **opts): | |
2330 | '''parse and apply a fileset specification''' |
|
2330 | '''parse and apply a fileset specification''' | |
2331 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
2331 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
2332 | if ui.verbose: |
|
2332 | if ui.verbose: | |
2333 | tree = fileset.parse(expr) |
|
2333 | tree = fileset.parse(expr) | |
2334 | ui.note(fileset.prettyformat(tree), "\n") |
|
2334 | ui.note(fileset.prettyformat(tree), "\n") | |
2335 |
|
2335 | |||
2336 | for f in ctx.getfileset(expr): |
|
2336 | for f in ctx.getfileset(expr): | |
2337 | ui.write("%s\n" % f) |
|
2337 | ui.write("%s\n" % f) | |
2338 |
|
2338 | |||
2339 | @command('debugfsinfo', [], _('[PATH]'), norepo=True) |
|
2339 | @command('debugfsinfo', [], _('[PATH]'), norepo=True) | |
2340 | def debugfsinfo(ui, path="."): |
|
2340 | def debugfsinfo(ui, path="."): | |
2341 | """show information detected about current filesystem""" |
|
2341 | """show information detected about current filesystem""" | |
2342 | util.writefile('.debugfsinfo', '') |
|
2342 | util.writefile('.debugfsinfo', '') | |
2343 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) |
|
2343 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) | |
2344 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) |
|
2344 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) | |
2345 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) |
|
2345 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) | |
2346 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') |
|
2346 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') | |
2347 | and 'yes' or 'no')) |
|
2347 | and 'yes' or 'no')) | |
2348 | os.unlink('.debugfsinfo') |
|
2348 | os.unlink('.debugfsinfo') | |
2349 |
|
2349 | |||
2350 | @command('debuggetbundle', |
|
2350 | @command('debuggetbundle', | |
2351 | [('H', 'head', [], _('id of head node'), _('ID')), |
|
2351 | [('H', 'head', [], _('id of head node'), _('ID')), | |
2352 | ('C', 'common', [], _('id of common node'), _('ID')), |
|
2352 | ('C', 'common', [], _('id of common node'), _('ID')), | |
2353 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], |
|
2353 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], | |
2354 | _('REPO FILE [-H|-C ID]...'), |
|
2354 | _('REPO FILE [-H|-C ID]...'), | |
2355 | norepo=True) |
|
2355 | norepo=True) | |
2356 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): |
|
2356 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): | |
2357 | """retrieves a bundle from a repo |
|
2357 | """retrieves a bundle from a repo | |
2358 |
|
2358 | |||
2359 | Every ID must be a full-length hex node id string. Saves the bundle to the |
|
2359 | Every ID must be a full-length hex node id string. Saves the bundle to the | |
2360 | given file. |
|
2360 | given file. | |
2361 | """ |
|
2361 | """ | |
2362 | repo = hg.peer(ui, opts, repopath) |
|
2362 | repo = hg.peer(ui, opts, repopath) | |
2363 | if not repo.capable('getbundle'): |
|
2363 | if not repo.capable('getbundle'): | |
2364 | raise error.Abort("getbundle() not supported by target repository") |
|
2364 | raise error.Abort("getbundle() not supported by target repository") | |
2365 | args = {} |
|
2365 | args = {} | |
2366 | if common: |
|
2366 | if common: | |
2367 | args['common'] = [bin(s) for s in common] |
|
2367 | args['common'] = [bin(s) for s in common] | |
2368 | if head: |
|
2368 | if head: | |
2369 | args['heads'] = [bin(s) for s in head] |
|
2369 | args['heads'] = [bin(s) for s in head] | |
2370 | # TODO: get desired bundlecaps from command line. |
|
2370 | # TODO: get desired bundlecaps from command line. | |
2371 | args['bundlecaps'] = None |
|
2371 | args['bundlecaps'] = None | |
2372 | bundle = repo.getbundle('debug', **args) |
|
2372 | bundle = repo.getbundle('debug', **args) | |
2373 |
|
2373 | |||
2374 | bundletype = opts.get('type', 'bzip2').lower() |
|
2374 | bundletype = opts.get('type', 'bzip2').lower() | |
2375 | btypes = {'none': 'HG10UN', |
|
2375 | btypes = {'none': 'HG10UN', | |
2376 | 'bzip2': 'HG10BZ', |
|
2376 | 'bzip2': 'HG10BZ', | |
2377 | 'gzip': 'HG10GZ', |
|
2377 | 'gzip': 'HG10GZ', | |
2378 | 'bundle2': 'HG20'} |
|
2378 | 'bundle2': 'HG20'} | |
2379 | bundletype = btypes.get(bundletype) |
|
2379 | bundletype = btypes.get(bundletype) | |
2380 | if bundletype not in changegroup.bundletypes: |
|
2380 | if bundletype not in changegroup.bundletypes: | |
2381 | raise error.Abort(_('unknown bundle type specified with --type')) |
|
2381 | raise error.Abort(_('unknown bundle type specified with --type')) | |
2382 | changegroup.writebundle(ui, bundle, bundlepath, bundletype) |
|
2382 | changegroup.writebundle(ui, bundle, bundlepath, bundletype) | |
2383 |
|
2383 | |||
2384 | @command('debugignore', [], '') |
|
2384 | @command('debugignore', [], '') | |
2385 | def debugignore(ui, repo, *values, **opts): |
|
2385 | def debugignore(ui, repo, *values, **opts): | |
2386 | """display the combined ignore pattern""" |
|
2386 | """display the combined ignore pattern""" | |
2387 | ignore = repo.dirstate._ignore |
|
2387 | ignore = repo.dirstate._ignore | |
2388 | includepat = getattr(ignore, 'includepat', None) |
|
2388 | includepat = getattr(ignore, 'includepat', None) | |
2389 | if includepat is not None: |
|
2389 | if includepat is not None: | |
2390 | ui.write("%s\n" % includepat) |
|
2390 | ui.write("%s\n" % includepat) | |
2391 | else: |
|
2391 | else: | |
2392 | raise error.Abort(_("no ignore patterns found")) |
|
2392 | raise error.Abort(_("no ignore patterns found")) | |
2393 |
|
2393 | |||
2394 | @command('debugindex', |
|
2394 | @command('debugindex', | |
2395 | [('c', 'changelog', False, _('open changelog')), |
|
2395 | [('c', 'changelog', False, _('open changelog')), | |
2396 | ('m', 'manifest', False, _('open manifest')), |
|
2396 | ('m', 'manifest', False, _('open manifest')), | |
2397 | ('', 'dir', False, _('open directory manifest')), |
|
2397 | ('', 'dir', False, _('open directory manifest')), | |
2398 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], |
|
2398 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], | |
2399 | _('[-f FORMAT] -c|-m|FILE'), |
|
2399 | _('[-f FORMAT] -c|-m|FILE'), | |
2400 | optionalrepo=True) |
|
2400 | optionalrepo=True) | |
2401 | def debugindex(ui, repo, file_=None, **opts): |
|
2401 | def debugindex(ui, repo, file_=None, **opts): | |
2402 | """dump the contents of an index file""" |
|
2402 | """dump the contents of an index file""" | |
2403 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) |
|
2403 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) | |
2404 | format = opts.get('format', 0) |
|
2404 | format = opts.get('format', 0) | |
2405 | if format not in (0, 1): |
|
2405 | if format not in (0, 1): | |
2406 | raise error.Abort(_("unknown format %d") % format) |
|
2406 | raise error.Abort(_("unknown format %d") % format) | |
2407 |
|
2407 | |||
2408 | generaldelta = r.version & revlog.REVLOGGENERALDELTA |
|
2408 | generaldelta = r.version & revlog.REVLOGGENERALDELTA | |
2409 | if generaldelta: |
|
2409 | if generaldelta: | |
2410 | basehdr = ' delta' |
|
2410 | basehdr = ' delta' | |
2411 | else: |
|
2411 | else: | |
2412 | basehdr = ' base' |
|
2412 | basehdr = ' base' | |
2413 |
|
2413 | |||
2414 | if ui.debugflag: |
|
2414 | if ui.debugflag: | |
2415 | shortfn = hex |
|
2415 | shortfn = hex | |
2416 | else: |
|
2416 | else: | |
2417 | shortfn = short |
|
2417 | shortfn = short | |
2418 |
|
2418 | |||
2419 | # There might not be anything in r, so have a sane default |
|
2419 | # There might not be anything in r, so have a sane default | |
2420 | idlen = 12 |
|
2420 | idlen = 12 | |
2421 | for i in r: |
|
2421 | for i in r: | |
2422 | idlen = len(shortfn(r.node(i))) |
|
2422 | idlen = len(shortfn(r.node(i))) | |
2423 | break |
|
2423 | break | |
2424 |
|
2424 | |||
2425 | if format == 0: |
|
2425 | if format == 0: | |
2426 | ui.write(" rev offset length " + basehdr + " linkrev" |
|
2426 | ui.write(" rev offset length " + basehdr + " linkrev" | |
2427 | " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen))) |
|
2427 | " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen))) | |
2428 | elif format == 1: |
|
2428 | elif format == 1: | |
2429 | ui.write(" rev flag offset length" |
|
2429 | ui.write(" rev flag offset length" | |
2430 | " size " + basehdr + " link p1 p2" |
|
2430 | " size " + basehdr + " link p1 p2" | |
2431 | " %s\n" % "nodeid".rjust(idlen)) |
|
2431 | " %s\n" % "nodeid".rjust(idlen)) | |
2432 |
|
2432 | |||
2433 | for i in r: |
|
2433 | for i in r: | |
2434 | node = r.node(i) |
|
2434 | node = r.node(i) | |
2435 | if generaldelta: |
|
2435 | if generaldelta: | |
2436 | base = r.deltaparent(i) |
|
2436 | base = r.deltaparent(i) | |
2437 | else: |
|
2437 | else: | |
2438 | base = r.chainbase(i) |
|
2438 | base = r.chainbase(i) | |
2439 | if format == 0: |
|
2439 | if format == 0: | |
2440 | try: |
|
2440 | try: | |
2441 | pp = r.parents(node) |
|
2441 | pp = r.parents(node) | |
2442 | except Exception: |
|
2442 | except Exception: | |
2443 | pp = [nullid, nullid] |
|
2443 | pp = [nullid, nullid] | |
2444 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
2444 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | |
2445 | i, r.start(i), r.length(i), base, r.linkrev(i), |
|
2445 | i, r.start(i), r.length(i), base, r.linkrev(i), | |
2446 | shortfn(node), shortfn(pp[0]), shortfn(pp[1]))) |
|
2446 | shortfn(node), shortfn(pp[0]), shortfn(pp[1]))) | |
2447 | elif format == 1: |
|
2447 | elif format == 1: | |
2448 | pr = r.parentrevs(i) |
|
2448 | pr = r.parentrevs(i) | |
2449 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( |
|
2449 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( | |
2450 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), |
|
2450 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), | |
2451 | base, r.linkrev(i), pr[0], pr[1], shortfn(node))) |
|
2451 | base, r.linkrev(i), pr[0], pr[1], shortfn(node))) | |
2452 |
|
2452 | |||
2453 | @command('debugindexdot', [], _('FILE'), optionalrepo=True) |
|
2453 | @command('debugindexdot', [], _('FILE'), optionalrepo=True) | |
2454 | def debugindexdot(ui, repo, file_): |
|
2454 | def debugindexdot(ui, repo, file_): | |
2455 | """dump an index DAG as a graphviz dot file""" |
|
2455 | """dump an index DAG as a graphviz dot file""" | |
2456 | r = None |
|
2456 | r = None | |
2457 | if repo: |
|
2457 | if repo: | |
2458 | filelog = repo.file(file_) |
|
2458 | filelog = repo.file(file_) | |
2459 | if len(filelog): |
|
2459 | if len(filelog): | |
2460 | r = filelog |
|
2460 | r = filelog | |
2461 | if not r: |
|
2461 | if not r: | |
2462 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
2462 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
2463 | ui.write(("digraph G {\n")) |
|
2463 | ui.write(("digraph G {\n")) | |
2464 | for i in r: |
|
2464 | for i in r: | |
2465 | node = r.node(i) |
|
2465 | node = r.node(i) | |
2466 | pp = r.parents(node) |
|
2466 | pp = r.parents(node) | |
2467 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
2467 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | |
2468 | if pp[1] != nullid: |
|
2468 | if pp[1] != nullid: | |
2469 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
2469 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | |
2470 | ui.write("}\n") |
|
2470 | ui.write("}\n") | |
2471 |
|
2471 | |||
2472 | @command('debuginstall', [], '', norepo=True) |
|
2472 | @command('debuginstall', [], '', norepo=True) | |
2473 | def debuginstall(ui): |
|
2473 | def debuginstall(ui): | |
2474 | '''test Mercurial installation |
|
2474 | '''test Mercurial installation | |
2475 |
|
2475 | |||
2476 | Returns 0 on success. |
|
2476 | Returns 0 on success. | |
2477 | ''' |
|
2477 | ''' | |
2478 |
|
2478 | |||
2479 | def writetemp(contents): |
|
2479 | def writetemp(contents): | |
2480 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
2480 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") | |
2481 | f = os.fdopen(fd, "wb") |
|
2481 | f = os.fdopen(fd, "wb") | |
2482 | f.write(contents) |
|
2482 | f.write(contents) | |
2483 | f.close() |
|
2483 | f.close() | |
2484 | return name |
|
2484 | return name | |
2485 |
|
2485 | |||
2486 | problems = 0 |
|
2486 | problems = 0 | |
2487 |
|
2487 | |||
2488 | # encoding |
|
2488 | # encoding | |
2489 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) |
|
2489 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) | |
2490 | try: |
|
2490 | try: | |
2491 | encoding.fromlocal("test") |
|
2491 | encoding.fromlocal("test") | |
2492 | except error.Abort as inst: |
|
2492 | except error.Abort as inst: | |
2493 | ui.write(" %s\n" % inst) |
|
2493 | ui.write(" %s\n" % inst) | |
2494 | ui.write(_(" (check that your locale is properly set)\n")) |
|
2494 | ui.write(_(" (check that your locale is properly set)\n")) | |
2495 | problems += 1 |
|
2495 | problems += 1 | |
2496 |
|
2496 | |||
2497 | # Python |
|
2497 | # Python | |
2498 | ui.status(_("checking Python executable (%s)\n") % sys.executable) |
|
2498 | ui.status(_("checking Python executable (%s)\n") % sys.executable) | |
2499 | ui.status(_("checking Python version (%s)\n") |
|
2499 | ui.status(_("checking Python version (%s)\n") | |
2500 | % ("%s.%s.%s" % sys.version_info[:3])) |
|
2500 | % ("%s.%s.%s" % sys.version_info[:3])) | |
2501 | ui.status(_("checking Python lib (%s)...\n") |
|
2501 | ui.status(_("checking Python lib (%s)...\n") | |
2502 | % os.path.dirname(os.__file__)) |
|
2502 | % os.path.dirname(os.__file__)) | |
2503 |
|
2503 | |||
2504 | # compiled modules |
|
2504 | # compiled modules | |
2505 | ui.status(_("checking installed modules (%s)...\n") |
|
2505 | ui.status(_("checking installed modules (%s)...\n") | |
2506 | % os.path.dirname(__file__)) |
|
2506 | % os.path.dirname(__file__)) | |
2507 | try: |
|
2507 | try: | |
2508 | import bdiff, mpatch, base85, osutil |
|
2508 | import bdiff, mpatch, base85, osutil | |
2509 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
2509 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes | |
2510 | except Exception as inst: |
|
2510 | except Exception as inst: | |
2511 | ui.write(" %s\n" % inst) |
|
2511 | ui.write(" %s\n" % inst) | |
2512 | ui.write(_(" One or more extensions could not be found")) |
|
2512 | ui.write(_(" One or more extensions could not be found")) | |
2513 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
2513 | ui.write(_(" (check that you compiled the extensions)\n")) | |
2514 | problems += 1 |
|
2514 | problems += 1 | |
2515 |
|
2515 | |||
2516 | # templates |
|
2516 | # templates | |
2517 | import templater |
|
2517 | import templater | |
2518 | p = templater.templatepaths() |
|
2518 | p = templater.templatepaths() | |
2519 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) |
|
2519 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) | |
2520 | if p: |
|
2520 | if p: | |
2521 | m = templater.templatepath("map-cmdline.default") |
|
2521 | m = templater.templatepath("map-cmdline.default") | |
2522 | if m: |
|
2522 | if m: | |
2523 | # template found, check if it is working |
|
2523 | # template found, check if it is working | |
2524 | try: |
|
2524 | try: | |
2525 | templater.templater(m) |
|
2525 | templater.templater(m) | |
2526 | except Exception as inst: |
|
2526 | except Exception as inst: | |
2527 | ui.write(" %s\n" % inst) |
|
2527 | ui.write(" %s\n" % inst) | |
2528 | p = None |
|
2528 | p = None | |
2529 | else: |
|
2529 | else: | |
2530 | ui.write(_(" template 'default' not found\n")) |
|
2530 | ui.write(_(" template 'default' not found\n")) | |
2531 | p = None |
|
2531 | p = None | |
2532 | else: |
|
2532 | else: | |
2533 | ui.write(_(" no template directories found\n")) |
|
2533 | ui.write(_(" no template directories found\n")) | |
2534 | if not p: |
|
2534 | if not p: | |
2535 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
2535 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) | |
2536 | problems += 1 |
|
2536 | problems += 1 | |
2537 |
|
2537 | |||
2538 | # editor |
|
2538 | # editor | |
2539 | ui.status(_("checking commit editor...\n")) |
|
2539 | ui.status(_("checking commit editor...\n")) | |
2540 | editor = ui.geteditor() |
|
2540 | editor = ui.geteditor() | |
2541 | editor = util.expandpath(editor) |
|
2541 | editor = util.expandpath(editor) | |
2542 | cmdpath = util.findexe(shlex.split(editor)[0]) |
|
2542 | cmdpath = util.findexe(shlex.split(editor)[0]) | |
2543 | if not cmdpath: |
|
2543 | if not cmdpath: | |
2544 | if editor == 'vi': |
|
2544 | if editor == 'vi': | |
2545 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
2545 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) | |
2546 | ui.write(_(" (specify a commit editor in your configuration" |
|
2546 | ui.write(_(" (specify a commit editor in your configuration" | |
2547 | " file)\n")) |
|
2547 | " file)\n")) | |
2548 | else: |
|
2548 | else: | |
2549 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
2549 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) | |
2550 | ui.write(_(" (specify a commit editor in your configuration" |
|
2550 | ui.write(_(" (specify a commit editor in your configuration" | |
2551 | " file)\n")) |
|
2551 | " file)\n")) | |
2552 | problems += 1 |
|
2552 | problems += 1 | |
2553 |
|
2553 | |||
2554 | # check username |
|
2554 | # check username | |
2555 | ui.status(_("checking username...\n")) |
|
2555 | ui.status(_("checking username...\n")) | |
2556 | try: |
|
2556 | try: | |
2557 | ui.username() |
|
2557 | ui.username() | |
2558 | except error.Abort as e: |
|
2558 | except error.Abort as e: | |
2559 | ui.write(" %s\n" % e) |
|
2559 | ui.write(" %s\n" % e) | |
2560 | ui.write(_(" (specify a username in your configuration file)\n")) |
|
2560 | ui.write(_(" (specify a username in your configuration file)\n")) | |
2561 | problems += 1 |
|
2561 | problems += 1 | |
2562 |
|
2562 | |||
2563 | if not problems: |
|
2563 | if not problems: | |
2564 | ui.status(_("no problems detected\n")) |
|
2564 | ui.status(_("no problems detected\n")) | |
2565 | else: |
|
2565 | else: | |
2566 | ui.write(_("%s problems detected," |
|
2566 | ui.write(_("%s problems detected," | |
2567 | " please check your install!\n") % problems) |
|
2567 | " please check your install!\n") % problems) | |
2568 |
|
2568 | |||
2569 | return problems |
|
2569 | return problems | |
2570 |
|
2570 | |||
2571 | @command('debugknown', [], _('REPO ID...'), norepo=True) |
|
2571 | @command('debugknown', [], _('REPO ID...'), norepo=True) | |
2572 | def debugknown(ui, repopath, *ids, **opts): |
|
2572 | def debugknown(ui, repopath, *ids, **opts): | |
2573 | """test whether node ids are known to a repo |
|
2573 | """test whether node ids are known to a repo | |
2574 |
|
2574 | |||
2575 | Every ID must be a full-length hex node id string. Returns a list of 0s |
|
2575 | Every ID must be a full-length hex node id string. Returns a list of 0s | |
2576 | and 1s indicating unknown/known. |
|
2576 | and 1s indicating unknown/known. | |
2577 | """ |
|
2577 | """ | |
2578 | repo = hg.peer(ui, opts, repopath) |
|
2578 | repo = hg.peer(ui, opts, repopath) | |
2579 | if not repo.capable('known'): |
|
2579 | if not repo.capable('known'): | |
2580 | raise error.Abort("known() not supported by target repository") |
|
2580 | raise error.Abort("known() not supported by target repository") | |
2581 | flags = repo.known([bin(s) for s in ids]) |
|
2581 | flags = repo.known([bin(s) for s in ids]) | |
2582 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
2582 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) | |
2583 |
|
2583 | |||
2584 | @command('debuglabelcomplete', [], _('LABEL...')) |
|
2584 | @command('debuglabelcomplete', [], _('LABEL...')) | |
2585 | def debuglabelcomplete(ui, repo, *args): |
|
2585 | def debuglabelcomplete(ui, repo, *args): | |
2586 | '''backwards compatibility with old bash completion scripts (DEPRECATED)''' |
|
2586 | '''backwards compatibility with old bash completion scripts (DEPRECATED)''' | |
2587 | debugnamecomplete(ui, repo, *args) |
|
2587 | debugnamecomplete(ui, repo, *args) | |
2588 |
|
2588 | |||
2589 | @command('debugmergestate', [], '') |
|
2589 | @command('debugmergestate', [], '') | |
2590 | def debugmergestate(ui, repo, *args): |
|
2590 | def debugmergestate(ui, repo, *args): | |
2591 | """print merge state |
|
2591 | """print merge state | |
2592 |
|
2592 | |||
2593 | Use --verbose to print out information about whether v1 or v2 merge state |
|
2593 | Use --verbose to print out information about whether v1 or v2 merge state | |
2594 | was chosen.""" |
|
2594 | was chosen.""" | |
2595 | def _hashornull(h): |
|
2595 | def _hashornull(h): | |
2596 | if h == nullhex: |
|
2596 | if h == nullhex: | |
2597 | return 'null' |
|
2597 | return 'null' | |
2598 | else: |
|
2598 | else: | |
2599 | return h |
|
2599 | return h | |
2600 |
|
2600 | |||
2601 | def printrecords(version): |
|
2601 | def printrecords(version): | |
2602 | ui.write(('* version %s records\n') % version) |
|
2602 | ui.write(('* version %s records\n') % version) | |
2603 | if version == 1: |
|
2603 | if version == 1: | |
2604 | records = v1records |
|
2604 | records = v1records | |
2605 | else: |
|
2605 | else: | |
2606 | records = v2records |
|
2606 | records = v2records | |
2607 |
|
2607 | |||
2608 | for rtype, record in records: |
|
2608 | for rtype, record in records: | |
2609 | # pretty print some record types |
|
2609 | # pretty print some record types | |
2610 | if rtype == 'L': |
|
2610 | if rtype == 'L': | |
2611 | ui.write(('local: %s\n') % record) |
|
2611 | ui.write(('local: %s\n') % record) | |
2612 | elif rtype == 'O': |
|
2612 | elif rtype == 'O': | |
2613 | ui.write(('other: %s\n') % record) |
|
2613 | ui.write(('other: %s\n') % record) | |
2614 | elif rtype == 'm': |
|
2614 | elif rtype == 'm': | |
2615 | driver, mdstate = record.split('\0', 1) |
|
2615 | driver, mdstate = record.split('\0', 1) | |
2616 | ui.write(('merge driver: %s (state "%s")\n') |
|
2616 | ui.write(('merge driver: %s (state "%s")\n') | |
2617 | % (driver, mdstate)) |
|
2617 | % (driver, mdstate)) | |
2618 | elif rtype in 'FDC': |
|
2618 | elif rtype in 'FDC': | |
2619 | r = record.split('\0') |
|
2619 | r = record.split('\0') | |
2620 | f, state, hash, lfile, afile, anode, ofile = r[0:7] |
|
2620 | f, state, hash, lfile, afile, anode, ofile = r[0:7] | |
2621 | if version == 1: |
|
2621 | if version == 1: | |
2622 | onode = 'not stored in v1 format' |
|
2622 | onode = 'not stored in v1 format' | |
2623 | flags = r[7] |
|
2623 | flags = r[7] | |
2624 | else: |
|
2624 | else: | |
2625 | onode, flags = r[7:9] |
|
2625 | onode, flags = r[7:9] | |
2626 | ui.write(('file: %s (record type "%s", state "%s", hash %s)\n') |
|
2626 | ui.write(('file: %s (record type "%s", state "%s", hash %s)\n') | |
2627 | % (f, rtype, state, _hashornull(hash))) |
|
2627 | % (f, rtype, state, _hashornull(hash))) | |
2628 | ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) |
|
2628 | ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) | |
2629 | ui.write((' ancestor path: %s (node %s)\n') |
|
2629 | ui.write((' ancestor path: %s (node %s)\n') | |
2630 | % (afile, _hashornull(anode))) |
|
2630 | % (afile, _hashornull(anode))) | |
2631 | ui.write((' other path: %s (node %s)\n') |
|
2631 | ui.write((' other path: %s (node %s)\n') | |
2632 | % (ofile, _hashornull(onode))) |
|
2632 | % (ofile, _hashornull(onode))) | |
2633 | else: |
|
2633 | else: | |
2634 | ui.write(('unrecognized entry: %s\t%s\n') |
|
2634 | ui.write(('unrecognized entry: %s\t%s\n') | |
2635 | % (rtype, record.replace('\0', '\t'))) |
|
2635 | % (rtype, record.replace('\0', '\t'))) | |
2636 |
|
2636 | |||
2637 | # Avoid mergestate.read() since it may raise an exception for unsupported |
|
2637 | # Avoid mergestate.read() since it may raise an exception for unsupported | |
2638 | # merge state records. We shouldn't be doing this, but this is OK since this |
|
2638 | # merge state records. We shouldn't be doing this, but this is OK since this | |
2639 | # command is pretty low-level. |
|
2639 | # command is pretty low-level. | |
2640 | ms = mergemod.mergestate(repo) |
|
2640 | ms = mergemod.mergestate(repo) | |
2641 |
|
2641 | |||
2642 | # sort so that reasonable information is on top |
|
2642 | # sort so that reasonable information is on top | |
2643 | v1records = ms._readrecordsv1() |
|
2643 | v1records = ms._readrecordsv1() | |
2644 | v2records = ms._readrecordsv2() |
|
2644 | v2records = ms._readrecordsv2() | |
2645 | order = 'LOm' |
|
2645 | order = 'LOm' | |
2646 | def key(r): |
|
2646 | def key(r): | |
2647 | idx = order.find(r[0]) |
|
2647 | idx = order.find(r[0]) | |
2648 | if idx == -1: |
|
2648 | if idx == -1: | |
2649 | return (1, r[1]) |
|
2649 | return (1, r[1]) | |
2650 | else: |
|
2650 | else: | |
2651 | return (0, idx) |
|
2651 | return (0, idx) | |
2652 | v1records.sort(key=key) |
|
2652 | v1records.sort(key=key) | |
2653 | v2records.sort(key=key) |
|
2653 | v2records.sort(key=key) | |
2654 |
|
2654 | |||
2655 | if not v1records and not v2records: |
|
2655 | if not v1records and not v2records: | |
2656 | ui.write(('no merge state found\n')) |
|
2656 | ui.write(('no merge state found\n')) | |
2657 | elif not v2records: |
|
2657 | elif not v2records: | |
2658 | ui.note(('no version 2 merge state\n')) |
|
2658 | ui.note(('no version 2 merge state\n')) | |
2659 | printrecords(1) |
|
2659 | printrecords(1) | |
2660 | elif ms._v1v2match(v1records, v2records): |
|
2660 | elif ms._v1v2match(v1records, v2records): | |
2661 | ui.note(('v1 and v2 states match: using v2\n')) |
|
2661 | ui.note(('v1 and v2 states match: using v2\n')) | |
2662 | printrecords(2) |
|
2662 | printrecords(2) | |
2663 | else: |
|
2663 | else: | |
2664 | ui.note(('v1 and v2 states mismatch: using v1\n')) |
|
2664 | ui.note(('v1 and v2 states mismatch: using v1\n')) | |
2665 | printrecords(1) |
|
2665 | printrecords(1) | |
2666 | if ui.verbose: |
|
2666 | if ui.verbose: | |
2667 | printrecords(2) |
|
2667 | printrecords(2) | |
2668 |
|
2668 | |||
2669 | @command('debugnamecomplete', [], _('NAME...')) |
|
2669 | @command('debugnamecomplete', [], _('NAME...')) | |
2670 | def debugnamecomplete(ui, repo, *args): |
|
2670 | def debugnamecomplete(ui, repo, *args): | |
2671 | '''complete "names" - tags, open branch names, bookmark names''' |
|
2671 | '''complete "names" - tags, open branch names, bookmark names''' | |
2672 |
|
2672 | |||
2673 | names = set() |
|
2673 | names = set() | |
2674 | # since we previously only listed open branches, we will handle that |
|
2674 | # since we previously only listed open branches, we will handle that | |
2675 | # specially (after this for loop) |
|
2675 | # specially (after this for loop) | |
2676 | for name, ns in repo.names.iteritems(): |
|
2676 | for name, ns in repo.names.iteritems(): | |
2677 | if name != 'branches': |
|
2677 | if name != 'branches': | |
2678 | names.update(ns.listnames(repo)) |
|
2678 | names.update(ns.listnames(repo)) | |
2679 | names.update(tag for (tag, heads, tip, closed) |
|
2679 | names.update(tag for (tag, heads, tip, closed) | |
2680 | in repo.branchmap().iterbranches() if not closed) |
|
2680 | in repo.branchmap().iterbranches() if not closed) | |
2681 | completions = set() |
|
2681 | completions = set() | |
2682 | if not args: |
|
2682 | if not args: | |
2683 | args = [''] |
|
2683 | args = [''] | |
2684 | for a in args: |
|
2684 | for a in args: | |
2685 | completions.update(n for n in names if n.startswith(a)) |
|
2685 | completions.update(n for n in names if n.startswith(a)) | |
2686 | ui.write('\n'.join(sorted(completions))) |
|
2686 | ui.write('\n'.join(sorted(completions))) | |
2687 | ui.write('\n') |
|
2687 | ui.write('\n') | |
2688 |
|
2688 | |||
2689 | @command('debuglocks', |
|
2689 | @command('debuglocks', | |
2690 | [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')), |
|
2690 | [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')), | |
2691 | ('W', 'force-wlock', None, |
|
2691 | ('W', 'force-wlock', None, | |
2692 | _('free the working state lock (DANGEROUS)'))], |
|
2692 | _('free the working state lock (DANGEROUS)'))], | |
2693 | _('[OPTION]...')) |
|
2693 | _('[OPTION]...')) | |
2694 | def debuglocks(ui, repo, **opts): |
|
2694 | def debuglocks(ui, repo, **opts): | |
2695 | """show or modify state of locks |
|
2695 | """show or modify state of locks | |
2696 |
|
2696 | |||
2697 | By default, this command will show which locks are held. This |
|
2697 | By default, this command will show which locks are held. This | |
2698 | includes the user and process holding the lock, the amount of time |
|
2698 | includes the user and process holding the lock, the amount of time | |
2699 | the lock has been held, and the machine name where the process is |
|
2699 | the lock has been held, and the machine name where the process is | |
2700 | running if it's not local. |
|
2700 | running if it's not local. | |
2701 |
|
2701 | |||
2702 | Locks protect the integrity of Mercurial's data, so should be |
|
2702 | Locks protect the integrity of Mercurial's data, so should be | |
2703 | treated with care. System crashes or other interruptions may cause |
|
2703 | treated with care. System crashes or other interruptions may cause | |
2704 | locks to not be properly released, though Mercurial will usually |
|
2704 | locks to not be properly released, though Mercurial will usually | |
2705 | detect and remove such stale locks automatically. |
|
2705 | detect and remove such stale locks automatically. | |
2706 |
|
2706 | |||
2707 | However, detecting stale locks may not always be possible (for |
|
2707 | However, detecting stale locks may not always be possible (for | |
2708 | instance, on a shared filesystem). Removing locks may also be |
|
2708 | instance, on a shared filesystem). Removing locks may also be | |
2709 | blocked by filesystem permissions. |
|
2709 | blocked by filesystem permissions. | |
2710 |
|
2710 | |||
2711 | Returns 0 if no locks are held. |
|
2711 | Returns 0 if no locks are held. | |
2712 |
|
2712 | |||
2713 | """ |
|
2713 | """ | |
2714 |
|
2714 | |||
2715 | if opts.get('force_lock'): |
|
2715 | if opts.get('force_lock'): | |
2716 | repo.svfs.unlink('lock') |
|
2716 | repo.svfs.unlink('lock') | |
2717 | if opts.get('force_wlock'): |
|
2717 | if opts.get('force_wlock'): | |
2718 | repo.vfs.unlink('wlock') |
|
2718 | repo.vfs.unlink('wlock') | |
2719 | if opts.get('force_lock') or opts.get('force_lock'): |
|
2719 | if opts.get('force_lock') or opts.get('force_lock'): | |
2720 | return 0 |
|
2720 | return 0 | |
2721 |
|
2721 | |||
2722 | now = time.time() |
|
2722 | now = time.time() | |
2723 | held = 0 |
|
2723 | held = 0 | |
2724 |
|
2724 | |||
2725 | def report(vfs, name, method): |
|
2725 | def report(vfs, name, method): | |
2726 | # this causes stale locks to get reaped for more accurate reporting |
|
2726 | # this causes stale locks to get reaped for more accurate reporting | |
2727 | try: |
|
2727 | try: | |
2728 | l = method(False) |
|
2728 | l = method(False) | |
2729 | except error.LockHeld: |
|
2729 | except error.LockHeld: | |
2730 | l = None |
|
2730 | l = None | |
2731 |
|
2731 | |||
2732 | if l: |
|
2732 | if l: | |
2733 | l.release() |
|
2733 | l.release() | |
2734 | else: |
|
2734 | else: | |
2735 | try: |
|
2735 | try: | |
2736 | stat = vfs.lstat(name) |
|
2736 | stat = vfs.lstat(name) | |
2737 | age = now - stat.st_mtime |
|
2737 | age = now - stat.st_mtime | |
2738 | user = util.username(stat.st_uid) |
|
2738 | user = util.username(stat.st_uid) | |
2739 | locker = vfs.readlock(name) |
|
2739 | locker = vfs.readlock(name) | |
2740 | if ":" in locker: |
|
2740 | if ":" in locker: | |
2741 | host, pid = locker.split(':') |
|
2741 | host, pid = locker.split(':') | |
2742 | if host == socket.gethostname(): |
|
2742 | if host == socket.gethostname(): | |
2743 | locker = 'user %s, process %s' % (user, pid) |
|
2743 | locker = 'user %s, process %s' % (user, pid) | |
2744 | else: |
|
2744 | else: | |
2745 | locker = 'user %s, process %s, host %s' \ |
|
2745 | locker = 'user %s, process %s, host %s' \ | |
2746 | % (user, pid, host) |
|
2746 | % (user, pid, host) | |
2747 | ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age)) |
|
2747 | ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age)) | |
2748 | return 1 |
|
2748 | return 1 | |
2749 | except OSError as e: |
|
2749 | except OSError as e: | |
2750 | if e.errno != errno.ENOENT: |
|
2750 | if e.errno != errno.ENOENT: | |
2751 | raise |
|
2751 | raise | |
2752 |
|
2752 | |||
2753 | ui.write("%-6s free\n" % (name + ":")) |
|
2753 | ui.write("%-6s free\n" % (name + ":")) | |
2754 | return 0 |
|
2754 | return 0 | |
2755 |
|
2755 | |||
2756 | held += report(repo.svfs, "lock", repo.lock) |
|
2756 | held += report(repo.svfs, "lock", repo.lock) | |
2757 | held += report(repo.vfs, "wlock", repo.wlock) |
|
2757 | held += report(repo.vfs, "wlock", repo.wlock) | |
2758 |
|
2758 | |||
2759 | return held |
|
2759 | return held | |
2760 |
|
2760 | |||
2761 | @command('debugobsolete', |
|
2761 | @command('debugobsolete', | |
2762 | [('', 'flags', 0, _('markers flag')), |
|
2762 | [('', 'flags', 0, _('markers flag')), | |
2763 | ('', 'record-parents', False, |
|
2763 | ('', 'record-parents', False, | |
2764 | _('record parent information for the precursor')), |
|
2764 | _('record parent information for the precursor')), | |
2765 | ('r', 'rev', [], _('display markers relevant to REV')), |
|
2765 | ('r', 'rev', [], _('display markers relevant to REV')), | |
2766 | ] + commitopts2, |
|
2766 | ] + commitopts2, | |
2767 | _('[OBSOLETED [REPLACEMENT ...]]')) |
|
2767 | _('[OBSOLETED [REPLACEMENT ...]]')) | |
2768 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): |
|
2768 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): | |
2769 | """create arbitrary obsolete marker |
|
2769 | """create arbitrary obsolete marker | |
2770 |
|
2770 | |||
2771 | With no arguments, displays the list of obsolescence markers.""" |
|
2771 | With no arguments, displays the list of obsolescence markers.""" | |
2772 |
|
2772 | |||
2773 | def parsenodeid(s): |
|
2773 | def parsenodeid(s): | |
2774 | try: |
|
2774 | try: | |
2775 | # We do not use revsingle/revrange functions here to accept |
|
2775 | # We do not use revsingle/revrange functions here to accept | |
2776 | # arbitrary node identifiers, possibly not present in the |
|
2776 | # arbitrary node identifiers, possibly not present in the | |
2777 | # local repository. |
|
2777 | # local repository. | |
2778 | n = bin(s) |
|
2778 | n = bin(s) | |
2779 | if len(n) != len(nullid): |
|
2779 | if len(n) != len(nullid): | |
2780 | raise TypeError() |
|
2780 | raise TypeError() | |
2781 | return n |
|
2781 | return n | |
2782 | except TypeError: |
|
2782 | except TypeError: | |
2783 | raise error.Abort('changeset references must be full hexadecimal ' |
|
2783 | raise error.Abort('changeset references must be full hexadecimal ' | |
2784 | 'node identifiers') |
|
2784 | 'node identifiers') | |
2785 |
|
2785 | |||
2786 | if precursor is not None: |
|
2786 | if precursor is not None: | |
2787 | if opts['rev']: |
|
2787 | if opts['rev']: | |
2788 | raise error.Abort('cannot select revision when creating marker') |
|
2788 | raise error.Abort('cannot select revision when creating marker') | |
2789 | metadata = {} |
|
2789 | metadata = {} | |
2790 | metadata['user'] = opts['user'] or ui.username() |
|
2790 | metadata['user'] = opts['user'] or ui.username() | |
2791 | succs = tuple(parsenodeid(succ) for succ in successors) |
|
2791 | succs = tuple(parsenodeid(succ) for succ in successors) | |
2792 | l = repo.lock() |
|
2792 | l = repo.lock() | |
2793 | try: |
|
2793 | try: | |
2794 | tr = repo.transaction('debugobsolete') |
|
2794 | tr = repo.transaction('debugobsolete') | |
2795 | try: |
|
2795 | try: | |
2796 | date = opts.get('date') |
|
2796 | date = opts.get('date') | |
2797 | if date: |
|
2797 | if date: | |
2798 | date = util.parsedate(date) |
|
2798 | date = util.parsedate(date) | |
2799 | else: |
|
2799 | else: | |
2800 | date = None |
|
2800 | date = None | |
2801 | prec = parsenodeid(precursor) |
|
2801 | prec = parsenodeid(precursor) | |
2802 | parents = None |
|
2802 | parents = None | |
2803 | if opts['record_parents']: |
|
2803 | if opts['record_parents']: | |
2804 | if prec not in repo.unfiltered(): |
|
2804 | if prec not in repo.unfiltered(): | |
2805 | raise error.Abort('cannot used --record-parents on ' |
|
2805 | raise error.Abort('cannot used --record-parents on ' | |
2806 | 'unknown changesets') |
|
2806 | 'unknown changesets') | |
2807 | parents = repo.unfiltered()[prec].parents() |
|
2807 | parents = repo.unfiltered()[prec].parents() | |
2808 | parents = tuple(p.node() for p in parents) |
|
2808 | parents = tuple(p.node() for p in parents) | |
2809 | repo.obsstore.create(tr, prec, succs, opts['flags'], |
|
2809 | repo.obsstore.create(tr, prec, succs, opts['flags'], | |
2810 | parents=parents, date=date, |
|
2810 | parents=parents, date=date, | |
2811 | metadata=metadata) |
|
2811 | metadata=metadata) | |
2812 | tr.close() |
|
2812 | tr.close() | |
2813 | except ValueError as exc: |
|
2813 | except ValueError as exc: | |
2814 | raise error.Abort(_('bad obsmarker input: %s') % exc) |
|
2814 | raise error.Abort(_('bad obsmarker input: %s') % exc) | |
2815 | finally: |
|
2815 | finally: | |
2816 | tr.release() |
|
2816 | tr.release() | |
2817 | finally: |
|
2817 | finally: | |
2818 | l.release() |
|
2818 | l.release() | |
2819 | else: |
|
2819 | else: | |
2820 | if opts['rev']: |
|
2820 | if opts['rev']: | |
2821 | revs = scmutil.revrange(repo, opts['rev']) |
|
2821 | revs = scmutil.revrange(repo, opts['rev']) | |
2822 | nodes = [repo[r].node() for r in revs] |
|
2822 | nodes = [repo[r].node() for r in revs] | |
2823 | markers = list(obsolete.getmarkers(repo, nodes=nodes)) |
|
2823 | markers = list(obsolete.getmarkers(repo, nodes=nodes)) | |
2824 | markers.sort(key=lambda x: x._data) |
|
2824 | markers.sort(key=lambda x: x._data) | |
2825 | else: |
|
2825 | else: | |
2826 | markers = obsolete.getmarkers(repo) |
|
2826 | markers = obsolete.getmarkers(repo) | |
2827 |
|
2827 | |||
2828 | for m in markers: |
|
2828 | for m in markers: | |
2829 | cmdutil.showmarker(ui, m) |
|
2829 | cmdutil.showmarker(ui, m) | |
2830 |
|
2830 | |||
2831 | @command('debugpathcomplete', |
|
2831 | @command('debugpathcomplete', | |
2832 | [('f', 'full', None, _('complete an entire path')), |
|
2832 | [('f', 'full', None, _('complete an entire path')), | |
2833 | ('n', 'normal', None, _('show only normal files')), |
|
2833 | ('n', 'normal', None, _('show only normal files')), | |
2834 | ('a', 'added', None, _('show only added files')), |
|
2834 | ('a', 'added', None, _('show only added files')), | |
2835 | ('r', 'removed', None, _('show only removed files'))], |
|
2835 | ('r', 'removed', None, _('show only removed files'))], | |
2836 | _('FILESPEC...')) |
|
2836 | _('FILESPEC...')) | |
2837 | def debugpathcomplete(ui, repo, *specs, **opts): |
|
2837 | def debugpathcomplete(ui, repo, *specs, **opts): | |
2838 | '''complete part or all of a tracked path |
|
2838 | '''complete part or all of a tracked path | |
2839 |
|
2839 | |||
2840 | This command supports shells that offer path name completion. It |
|
2840 | This command supports shells that offer path name completion. It | |
2841 | currently completes only files already known to the dirstate. |
|
2841 | currently completes only files already known to the dirstate. | |
2842 |
|
2842 | |||
2843 | Completion extends only to the next path segment unless |
|
2843 | Completion extends only to the next path segment unless | |
2844 | --full is specified, in which case entire paths are used.''' |
|
2844 | --full is specified, in which case entire paths are used.''' | |
2845 |
|
2845 | |||
2846 | def complete(path, acceptable): |
|
2846 | def complete(path, acceptable): | |
2847 | dirstate = repo.dirstate |
|
2847 | dirstate = repo.dirstate | |
2848 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) |
|
2848 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) | |
2849 | rootdir = repo.root + os.sep |
|
2849 | rootdir = repo.root + os.sep | |
2850 | if spec != repo.root and not spec.startswith(rootdir): |
|
2850 | if spec != repo.root and not spec.startswith(rootdir): | |
2851 | return [], [] |
|
2851 | return [], [] | |
2852 | if os.path.isdir(spec): |
|
2852 | if os.path.isdir(spec): | |
2853 | spec += '/' |
|
2853 | spec += '/' | |
2854 | spec = spec[len(rootdir):] |
|
2854 | spec = spec[len(rootdir):] | |
2855 | fixpaths = os.sep != '/' |
|
2855 | fixpaths = os.sep != '/' | |
2856 | if fixpaths: |
|
2856 | if fixpaths: | |
2857 | spec = spec.replace(os.sep, '/') |
|
2857 | spec = spec.replace(os.sep, '/') | |
2858 | speclen = len(spec) |
|
2858 | speclen = len(spec) | |
2859 | fullpaths = opts['full'] |
|
2859 | fullpaths = opts['full'] | |
2860 | files, dirs = set(), set() |
|
2860 | files, dirs = set(), set() | |
2861 | adddir, addfile = dirs.add, files.add |
|
2861 | adddir, addfile = dirs.add, files.add | |
2862 | for f, st in dirstate.iteritems(): |
|
2862 | for f, st in dirstate.iteritems(): | |
2863 | if f.startswith(spec) and st[0] in acceptable: |
|
2863 | if f.startswith(spec) and st[0] in acceptable: | |
2864 | if fixpaths: |
|
2864 | if fixpaths: | |
2865 | f = f.replace('/', os.sep) |
|
2865 | f = f.replace('/', os.sep) | |
2866 | if fullpaths: |
|
2866 | if fullpaths: | |
2867 | addfile(f) |
|
2867 | addfile(f) | |
2868 | continue |
|
2868 | continue | |
2869 | s = f.find(os.sep, speclen) |
|
2869 | s = f.find(os.sep, speclen) | |
2870 | if s >= 0: |
|
2870 | if s >= 0: | |
2871 | adddir(f[:s]) |
|
2871 | adddir(f[:s]) | |
2872 | else: |
|
2872 | else: | |
2873 | addfile(f) |
|
2873 | addfile(f) | |
2874 | return files, dirs |
|
2874 | return files, dirs | |
2875 |
|
2875 | |||
2876 | acceptable = '' |
|
2876 | acceptable = '' | |
2877 | if opts['normal']: |
|
2877 | if opts['normal']: | |
2878 | acceptable += 'nm' |
|
2878 | acceptable += 'nm' | |
2879 | if opts['added']: |
|
2879 | if opts['added']: | |
2880 | acceptable += 'a' |
|
2880 | acceptable += 'a' | |
2881 | if opts['removed']: |
|
2881 | if opts['removed']: | |
2882 | acceptable += 'r' |
|
2882 | acceptable += 'r' | |
2883 | cwd = repo.getcwd() |
|
2883 | cwd = repo.getcwd() | |
2884 | if not specs: |
|
2884 | if not specs: | |
2885 | specs = ['.'] |
|
2885 | specs = ['.'] | |
2886 |
|
2886 | |||
2887 | files, dirs = set(), set() |
|
2887 | files, dirs = set(), set() | |
2888 | for spec in specs: |
|
2888 | for spec in specs: | |
2889 | f, d = complete(spec, acceptable or 'nmar') |
|
2889 | f, d = complete(spec, acceptable or 'nmar') | |
2890 | files.update(f) |
|
2890 | files.update(f) | |
2891 | dirs.update(d) |
|
2891 | dirs.update(d) | |
2892 | files.update(dirs) |
|
2892 | files.update(dirs) | |
2893 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) |
|
2893 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) | |
2894 | ui.write('\n') |
|
2894 | ui.write('\n') | |
2895 |
|
2895 | |||
2896 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True) |
|
2896 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True) | |
2897 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): |
|
2897 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): | |
2898 | '''access the pushkey key/value protocol |
|
2898 | '''access the pushkey key/value protocol | |
2899 |
|
2899 | |||
2900 | With two args, list the keys in the given namespace. |
|
2900 | With two args, list the keys in the given namespace. | |
2901 |
|
2901 | |||
2902 | With five args, set a key to new if it currently is set to old. |
|
2902 | With five args, set a key to new if it currently is set to old. | |
2903 | Reports success or failure. |
|
2903 | Reports success or failure. | |
2904 | ''' |
|
2904 | ''' | |
2905 |
|
2905 | |||
2906 | target = hg.peer(ui, {}, repopath) |
|
2906 | target = hg.peer(ui, {}, repopath) | |
2907 | if keyinfo: |
|
2907 | if keyinfo: | |
2908 | key, old, new = keyinfo |
|
2908 | key, old, new = keyinfo | |
2909 | r = target.pushkey(namespace, key, old, new) |
|
2909 | r = target.pushkey(namespace, key, old, new) | |
2910 | ui.status(str(r) + '\n') |
|
2910 | ui.status(str(r) + '\n') | |
2911 | return not r |
|
2911 | return not r | |
2912 | else: |
|
2912 | else: | |
2913 | for k, v in sorted(target.listkeys(namespace).iteritems()): |
|
2913 | for k, v in sorted(target.listkeys(namespace).iteritems()): | |
2914 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
2914 | ui.write("%s\t%s\n" % (k.encode('string-escape'), | |
2915 | v.encode('string-escape'))) |
|
2915 | v.encode('string-escape'))) | |
2916 |
|
2916 | |||
2917 | @command('debugpvec', [], _('A B')) |
|
2917 | @command('debugpvec', [], _('A B')) | |
2918 | def debugpvec(ui, repo, a, b=None): |
|
2918 | def debugpvec(ui, repo, a, b=None): | |
2919 | ca = scmutil.revsingle(repo, a) |
|
2919 | ca = scmutil.revsingle(repo, a) | |
2920 | cb = scmutil.revsingle(repo, b) |
|
2920 | cb = scmutil.revsingle(repo, b) | |
2921 | pa = pvec.ctxpvec(ca) |
|
2921 | pa = pvec.ctxpvec(ca) | |
2922 | pb = pvec.ctxpvec(cb) |
|
2922 | pb = pvec.ctxpvec(cb) | |
2923 | if pa == pb: |
|
2923 | if pa == pb: | |
2924 | rel = "=" |
|
2924 | rel = "=" | |
2925 | elif pa > pb: |
|
2925 | elif pa > pb: | |
2926 | rel = ">" |
|
2926 | rel = ">" | |
2927 | elif pa < pb: |
|
2927 | elif pa < pb: | |
2928 | rel = "<" |
|
2928 | rel = "<" | |
2929 | elif pa | pb: |
|
2929 | elif pa | pb: | |
2930 | rel = "|" |
|
2930 | rel = "|" | |
2931 | ui.write(_("a: %s\n") % pa) |
|
2931 | ui.write(_("a: %s\n") % pa) | |
2932 | ui.write(_("b: %s\n") % pb) |
|
2932 | ui.write(_("b: %s\n") % pb) | |
2933 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) |
|
2933 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) | |
2934 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % |
|
2934 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % | |
2935 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), |
|
2935 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), | |
2936 | pa.distance(pb), rel)) |
|
2936 | pa.distance(pb), rel)) | |
2937 |
|
2937 | |||
2938 | @command('debugrebuilddirstate|debugrebuildstate', |
|
2938 | @command('debugrebuilddirstate|debugrebuildstate', | |
2939 | [('r', 'rev', '', _('revision to rebuild to'), _('REV')), |
|
2939 | [('r', 'rev', '', _('revision to rebuild to'), _('REV')), | |
2940 | ('', 'minimal', None, _('only rebuild files that are inconsistent with ' |
|
2940 | ('', 'minimal', None, _('only rebuild files that are inconsistent with ' | |
2941 | 'the working copy parent')), |
|
2941 | 'the working copy parent')), | |
2942 | ], |
|
2942 | ], | |
2943 | _('[-r REV]')) |
|
2943 | _('[-r REV]')) | |
2944 | def debugrebuilddirstate(ui, repo, rev, **opts): |
|
2944 | def debugrebuilddirstate(ui, repo, rev, **opts): | |
2945 | """rebuild the dirstate as it would look like for the given revision |
|
2945 | """rebuild the dirstate as it would look like for the given revision | |
2946 |
|
2946 | |||
2947 | If no revision is specified the first current parent will be used. |
|
2947 | If no revision is specified the first current parent will be used. | |
2948 |
|
2948 | |||
2949 | The dirstate will be set to the files of the given revision. |
|
2949 | The dirstate will be set to the files of the given revision. | |
2950 | The actual working directory content or existing dirstate |
|
2950 | The actual working directory content or existing dirstate | |
2951 | information such as adds or removes is not considered. |
|
2951 | information such as adds or removes is not considered. | |
2952 |
|
2952 | |||
2953 | ``minimal`` will only rebuild the dirstate status for files that claim to be |
|
2953 | ``minimal`` will only rebuild the dirstate status for files that claim to be | |
2954 | tracked but are not in the parent manifest, or that exist in the parent |
|
2954 | tracked but are not in the parent manifest, or that exist in the parent | |
2955 | manifest but are not in the dirstate. It will not change adds, removes, or |
|
2955 | manifest but are not in the dirstate. It will not change adds, removes, or | |
2956 | modified files that are in the working copy parent. |
|
2956 | modified files that are in the working copy parent. | |
2957 |
|
2957 | |||
2958 | One use of this command is to make the next :hg:`status` invocation |
|
2958 | One use of this command is to make the next :hg:`status` invocation | |
2959 | check the actual file content. |
|
2959 | check the actual file content. | |
2960 | """ |
|
2960 | """ | |
2961 | ctx = scmutil.revsingle(repo, rev) |
|
2961 | ctx = scmutil.revsingle(repo, rev) | |
2962 | wlock = repo.wlock() |
|
2962 | wlock = repo.wlock() | |
2963 | try: |
|
2963 | try: | |
2964 | dirstate = repo.dirstate |
|
2964 | dirstate = repo.dirstate | |
2965 |
|
2965 | |||
2966 | # See command doc for what minimal does. |
|
2966 | # See command doc for what minimal does. | |
2967 | if opts.get('minimal'): |
|
2967 | if opts.get('minimal'): | |
2968 | dirstatefiles = set(dirstate) |
|
2968 | dirstatefiles = set(dirstate) | |
2969 | ctxfiles = set(ctx.manifest().keys()) |
|
2969 | ctxfiles = set(ctx.manifest().keys()) | |
2970 | for file in (dirstatefiles | ctxfiles): |
|
2970 | for file in (dirstatefiles | ctxfiles): | |
2971 | indirstate = file in dirstatefiles |
|
2971 | indirstate = file in dirstatefiles | |
2972 | inctx = file in ctxfiles |
|
2972 | inctx = file in ctxfiles | |
2973 |
|
2973 | |||
2974 | if indirstate and not inctx and dirstate[file] != 'a': |
|
2974 | if indirstate and not inctx and dirstate[file] != 'a': | |
2975 | dirstate.drop(file) |
|
2975 | dirstate.drop(file) | |
2976 | elif inctx and not indirstate: |
|
2976 | elif inctx and not indirstate: | |
2977 | dirstate.normallookup(file) |
|
2977 | dirstate.normallookup(file) | |
2978 | else: |
|
2978 | else: | |
2979 | dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
2979 | dirstate.rebuild(ctx.node(), ctx.manifest()) | |
2980 | finally: |
|
2980 | finally: | |
2981 | wlock.release() |
|
2981 | wlock.release() | |
2982 |
|
2982 | |||
2983 | @command('debugrebuildfncache', [], '') |
|
2983 | @command('debugrebuildfncache', [], '') | |
2984 | def debugrebuildfncache(ui, repo): |
|
2984 | def debugrebuildfncache(ui, repo): | |
2985 | """rebuild the fncache file""" |
|
2985 | """rebuild the fncache file""" | |
2986 | repair.rebuildfncache(ui, repo) |
|
2986 | repair.rebuildfncache(ui, repo) | |
2987 |
|
2987 | |||
2988 | @command('debugrename', |
|
2988 | @command('debugrename', | |
2989 | [('r', 'rev', '', _('revision to debug'), _('REV'))], |
|
2989 | [('r', 'rev', '', _('revision to debug'), _('REV'))], | |
2990 | _('[-r REV] FILE')) |
|
2990 | _('[-r REV] FILE')) | |
2991 | def debugrename(ui, repo, file1, *pats, **opts): |
|
2991 | def debugrename(ui, repo, file1, *pats, **opts): | |
2992 | """dump rename information""" |
|
2992 | """dump rename information""" | |
2993 |
|
2993 | |||
2994 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
2994 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
2995 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
2995 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
2996 | for abs in ctx.walk(m): |
|
2996 | for abs in ctx.walk(m): | |
2997 | fctx = ctx[abs] |
|
2997 | fctx = ctx[abs] | |
2998 | o = fctx.filelog().renamed(fctx.filenode()) |
|
2998 | o = fctx.filelog().renamed(fctx.filenode()) | |
2999 | rel = m.rel(abs) |
|
2999 | rel = m.rel(abs) | |
3000 | if o: |
|
3000 | if o: | |
3001 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
3001 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) | |
3002 | else: |
|
3002 | else: | |
3003 | ui.write(_("%s not renamed\n") % rel) |
|
3003 | ui.write(_("%s not renamed\n") % rel) | |
3004 |
|
3004 | |||
3005 | @command('debugrevlog', |
|
3005 | @command('debugrevlog', | |
3006 | [('c', 'changelog', False, _('open changelog')), |
|
3006 | [('c', 'changelog', False, _('open changelog')), | |
3007 | ('m', 'manifest', False, _('open manifest')), |
|
3007 | ('m', 'manifest', False, _('open manifest')), | |
3008 | ('', 'dir', False, _('open directory manifest')), |
|
3008 | ('', 'dir', False, _('open directory manifest')), | |
3009 | ('d', 'dump', False, _('dump index data'))], |
|
3009 | ('d', 'dump', False, _('dump index data'))], | |
3010 | _('-c|-m|FILE'), |
|
3010 | _('-c|-m|FILE'), | |
3011 | optionalrepo=True) |
|
3011 | optionalrepo=True) | |
3012 | def debugrevlog(ui, repo, file_=None, **opts): |
|
3012 | def debugrevlog(ui, repo, file_=None, **opts): | |
3013 | """show data and statistics about a revlog""" |
|
3013 | """show data and statistics about a revlog""" | |
3014 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) |
|
3014 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) | |
3015 |
|
3015 | |||
3016 | if opts.get("dump"): |
|
3016 | if opts.get("dump"): | |
3017 | numrevs = len(r) |
|
3017 | numrevs = len(r) | |
3018 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" |
|
3018 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" | |
3019 | " rawsize totalsize compression heads chainlen\n") |
|
3019 | " rawsize totalsize compression heads chainlen\n") | |
3020 | ts = 0 |
|
3020 | ts = 0 | |
3021 | heads = set() |
|
3021 | heads = set() | |
3022 |
|
3022 | |||
3023 | for rev in xrange(numrevs): |
|
3023 | for rev in xrange(numrevs): | |
3024 | dbase = r.deltaparent(rev) |
|
3024 | dbase = r.deltaparent(rev) | |
3025 | if dbase == -1: |
|
3025 | if dbase == -1: | |
3026 | dbase = rev |
|
3026 | dbase = rev | |
3027 | cbase = r.chainbase(rev) |
|
3027 | cbase = r.chainbase(rev) | |
3028 | clen = r.chainlen(rev) |
|
3028 | clen = r.chainlen(rev) | |
3029 | p1, p2 = r.parentrevs(rev) |
|
3029 | p1, p2 = r.parentrevs(rev) | |
3030 | rs = r.rawsize(rev) |
|
3030 | rs = r.rawsize(rev) | |
3031 | ts = ts + rs |
|
3031 | ts = ts + rs | |
3032 | heads -= set(r.parentrevs(rev)) |
|
3032 | heads -= set(r.parentrevs(rev)) | |
3033 | heads.add(rev) |
|
3033 | heads.add(rev) | |
3034 | ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d " |
|
3034 | ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d " | |
3035 | "%11d %5d %8d\n" % |
|
3035 | "%11d %5d %8d\n" % | |
3036 | (rev, p1, p2, r.start(rev), r.end(rev), |
|
3036 | (rev, p1, p2, r.start(rev), r.end(rev), | |
3037 | r.start(dbase), r.start(cbase), |
|
3037 | r.start(dbase), r.start(cbase), | |
3038 | r.start(p1), r.start(p2), |
|
3038 | r.start(p1), r.start(p2), | |
3039 | rs, ts, ts / r.end(rev), len(heads), clen)) |
|
3039 | rs, ts, ts / r.end(rev), len(heads), clen)) | |
3040 | return 0 |
|
3040 | return 0 | |
3041 |
|
3041 | |||
3042 | v = r.version |
|
3042 | v = r.version | |
3043 | format = v & 0xFFFF |
|
3043 | format = v & 0xFFFF | |
3044 | flags = [] |
|
3044 | flags = [] | |
3045 | gdelta = False |
|
3045 | gdelta = False | |
3046 | if v & revlog.REVLOGNGINLINEDATA: |
|
3046 | if v & revlog.REVLOGNGINLINEDATA: | |
3047 | flags.append('inline') |
|
3047 | flags.append('inline') | |
3048 | if v & revlog.REVLOGGENERALDELTA: |
|
3048 | if v & revlog.REVLOGGENERALDELTA: | |
3049 | gdelta = True |
|
3049 | gdelta = True | |
3050 | flags.append('generaldelta') |
|
3050 | flags.append('generaldelta') | |
3051 | if not flags: |
|
3051 | if not flags: | |
3052 | flags = ['(none)'] |
|
3052 | flags = ['(none)'] | |
3053 |
|
3053 | |||
3054 | nummerges = 0 |
|
3054 | nummerges = 0 | |
3055 | numfull = 0 |
|
3055 | numfull = 0 | |
3056 | numprev = 0 |
|
3056 | numprev = 0 | |
3057 | nump1 = 0 |
|
3057 | nump1 = 0 | |
3058 | nump2 = 0 |
|
3058 | nump2 = 0 | |
3059 | numother = 0 |
|
3059 | numother = 0 | |
3060 | nump1prev = 0 |
|
3060 | nump1prev = 0 | |
3061 | nump2prev = 0 |
|
3061 | nump2prev = 0 | |
3062 | chainlengths = [] |
|
3062 | chainlengths = [] | |
3063 |
|
3063 | |||
3064 | datasize = [None, 0, 0L] |
|
3064 | datasize = [None, 0, 0L] | |
3065 | fullsize = [None, 0, 0L] |
|
3065 | fullsize = [None, 0, 0L] | |
3066 | deltasize = [None, 0, 0L] |
|
3066 | deltasize = [None, 0, 0L] | |
3067 |
|
3067 | |||
3068 | def addsize(size, l): |
|
3068 | def addsize(size, l): | |
3069 | if l[0] is None or size < l[0]: |
|
3069 | if l[0] is None or size < l[0]: | |
3070 | l[0] = size |
|
3070 | l[0] = size | |
3071 | if size > l[1]: |
|
3071 | if size > l[1]: | |
3072 | l[1] = size |
|
3072 | l[1] = size | |
3073 | l[2] += size |
|
3073 | l[2] += size | |
3074 |
|
3074 | |||
3075 | numrevs = len(r) |
|
3075 | numrevs = len(r) | |
3076 | for rev in xrange(numrevs): |
|
3076 | for rev in xrange(numrevs): | |
3077 | p1, p2 = r.parentrevs(rev) |
|
3077 | p1, p2 = r.parentrevs(rev) | |
3078 | delta = r.deltaparent(rev) |
|
3078 | delta = r.deltaparent(rev) | |
3079 | if format > 0: |
|
3079 | if format > 0: | |
3080 | addsize(r.rawsize(rev), datasize) |
|
3080 | addsize(r.rawsize(rev), datasize) | |
3081 | if p2 != nullrev: |
|
3081 | if p2 != nullrev: | |
3082 | nummerges += 1 |
|
3082 | nummerges += 1 | |
3083 | size = r.length(rev) |
|
3083 | size = r.length(rev) | |
3084 | if delta == nullrev: |
|
3084 | if delta == nullrev: | |
3085 | chainlengths.append(0) |
|
3085 | chainlengths.append(0) | |
3086 | numfull += 1 |
|
3086 | numfull += 1 | |
3087 | addsize(size, fullsize) |
|
3087 | addsize(size, fullsize) | |
3088 | else: |
|
3088 | else: | |
3089 | chainlengths.append(chainlengths[delta] + 1) |
|
3089 | chainlengths.append(chainlengths[delta] + 1) | |
3090 | addsize(size, deltasize) |
|
3090 | addsize(size, deltasize) | |
3091 | if delta == rev - 1: |
|
3091 | if delta == rev - 1: | |
3092 | numprev += 1 |
|
3092 | numprev += 1 | |
3093 | if delta == p1: |
|
3093 | if delta == p1: | |
3094 | nump1prev += 1 |
|
3094 | nump1prev += 1 | |
3095 | elif delta == p2: |
|
3095 | elif delta == p2: | |
3096 | nump2prev += 1 |
|
3096 | nump2prev += 1 | |
3097 | elif delta == p1: |
|
3097 | elif delta == p1: | |
3098 | nump1 += 1 |
|
3098 | nump1 += 1 | |
3099 | elif delta == p2: |
|
3099 | elif delta == p2: | |
3100 | nump2 += 1 |
|
3100 | nump2 += 1 | |
3101 | elif delta != nullrev: |
|
3101 | elif delta != nullrev: | |
3102 | numother += 1 |
|
3102 | numother += 1 | |
3103 |
|
3103 | |||
3104 | # Adjust size min value for empty cases |
|
3104 | # Adjust size min value for empty cases | |
3105 | for size in (datasize, fullsize, deltasize): |
|
3105 | for size in (datasize, fullsize, deltasize): | |
3106 | if size[0] is None: |
|
3106 | if size[0] is None: | |
3107 | size[0] = 0 |
|
3107 | size[0] = 0 | |
3108 |
|
3108 | |||
3109 | numdeltas = numrevs - numfull |
|
3109 | numdeltas = numrevs - numfull | |
3110 | numoprev = numprev - nump1prev - nump2prev |
|
3110 | numoprev = numprev - nump1prev - nump2prev | |
3111 | totalrawsize = datasize[2] |
|
3111 | totalrawsize = datasize[2] | |
3112 | datasize[2] /= numrevs |
|
3112 | datasize[2] /= numrevs | |
3113 | fulltotal = fullsize[2] |
|
3113 | fulltotal = fullsize[2] | |
3114 | fullsize[2] /= numfull |
|
3114 | fullsize[2] /= numfull | |
3115 | deltatotal = deltasize[2] |
|
3115 | deltatotal = deltasize[2] | |
3116 | if numrevs - numfull > 0: |
|
3116 | if numrevs - numfull > 0: | |
3117 | deltasize[2] /= numrevs - numfull |
|
3117 | deltasize[2] /= numrevs - numfull | |
3118 | totalsize = fulltotal + deltatotal |
|
3118 | totalsize = fulltotal + deltatotal | |
3119 | avgchainlen = sum(chainlengths) / numrevs |
|
3119 | avgchainlen = sum(chainlengths) / numrevs | |
3120 | maxchainlen = max(chainlengths) |
|
3120 | maxchainlen = max(chainlengths) | |
3121 | compratio = 1 |
|
3121 | compratio = 1 | |
3122 | if totalsize: |
|
3122 | if totalsize: | |
3123 | compratio = totalrawsize / totalsize |
|
3123 | compratio = totalrawsize / totalsize | |
3124 |
|
3124 | |||
3125 | basedfmtstr = '%%%dd\n' |
|
3125 | basedfmtstr = '%%%dd\n' | |
3126 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' |
|
3126 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' | |
3127 |
|
3127 | |||
3128 | def dfmtstr(max): |
|
3128 | def dfmtstr(max): | |
3129 | return basedfmtstr % len(str(max)) |
|
3129 | return basedfmtstr % len(str(max)) | |
3130 | def pcfmtstr(max, padding=0): |
|
3130 | def pcfmtstr(max, padding=0): | |
3131 | return basepcfmtstr % (len(str(max)), ' ' * padding) |
|
3131 | return basepcfmtstr % (len(str(max)), ' ' * padding) | |
3132 |
|
3132 | |||
3133 | def pcfmt(value, total): |
|
3133 | def pcfmt(value, total): | |
3134 | if total: |
|
3134 | if total: | |
3135 | return (value, 100 * float(value) / total) |
|
3135 | return (value, 100 * float(value) / total) | |
3136 | else: |
|
3136 | else: | |
3137 | return value, 100.0 |
|
3137 | return value, 100.0 | |
3138 |
|
3138 | |||
3139 | ui.write(('format : %d\n') % format) |
|
3139 | ui.write(('format : %d\n') % format) | |
3140 | ui.write(('flags : %s\n') % ', '.join(flags)) |
|
3140 | ui.write(('flags : %s\n') % ', '.join(flags)) | |
3141 |
|
3141 | |||
3142 | ui.write('\n') |
|
3142 | ui.write('\n') | |
3143 | fmt = pcfmtstr(totalsize) |
|
3143 | fmt = pcfmtstr(totalsize) | |
3144 | fmt2 = dfmtstr(totalsize) |
|
3144 | fmt2 = dfmtstr(totalsize) | |
3145 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
3145 | ui.write(('revisions : ') + fmt2 % numrevs) | |
3146 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) |
|
3146 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) | |
3147 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) |
|
3147 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) | |
3148 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
3148 | ui.write(('revisions : ') + fmt2 % numrevs) | |
3149 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) |
|
3149 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) | |
3150 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) |
|
3150 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) | |
3151 | ui.write(('revision size : ') + fmt2 % totalsize) |
|
3151 | ui.write(('revision size : ') + fmt2 % totalsize) | |
3152 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) |
|
3152 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) | |
3153 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) |
|
3153 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) | |
3154 |
|
3154 | |||
3155 | ui.write('\n') |
|
3155 | ui.write('\n') | |
3156 | fmt = dfmtstr(max(avgchainlen, compratio)) |
|
3156 | fmt = dfmtstr(max(avgchainlen, compratio)) | |
3157 | ui.write(('avg chain length : ') + fmt % avgchainlen) |
|
3157 | ui.write(('avg chain length : ') + fmt % avgchainlen) | |
3158 | ui.write(('max chain length : ') + fmt % maxchainlen) |
|
3158 | ui.write(('max chain length : ') + fmt % maxchainlen) | |
3159 | ui.write(('compression ratio : ') + fmt % compratio) |
|
3159 | ui.write(('compression ratio : ') + fmt % compratio) | |
3160 |
|
3160 | |||
3161 | if format > 0: |
|
3161 | if format > 0: | |
3162 | ui.write('\n') |
|
3162 | ui.write('\n') | |
3163 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') |
|
3163 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') | |
3164 | % tuple(datasize)) |
|
3164 | % tuple(datasize)) | |
3165 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') |
|
3165 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') | |
3166 | % tuple(fullsize)) |
|
3166 | % tuple(fullsize)) | |
3167 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') |
|
3167 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') | |
3168 | % tuple(deltasize)) |
|
3168 | % tuple(deltasize)) | |
3169 |
|
3169 | |||
3170 | if numdeltas > 0: |
|
3170 | if numdeltas > 0: | |
3171 | ui.write('\n') |
|
3171 | ui.write('\n') | |
3172 | fmt = pcfmtstr(numdeltas) |
|
3172 | fmt = pcfmtstr(numdeltas) | |
3173 | fmt2 = pcfmtstr(numdeltas, 4) |
|
3173 | fmt2 = pcfmtstr(numdeltas, 4) | |
3174 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) |
|
3174 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) | |
3175 | if numprev > 0: |
|
3175 | if numprev > 0: | |
3176 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, |
|
3176 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, | |
3177 | numprev)) |
|
3177 | numprev)) | |
3178 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, |
|
3178 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, | |
3179 | numprev)) |
|
3179 | numprev)) | |
3180 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, |
|
3180 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, | |
3181 | numprev)) |
|
3181 | numprev)) | |
3182 | if gdelta: |
|
3182 | if gdelta: | |
3183 | ui.write(('deltas against p1 : ') |
|
3183 | ui.write(('deltas against p1 : ') | |
3184 | + fmt % pcfmt(nump1, numdeltas)) |
|
3184 | + fmt % pcfmt(nump1, numdeltas)) | |
3185 | ui.write(('deltas against p2 : ') |
|
3185 | ui.write(('deltas against p2 : ') | |
3186 | + fmt % pcfmt(nump2, numdeltas)) |
|
3186 | + fmt % pcfmt(nump2, numdeltas)) | |
3187 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, |
|
3187 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, | |
3188 | numdeltas)) |
|
3188 | numdeltas)) | |
3189 |
|
3189 | |||
3190 | @command('debugrevspec', |
|
3190 | @command('debugrevspec', | |
3191 | [('', 'optimize', None, _('print parsed tree after optimizing'))], |
|
3191 | [('', 'optimize', None, _('print parsed tree after optimizing'))], | |
3192 | ('REVSPEC')) |
|
3192 | ('REVSPEC')) | |
3193 | def debugrevspec(ui, repo, expr, **opts): |
|
3193 | def debugrevspec(ui, repo, expr, **opts): | |
3194 | """parse and apply a revision specification |
|
3194 | """parse and apply a revision specification | |
3195 |
|
3195 | |||
3196 | Use --verbose to print the parsed tree before and after aliases |
|
3196 | Use --verbose to print the parsed tree before and after aliases | |
3197 | expansion. |
|
3197 | expansion. | |
3198 | """ |
|
3198 | """ | |
3199 | if ui.verbose: |
|
3199 | if ui.verbose: | |
3200 | tree = revset.parse(expr, lookup=repo.__contains__) |
|
3200 | tree = revset.parse(expr, lookup=repo.__contains__) | |
3201 | ui.note(revset.prettyformat(tree), "\n") |
|
3201 | ui.note(revset.prettyformat(tree), "\n") | |
3202 | newtree = revset.findaliases(ui, tree) |
|
3202 | newtree = revset.findaliases(ui, tree) | |
3203 | if newtree != tree: |
|
3203 | if newtree != tree: | |
3204 | ui.note(revset.prettyformat(newtree), "\n") |
|
3204 | ui.note(revset.prettyformat(newtree), "\n") | |
3205 | tree = newtree |
|
3205 | tree = newtree | |
3206 | newtree = revset.foldconcat(tree) |
|
3206 | newtree = revset.foldconcat(tree) | |
3207 | if newtree != tree: |
|
3207 | if newtree != tree: | |
3208 | ui.note(revset.prettyformat(newtree), "\n") |
|
3208 | ui.note(revset.prettyformat(newtree), "\n") | |
3209 | if opts["optimize"]: |
|
3209 | if opts["optimize"]: | |
3210 | weight, optimizedtree = revset.optimize(newtree, True) |
|
3210 | weight, optimizedtree = revset.optimize(newtree, True) | |
3211 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") |
|
3211 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") | |
3212 | func = revset.match(ui, expr, repo) |
|
3212 | func = revset.match(ui, expr, repo) | |
3213 | revs = func(repo) |
|
3213 | revs = func(repo) | |
3214 | if ui.verbose: |
|
3214 | if ui.verbose: | |
3215 | ui.note("* set:\n", revset.prettyformatset(revs), "\n") |
|
3215 | ui.note("* set:\n", revset.prettyformatset(revs), "\n") | |
3216 | for c in revs: |
|
3216 | for c in revs: | |
3217 | ui.write("%s\n" % c) |
|
3217 | ui.write("%s\n" % c) | |
3218 |
|
3218 | |||
3219 | @command('debugsetparents', [], _('REV1 [REV2]')) |
|
3219 | @command('debugsetparents', [], _('REV1 [REV2]')) | |
3220 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
3220 | def debugsetparents(ui, repo, rev1, rev2=None): | |
3221 | """manually set the parents of the current working directory |
|
3221 | """manually set the parents of the current working directory | |
3222 |
|
3222 | |||
3223 | This is useful for writing repository conversion tools, but should |
|
3223 | This is useful for writing repository conversion tools, but should | |
3224 | be used with care. For example, neither the working directory nor the |
|
3224 | be used with care. For example, neither the working directory nor the | |
3225 | dirstate is updated, so file status may be incorrect after running this |
|
3225 | dirstate is updated, so file status may be incorrect after running this | |
3226 | command. |
|
3226 | command. | |
3227 |
|
3227 | |||
3228 | Returns 0 on success. |
|
3228 | Returns 0 on success. | |
3229 | """ |
|
3229 | """ | |
3230 |
|
3230 | |||
3231 | r1 = scmutil.revsingle(repo, rev1).node() |
|
3231 | r1 = scmutil.revsingle(repo, rev1).node() | |
3232 | r2 = scmutil.revsingle(repo, rev2, 'null').node() |
|
3232 | r2 = scmutil.revsingle(repo, rev2, 'null').node() | |
3233 |
|
3233 | |||
3234 | wlock = repo.wlock() |
|
3234 | wlock = repo.wlock() | |
3235 | try: |
|
3235 | try: | |
3236 | repo.dirstate.beginparentchange() |
|
3236 | repo.dirstate.beginparentchange() | |
3237 | repo.setparents(r1, r2) |
|
3237 | repo.setparents(r1, r2) | |
3238 | repo.dirstate.endparentchange() |
|
3238 | repo.dirstate.endparentchange() | |
3239 | finally: |
|
3239 | finally: | |
3240 | wlock.release() |
|
3240 | wlock.release() | |
3241 |
|
3241 | |||
3242 | @command('debugdirstate|debugstate', |
|
3242 | @command('debugdirstate|debugstate', | |
3243 | [('', 'nodates', None, _('do not display the saved mtime')), |
|
3243 | [('', 'nodates', None, _('do not display the saved mtime')), | |
3244 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
3244 | ('', 'datesort', None, _('sort by saved mtime'))], | |
3245 | _('[OPTION]...')) |
|
3245 | _('[OPTION]...')) | |
3246 | def debugstate(ui, repo, **opts): |
|
3246 | def debugstate(ui, repo, **opts): | |
3247 | """show the contents of the current dirstate""" |
|
3247 | """show the contents of the current dirstate""" | |
3248 |
|
3248 | |||
3249 | nodates = opts.get('nodates') |
|
3249 | nodates = opts.get('nodates') | |
3250 | datesort = opts.get('datesort') |
|
3250 | datesort = opts.get('datesort') | |
3251 |
|
3251 | |||
3252 | timestr = "" |
|
3252 | timestr = "" | |
3253 | if datesort: |
|
3253 | if datesort: | |
3254 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
|
3254 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename | |
3255 | else: |
|
3255 | else: | |
3256 | keyfunc = None # sort by filename |
|
3256 | keyfunc = None # sort by filename | |
3257 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): |
|
3257 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | |
3258 | if ent[3] == -1: |
|
3258 | if ent[3] == -1: | |
3259 | timestr = 'unset ' |
|
3259 | timestr = 'unset ' | |
3260 | elif nodates: |
|
3260 | elif nodates: | |
3261 | timestr = 'set ' |
|
3261 | timestr = 'set ' | |
3262 | else: |
|
3262 | else: | |
3263 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
3263 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", | |
3264 | time.localtime(ent[3])) |
|
3264 | time.localtime(ent[3])) | |
3265 | if ent[1] & 0o20000: |
|
3265 | if ent[1] & 0o20000: | |
3266 | mode = 'lnk' |
|
3266 | mode = 'lnk' | |
3267 | else: |
|
3267 | else: | |
3268 | mode = '%3o' % (ent[1] & 0o777 & ~util.umask) |
|
3268 | mode = '%3o' % (ent[1] & 0o777 & ~util.umask) | |
3269 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
3269 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) | |
3270 | for f in repo.dirstate.copies(): |
|
3270 | for f in repo.dirstate.copies(): | |
3271 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
3271 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | |
3272 |
|
3272 | |||
3273 | @command('debugsub', |
|
3273 | @command('debugsub', | |
3274 | [('r', 'rev', '', |
|
3274 | [('r', 'rev', '', | |
3275 | _('revision to check'), _('REV'))], |
|
3275 | _('revision to check'), _('REV'))], | |
3276 | _('[-r REV] [REV]')) |
|
3276 | _('[-r REV] [REV]')) | |
3277 | def debugsub(ui, repo, rev=None): |
|
3277 | def debugsub(ui, repo, rev=None): | |
3278 | ctx = scmutil.revsingle(repo, rev, None) |
|
3278 | ctx = scmutil.revsingle(repo, rev, None) | |
3279 | for k, v in sorted(ctx.substate.items()): |
|
3279 | for k, v in sorted(ctx.substate.items()): | |
3280 | ui.write(('path %s\n') % k) |
|
3280 | ui.write(('path %s\n') % k) | |
3281 | ui.write((' source %s\n') % v[0]) |
|
3281 | ui.write((' source %s\n') % v[0]) | |
3282 | ui.write((' revision %s\n') % v[1]) |
|
3282 | ui.write((' revision %s\n') % v[1]) | |
3283 |
|
3283 | |||
3284 | @command('debugsuccessorssets', |
|
3284 | @command('debugsuccessorssets', | |
3285 | [], |
|
3285 | [], | |
3286 | _('[REV]')) |
|
3286 | _('[REV]')) | |
3287 | def debugsuccessorssets(ui, repo, *revs): |
|
3287 | def debugsuccessorssets(ui, repo, *revs): | |
3288 | """show set of successors for revision |
|
3288 | """show set of successors for revision | |
3289 |
|
3289 | |||
3290 | A successors set of changeset A is a consistent group of revisions that |
|
3290 | A successors set of changeset A is a consistent group of revisions that | |
3291 | succeed A. It contains non-obsolete changesets only. |
|
3291 | succeed A. It contains non-obsolete changesets only. | |
3292 |
|
3292 | |||
3293 | In most cases a changeset A has a single successors set containing a single |
|
3293 | In most cases a changeset A has a single successors set containing a single | |
3294 | successor (changeset A replaced by A'). |
|
3294 | successor (changeset A replaced by A'). | |
3295 |
|
3295 | |||
3296 | A changeset that is made obsolete with no successors are called "pruned". |
|
3296 | A changeset that is made obsolete with no successors are called "pruned". | |
3297 | Such changesets have no successors sets at all. |
|
3297 | Such changesets have no successors sets at all. | |
3298 |
|
3298 | |||
3299 | A changeset that has been "split" will have a successors set containing |
|
3299 | A changeset that has been "split" will have a successors set containing | |
3300 | more than one successor. |
|
3300 | more than one successor. | |
3301 |
|
3301 | |||
3302 | A changeset that has been rewritten in multiple different ways is called |
|
3302 | A changeset that has been rewritten in multiple different ways is called | |
3303 | "divergent". Such changesets have multiple successor sets (each of which |
|
3303 | "divergent". Such changesets have multiple successor sets (each of which | |
3304 | may also be split, i.e. have multiple successors). |
|
3304 | may also be split, i.e. have multiple successors). | |
3305 |
|
3305 | |||
3306 | Results are displayed as follows:: |
|
3306 | Results are displayed as follows:: | |
3307 |
|
3307 | |||
3308 | <rev1> |
|
3308 | <rev1> | |
3309 | <successors-1A> |
|
3309 | <successors-1A> | |
3310 | <rev2> |
|
3310 | <rev2> | |
3311 | <successors-2A> |
|
3311 | <successors-2A> | |
3312 | <successors-2B1> <successors-2B2> <successors-2B3> |
|
3312 | <successors-2B1> <successors-2B2> <successors-2B3> | |
3313 |
|
3313 | |||
3314 | Here rev2 has two possible (i.e. divergent) successors sets. The first |
|
3314 | Here rev2 has two possible (i.e. divergent) successors sets. The first | |
3315 | holds one element, whereas the second holds three (i.e. the changeset has |
|
3315 | holds one element, whereas the second holds three (i.e. the changeset has | |
3316 | been split). |
|
3316 | been split). | |
3317 | """ |
|
3317 | """ | |
3318 | # passed to successorssets caching computation from one call to another |
|
3318 | # passed to successorssets caching computation from one call to another | |
3319 | cache = {} |
|
3319 | cache = {} | |
3320 | ctx2str = str |
|
3320 | ctx2str = str | |
3321 | node2str = short |
|
3321 | node2str = short | |
3322 | if ui.debug(): |
|
3322 | if ui.debug(): | |
3323 | def ctx2str(ctx): |
|
3323 | def ctx2str(ctx): | |
3324 | return ctx.hex() |
|
3324 | return ctx.hex() | |
3325 | node2str = hex |
|
3325 | node2str = hex | |
3326 | for rev in scmutil.revrange(repo, revs): |
|
3326 | for rev in scmutil.revrange(repo, revs): | |
3327 | ctx = repo[rev] |
|
3327 | ctx = repo[rev] | |
3328 | ui.write('%s\n'% ctx2str(ctx)) |
|
3328 | ui.write('%s\n'% ctx2str(ctx)) | |
3329 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): |
|
3329 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): | |
3330 | if succsset: |
|
3330 | if succsset: | |
3331 | ui.write(' ') |
|
3331 | ui.write(' ') | |
3332 | ui.write(node2str(succsset[0])) |
|
3332 | ui.write(node2str(succsset[0])) | |
3333 | for node in succsset[1:]: |
|
3333 | for node in succsset[1:]: | |
3334 | ui.write(' ') |
|
3334 | ui.write(' ') | |
3335 | ui.write(node2str(node)) |
|
3335 | ui.write(node2str(node)) | |
3336 | ui.write('\n') |
|
3336 | ui.write('\n') | |
3337 |
|
3337 | |||
3338 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True) |
|
3338 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True) | |
3339 | def debugwalk(ui, repo, *pats, **opts): |
|
3339 | def debugwalk(ui, repo, *pats, **opts): | |
3340 | """show how files match on given patterns""" |
|
3340 | """show how files match on given patterns""" | |
3341 | m = scmutil.match(repo[None], pats, opts) |
|
3341 | m = scmutil.match(repo[None], pats, opts) | |
3342 | items = list(repo.walk(m)) |
|
3342 | items = list(repo.walk(m)) | |
3343 | if not items: |
|
3343 | if not items: | |
3344 | return |
|
3344 | return | |
3345 | f = lambda fn: fn |
|
3345 | f = lambda fn: fn | |
3346 | if ui.configbool('ui', 'slash') and os.sep != '/': |
|
3346 | if ui.configbool('ui', 'slash') and os.sep != '/': | |
3347 | f = lambda fn: util.normpath(fn) |
|
3347 | f = lambda fn: util.normpath(fn) | |
3348 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
3348 | fmt = 'f %%-%ds %%-%ds %%s' % ( | |
3349 | max([len(abs) for abs in items]), |
|
3349 | max([len(abs) for abs in items]), | |
3350 | max([len(m.rel(abs)) for abs in items])) |
|
3350 | max([len(m.rel(abs)) for abs in items])) | |
3351 | for abs in items: |
|
3351 | for abs in items: | |
3352 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') |
|
3352 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') | |
3353 | ui.write("%s\n" % line.rstrip()) |
|
3353 | ui.write("%s\n" % line.rstrip()) | |
3354 |
|
3354 | |||
3355 | @command('debugwireargs', |
|
3355 | @command('debugwireargs', | |
3356 | [('', 'three', '', 'three'), |
|
3356 | [('', 'three', '', 'three'), | |
3357 | ('', 'four', '', 'four'), |
|
3357 | ('', 'four', '', 'four'), | |
3358 | ('', 'five', '', 'five'), |
|
3358 | ('', 'five', '', 'five'), | |
3359 | ] + remoteopts, |
|
3359 | ] + remoteopts, | |
3360 | _('REPO [OPTIONS]... [ONE [TWO]]'), |
|
3360 | _('REPO [OPTIONS]... [ONE [TWO]]'), | |
3361 | norepo=True) |
|
3361 | norepo=True) | |
3362 | def debugwireargs(ui, repopath, *vals, **opts): |
|
3362 | def debugwireargs(ui, repopath, *vals, **opts): | |
3363 | repo = hg.peer(ui, opts, repopath) |
|
3363 | repo = hg.peer(ui, opts, repopath) | |
3364 | for opt in remoteopts: |
|
3364 | for opt in remoteopts: | |
3365 | del opts[opt[1]] |
|
3365 | del opts[opt[1]] | |
3366 | args = {} |
|
3366 | args = {} | |
3367 | for k, v in opts.iteritems(): |
|
3367 | for k, v in opts.iteritems(): | |
3368 | if v: |
|
3368 | if v: | |
3369 | args[k] = v |
|
3369 | args[k] = v | |
3370 | # run twice to check that we don't mess up the stream for the next command |
|
3370 | # run twice to check that we don't mess up the stream for the next command | |
3371 | res1 = repo.debugwireargs(*vals, **args) |
|
3371 | res1 = repo.debugwireargs(*vals, **args) | |
3372 | res2 = repo.debugwireargs(*vals, **args) |
|
3372 | res2 = repo.debugwireargs(*vals, **args) | |
3373 | ui.write("%s\n" % res1) |
|
3373 | ui.write("%s\n" % res1) | |
3374 | if res1 != res2: |
|
3374 | if res1 != res2: | |
3375 | ui.warn("%s\n" % res2) |
|
3375 | ui.warn("%s\n" % res2) | |
3376 |
|
3376 | |||
3377 | @command('^diff', |
|
3377 | @command('^diff', | |
3378 | [('r', 'rev', [], _('revision'), _('REV')), |
|
3378 | [('r', 'rev', [], _('revision'), _('REV')), | |
3379 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
3379 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
3380 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
3380 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
3381 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), |
|
3381 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | |
3382 | inferrepo=True) |
|
3382 | inferrepo=True) | |
3383 | def diff(ui, repo, *pats, **opts): |
|
3383 | def diff(ui, repo, *pats, **opts): | |
3384 | """diff repository (or selected files) |
|
3384 | """diff repository (or selected files) | |
3385 |
|
3385 | |||
3386 | Show differences between revisions for the specified files. |
|
3386 | Show differences between revisions for the specified files. | |
3387 |
|
3387 | |||
3388 | Differences between files are shown using the unified diff format. |
|
3388 | Differences between files are shown using the unified diff format. | |
3389 |
|
3389 | |||
3390 | .. note:: |
|
3390 | .. note:: | |
3391 |
|
3391 | |||
3392 | diff may generate unexpected results for merges, as it will |
|
3392 | diff may generate unexpected results for merges, as it will | |
3393 | default to comparing against the working directory's first |
|
3393 | default to comparing against the working directory's first | |
3394 | parent changeset if no revisions are specified. |
|
3394 | parent changeset if no revisions are specified. | |
3395 |
|
3395 | |||
3396 | When two revision arguments are given, then changes are shown |
|
3396 | When two revision arguments are given, then changes are shown | |
3397 | between those revisions. If only one revision is specified then |
|
3397 | between those revisions. If only one revision is specified then | |
3398 | that revision is compared to the working directory, and, when no |
|
3398 | that revision is compared to the working directory, and, when no | |
3399 | revisions are specified, the working directory files are compared |
|
3399 | revisions are specified, the working directory files are compared | |
3400 | to its parent. |
|
3400 | to its parent. | |
3401 |
|
3401 | |||
3402 | Alternatively you can specify -c/--change with a revision to see |
|
3402 | Alternatively you can specify -c/--change with a revision to see | |
3403 | the changes in that changeset relative to its first parent. |
|
3403 | the changes in that changeset relative to its first parent. | |
3404 |
|
3404 | |||
3405 | Without the -a/--text option, diff will avoid generating diffs of |
|
3405 | Without the -a/--text option, diff will avoid generating diffs of | |
3406 | files it detects as binary. With -a, diff will generate a diff |
|
3406 | files it detects as binary. With -a, diff will generate a diff | |
3407 | anyway, probably with undesirable results. |
|
3407 | anyway, probably with undesirable results. | |
3408 |
|
3408 | |||
3409 | Use the -g/--git option to generate diffs in the git extended diff |
|
3409 | Use the -g/--git option to generate diffs in the git extended diff | |
3410 | format. For more information, read :hg:`help diffs`. |
|
3410 | format. For more information, read :hg:`help diffs`. | |
3411 |
|
3411 | |||
3412 | .. container:: verbose |
|
3412 | .. container:: verbose | |
3413 |
|
3413 | |||
3414 | Examples: |
|
3414 | Examples: | |
3415 |
|
3415 | |||
3416 | - compare a file in the current working directory to its parent:: |
|
3416 | - compare a file in the current working directory to its parent:: | |
3417 |
|
3417 | |||
3418 | hg diff foo.c |
|
3418 | hg diff foo.c | |
3419 |
|
3419 | |||
3420 | - compare two historical versions of a directory, with rename info:: |
|
3420 | - compare two historical versions of a directory, with rename info:: | |
3421 |
|
3421 | |||
3422 | hg diff --git -r 1.0:1.2 lib/ |
|
3422 | hg diff --git -r 1.0:1.2 lib/ | |
3423 |
|
3423 | |||
3424 | - get change stats relative to the last change on some date:: |
|
3424 | - get change stats relative to the last change on some date:: | |
3425 |
|
3425 | |||
3426 | hg diff --stat -r "date('may 2')" |
|
3426 | hg diff --stat -r "date('may 2')" | |
3427 |
|
3427 | |||
3428 | - diff all newly-added files that contain a keyword:: |
|
3428 | - diff all newly-added files that contain a keyword:: | |
3429 |
|
3429 | |||
3430 | hg diff "set:added() and grep(GNU)" |
|
3430 | hg diff "set:added() and grep(GNU)" | |
3431 |
|
3431 | |||
3432 | - compare a revision and its parents:: |
|
3432 | - compare a revision and its parents:: | |
3433 |
|
3433 | |||
3434 | hg diff -c 9353 # compare against first parent |
|
3434 | hg diff -c 9353 # compare against first parent | |
3435 | hg diff -r 9353^:9353 # same using revset syntax |
|
3435 | hg diff -r 9353^:9353 # same using revset syntax | |
3436 | hg diff -r 9353^2:9353 # compare against the second parent |
|
3436 | hg diff -r 9353^2:9353 # compare against the second parent | |
3437 |
|
3437 | |||
3438 | Returns 0 on success. |
|
3438 | Returns 0 on success. | |
3439 | """ |
|
3439 | """ | |
3440 |
|
3440 | |||
3441 | revs = opts.get('rev') |
|
3441 | revs = opts.get('rev') | |
3442 | change = opts.get('change') |
|
3442 | change = opts.get('change') | |
3443 | stat = opts.get('stat') |
|
3443 | stat = opts.get('stat') | |
3444 | reverse = opts.get('reverse') |
|
3444 | reverse = opts.get('reverse') | |
3445 |
|
3445 | |||
3446 | if revs and change: |
|
3446 | if revs and change: | |
3447 | msg = _('cannot specify --rev and --change at the same time') |
|
3447 | msg = _('cannot specify --rev and --change at the same time') | |
3448 | raise error.Abort(msg) |
|
3448 | raise error.Abort(msg) | |
3449 | elif change: |
|
3449 | elif change: | |
3450 | node2 = scmutil.revsingle(repo, change, None).node() |
|
3450 | node2 = scmutil.revsingle(repo, change, None).node() | |
3451 | node1 = repo[node2].p1().node() |
|
3451 | node1 = repo[node2].p1().node() | |
3452 | else: |
|
3452 | else: | |
3453 | node1, node2 = scmutil.revpair(repo, revs) |
|
3453 | node1, node2 = scmutil.revpair(repo, revs) | |
3454 |
|
3454 | |||
3455 | if reverse: |
|
3455 | if reverse: | |
3456 | node1, node2 = node2, node1 |
|
3456 | node1, node2 = node2, node1 | |
3457 |
|
3457 | |||
3458 | diffopts = patch.diffallopts(ui, opts) |
|
3458 | diffopts = patch.diffallopts(ui, opts) | |
3459 | m = scmutil.match(repo[node2], pats, opts) |
|
3459 | m = scmutil.match(repo[node2], pats, opts) | |
3460 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
3460 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
3461 | listsubrepos=opts.get('subrepos'), |
|
3461 | listsubrepos=opts.get('subrepos'), | |
3462 | root=opts.get('root')) |
|
3462 | root=opts.get('root')) | |
3463 |
|
3463 | |||
3464 | @command('^export', |
|
3464 | @command('^export', | |
3465 | [('o', 'output', '', |
|
3465 | [('o', 'output', '', | |
3466 | _('print output to file with formatted name'), _('FORMAT')), |
|
3466 | _('print output to file with formatted name'), _('FORMAT')), | |
3467 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
3467 | ('', 'switch-parent', None, _('diff against the second parent')), | |
3468 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
3468 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
3469 | ] + diffopts, |
|
3469 | ] + diffopts, | |
3470 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) |
|
3470 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) | |
3471 | def export(ui, repo, *changesets, **opts): |
|
3471 | def export(ui, repo, *changesets, **opts): | |
3472 | """dump the header and diffs for one or more changesets |
|
3472 | """dump the header and diffs for one or more changesets | |
3473 |
|
3473 | |||
3474 | Print the changeset header and diffs for one or more revisions. |
|
3474 | Print the changeset header and diffs for one or more revisions. | |
3475 | If no revision is given, the parent of the working directory is used. |
|
3475 | If no revision is given, the parent of the working directory is used. | |
3476 |
|
3476 | |||
3477 | The information shown in the changeset header is: author, date, |
|
3477 | The information shown in the changeset header is: author, date, | |
3478 | branch name (if non-default), changeset hash, parent(s) and commit |
|
3478 | branch name (if non-default), changeset hash, parent(s) and commit | |
3479 | comment. |
|
3479 | comment. | |
3480 |
|
3480 | |||
3481 | .. note:: |
|
3481 | .. note:: | |
3482 |
|
3482 | |||
3483 | export may generate unexpected diff output for merge |
|
3483 | export may generate unexpected diff output for merge | |
3484 | changesets, as it will compare the merge changeset against its |
|
3484 | changesets, as it will compare the merge changeset against its | |
3485 | first parent only. |
|
3485 | first parent only. | |
3486 |
|
3486 | |||
3487 | Output may be to a file, in which case the name of the file is |
|
3487 | Output may be to a file, in which case the name of the file is | |
3488 | given using a format string. The formatting rules are as follows: |
|
3488 | given using a format string. The formatting rules are as follows: | |
3489 |
|
3489 | |||
3490 | :``%%``: literal "%" character |
|
3490 | :``%%``: literal "%" character | |
3491 | :``%H``: changeset hash (40 hexadecimal digits) |
|
3491 | :``%H``: changeset hash (40 hexadecimal digits) | |
3492 | :``%N``: number of patches being generated |
|
3492 | :``%N``: number of patches being generated | |
3493 | :``%R``: changeset revision number |
|
3493 | :``%R``: changeset revision number | |
3494 | :``%b``: basename of the exporting repository |
|
3494 | :``%b``: basename of the exporting repository | |
3495 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
3495 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
3496 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
3496 | :``%m``: first line of the commit message (only alphanumeric characters) | |
3497 | :``%n``: zero-padded sequence number, starting at 1 |
|
3497 | :``%n``: zero-padded sequence number, starting at 1 | |
3498 | :``%r``: zero-padded changeset revision number |
|
3498 | :``%r``: zero-padded changeset revision number | |
3499 |
|
3499 | |||
3500 | Without the -a/--text option, export will avoid generating diffs |
|
3500 | Without the -a/--text option, export will avoid generating diffs | |
3501 | of files it detects as binary. With -a, export will generate a |
|
3501 | of files it detects as binary. With -a, export will generate a | |
3502 | diff anyway, probably with undesirable results. |
|
3502 | diff anyway, probably with undesirable results. | |
3503 |
|
3503 | |||
3504 | Use the -g/--git option to generate diffs in the git extended diff |
|
3504 | Use the -g/--git option to generate diffs in the git extended diff | |
3505 | format. See :hg:`help diffs` for more information. |
|
3505 | format. See :hg:`help diffs` for more information. | |
3506 |
|
3506 | |||
3507 | With the --switch-parent option, the diff will be against the |
|
3507 | With the --switch-parent option, the diff will be against the | |
3508 | second parent. It can be useful to review a merge. |
|
3508 | second parent. It can be useful to review a merge. | |
3509 |
|
3509 | |||
3510 | .. container:: verbose |
|
3510 | .. container:: verbose | |
3511 |
|
3511 | |||
3512 | Examples: |
|
3512 | Examples: | |
3513 |
|
3513 | |||
3514 | - use export and import to transplant a bugfix to the current |
|
3514 | - use export and import to transplant a bugfix to the current | |
3515 | branch:: |
|
3515 | branch:: | |
3516 |
|
3516 | |||
3517 | hg export -r 9353 | hg import - |
|
3517 | hg export -r 9353 | hg import - | |
3518 |
|
3518 | |||
3519 | - export all the changesets between two revisions to a file with |
|
3519 | - export all the changesets between two revisions to a file with | |
3520 | rename information:: |
|
3520 | rename information:: | |
3521 |
|
3521 | |||
3522 | hg export --git -r 123:150 > changes.txt |
|
3522 | hg export --git -r 123:150 > changes.txt | |
3523 |
|
3523 | |||
3524 | - split outgoing changes into a series of patches with |
|
3524 | - split outgoing changes into a series of patches with | |
3525 | descriptive names:: |
|
3525 | descriptive names:: | |
3526 |
|
3526 | |||
3527 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
3527 | hg export -r "outgoing()" -o "%n-%m.patch" | |
3528 |
|
3528 | |||
3529 | Returns 0 on success. |
|
3529 | Returns 0 on success. | |
3530 | """ |
|
3530 | """ | |
3531 | changesets += tuple(opts.get('rev', [])) |
|
3531 | changesets += tuple(opts.get('rev', [])) | |
3532 | if not changesets: |
|
3532 | if not changesets: | |
3533 | changesets = ['.'] |
|
3533 | changesets = ['.'] | |
3534 | revs = scmutil.revrange(repo, changesets) |
|
3534 | revs = scmutil.revrange(repo, changesets) | |
3535 | if not revs: |
|
3535 | if not revs: | |
3536 | raise error.Abort(_("export requires at least one changeset")) |
|
3536 | raise error.Abort(_("export requires at least one changeset")) | |
3537 | if len(revs) > 1: |
|
3537 | if len(revs) > 1: | |
3538 | ui.note(_('exporting patches:\n')) |
|
3538 | ui.note(_('exporting patches:\n')) | |
3539 | else: |
|
3539 | else: | |
3540 | ui.note(_('exporting patch:\n')) |
|
3540 | ui.note(_('exporting patch:\n')) | |
3541 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
3541 | cmdutil.export(repo, revs, template=opts.get('output'), | |
3542 | switch_parent=opts.get('switch_parent'), |
|
3542 | switch_parent=opts.get('switch_parent'), | |
3543 | opts=patch.diffallopts(ui, opts)) |
|
3543 | opts=patch.diffallopts(ui, opts)) | |
3544 |
|
3544 | |||
3545 | @command('files', |
|
3545 | @command('files', | |
3546 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3546 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3547 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3547 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3548 | ] + walkopts + formatteropts + subrepoopts, |
|
3548 | ] + walkopts + formatteropts + subrepoopts, | |
3549 | _('[OPTION]... [PATTERN]...')) |
|
3549 | _('[OPTION]... [PATTERN]...')) | |
3550 | def files(ui, repo, *pats, **opts): |
|
3550 | def files(ui, repo, *pats, **opts): | |
3551 | """list tracked files |
|
3551 | """list tracked files | |
3552 |
|
3552 | |||
3553 | Print files under Mercurial control in the working directory or |
|
3553 | Print files under Mercurial control in the working directory or | |
3554 | specified revision whose names match the given patterns (excluding |
|
3554 | specified revision whose names match the given patterns (excluding | |
3555 | removed files). |
|
3555 | removed files). | |
3556 |
|
3556 | |||
3557 | If no patterns are given to match, this command prints the names |
|
3557 | If no patterns are given to match, this command prints the names | |
3558 | of all files under Mercurial control in the working directory. |
|
3558 | of all files under Mercurial control in the working directory. | |
3559 |
|
3559 | |||
3560 | .. container:: verbose |
|
3560 | .. container:: verbose | |
3561 |
|
3561 | |||
3562 | Examples: |
|
3562 | Examples: | |
3563 |
|
3563 | |||
3564 | - list all files under the current directory:: |
|
3564 | - list all files under the current directory:: | |
3565 |
|
3565 | |||
3566 | hg files . |
|
3566 | hg files . | |
3567 |
|
3567 | |||
3568 | - shows sizes and flags for current revision:: |
|
3568 | - shows sizes and flags for current revision:: | |
3569 |
|
3569 | |||
3570 | hg files -vr . |
|
3570 | hg files -vr . | |
3571 |
|
3571 | |||
3572 | - list all files named README:: |
|
3572 | - list all files named README:: | |
3573 |
|
3573 | |||
3574 | hg files -I "**/README" |
|
3574 | hg files -I "**/README" | |
3575 |
|
3575 | |||
3576 | - list all binary files:: |
|
3576 | - list all binary files:: | |
3577 |
|
3577 | |||
3578 | hg files "set:binary()" |
|
3578 | hg files "set:binary()" | |
3579 |
|
3579 | |||
3580 | - find files containing a regular expression:: |
|
3580 | - find files containing a regular expression:: | |
3581 |
|
3581 | |||
3582 | hg files "set:grep('bob')" |
|
3582 | hg files "set:grep('bob')" | |
3583 |
|
3583 | |||
3584 | - search tracked file contents with xargs and grep:: |
|
3584 | - search tracked file contents with xargs and grep:: | |
3585 |
|
3585 | |||
3586 | hg files -0 | xargs -0 grep foo |
|
3586 | hg files -0 | xargs -0 grep foo | |
3587 |
|
3587 | |||
3588 | See :hg:`help patterns` and :hg:`help filesets` for more information |
|
3588 | See :hg:`help patterns` and :hg:`help filesets` for more information | |
3589 | on specifying file patterns. |
|
3589 | on specifying file patterns. | |
3590 |
|
3590 | |||
3591 | Returns 0 if a match is found, 1 otherwise. |
|
3591 | Returns 0 if a match is found, 1 otherwise. | |
3592 |
|
3592 | |||
3593 | """ |
|
3593 | """ | |
3594 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
3594 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
3595 |
|
3595 | |||
3596 | end = '\n' |
|
3596 | end = '\n' | |
3597 | if opts.get('print0'): |
|
3597 | if opts.get('print0'): | |
3598 | end = '\0' |
|
3598 | end = '\0' | |
3599 | fm = ui.formatter('files', opts) |
|
3599 | fm = ui.formatter('files', opts) | |
3600 | fmt = '%s' + end |
|
3600 | fmt = '%s' + end | |
3601 |
|
3601 | |||
3602 | m = scmutil.match(ctx, pats, opts) |
|
3602 | m = scmutil.match(ctx, pats, opts) | |
3603 | ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) |
|
3603 | ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) | |
3604 |
|
3604 | |||
3605 | fm.end() |
|
3605 | fm.end() | |
3606 |
|
3606 | |||
3607 | return ret |
|
3607 | return ret | |
3608 |
|
3608 | |||
3609 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) |
|
3609 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) | |
3610 | def forget(ui, repo, *pats, **opts): |
|
3610 | def forget(ui, repo, *pats, **opts): | |
3611 | """forget the specified files on the next commit |
|
3611 | """forget the specified files on the next commit | |
3612 |
|
3612 | |||
3613 | Mark the specified files so they will no longer be tracked |
|
3613 | Mark the specified files so they will no longer be tracked | |
3614 | after the next commit. |
|
3614 | after the next commit. | |
3615 |
|
3615 | |||
3616 | This only removes files from the current branch, not from the |
|
3616 | This only removes files from the current branch, not from the | |
3617 | entire project history, and it does not delete them from the |
|
3617 | entire project history, and it does not delete them from the | |
3618 | working directory. |
|
3618 | working directory. | |
3619 |
|
3619 | |||
3620 | To delete the file from the working directory, see :hg:`remove`. |
|
3620 | To delete the file from the working directory, see :hg:`remove`. | |
3621 |
|
3621 | |||
3622 | To undo a forget before the next commit, see :hg:`add`. |
|
3622 | To undo a forget before the next commit, see :hg:`add`. | |
3623 |
|
3623 | |||
3624 | .. container:: verbose |
|
3624 | .. container:: verbose | |
3625 |
|
3625 | |||
3626 | Examples: |
|
3626 | Examples: | |
3627 |
|
3627 | |||
3628 | - forget newly-added binary files:: |
|
3628 | - forget newly-added binary files:: | |
3629 |
|
3629 | |||
3630 | hg forget "set:added() and binary()" |
|
3630 | hg forget "set:added() and binary()" | |
3631 |
|
3631 | |||
3632 | - forget files that would be excluded by .hgignore:: |
|
3632 | - forget files that would be excluded by .hgignore:: | |
3633 |
|
3633 | |||
3634 | hg forget "set:hgignore()" |
|
3634 | hg forget "set:hgignore()" | |
3635 |
|
3635 | |||
3636 | Returns 0 on success. |
|
3636 | Returns 0 on success. | |
3637 | """ |
|
3637 | """ | |
3638 |
|
3638 | |||
3639 | if not pats: |
|
3639 | if not pats: | |
3640 | raise error.Abort(_('no files specified')) |
|
3640 | raise error.Abort(_('no files specified')) | |
3641 |
|
3641 | |||
3642 | m = scmutil.match(repo[None], pats, opts) |
|
3642 | m = scmutil.match(repo[None], pats, opts) | |
3643 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
3643 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] | |
3644 | return rejected and 1 or 0 |
|
3644 | return rejected and 1 or 0 | |
3645 |
|
3645 | |||
3646 | @command( |
|
3646 | @command( | |
3647 | 'graft', |
|
3647 | 'graft', | |
3648 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
3648 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
3649 | ('c', 'continue', False, _('resume interrupted graft')), |
|
3649 | ('c', 'continue', False, _('resume interrupted graft')), | |
3650 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3650 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
3651 | ('', 'log', None, _('append graft info to log message')), |
|
3651 | ('', 'log', None, _('append graft info to log message')), | |
3652 | ('f', 'force', False, _('force graft')), |
|
3652 | ('f', 'force', False, _('force graft')), | |
3653 | ('D', 'currentdate', False, |
|
3653 | ('D', 'currentdate', False, | |
3654 | _('record the current date as commit date')), |
|
3654 | _('record the current date as commit date')), | |
3655 | ('U', 'currentuser', False, |
|
3655 | ('U', 'currentuser', False, | |
3656 | _('record the current user as committer'), _('DATE'))] |
|
3656 | _('record the current user as committer'), _('DATE'))] | |
3657 | + commitopts2 + mergetoolopts + dryrunopts, |
|
3657 | + commitopts2 + mergetoolopts + dryrunopts, | |
3658 | _('[OPTION]... [-r] REV...')) |
|
3658 | _('[OPTION]... [-r] REV...')) | |
3659 | def graft(ui, repo, *revs, **opts): |
|
3659 | def graft(ui, repo, *revs, **opts): | |
3660 | '''copy changes from other branches onto the current branch |
|
3660 | '''copy changes from other branches onto the current branch | |
3661 |
|
3661 | |||
3662 | This command uses Mercurial's merge logic to copy individual |
|
3662 | This command uses Mercurial's merge logic to copy individual | |
3663 | changes from other branches without merging branches in the |
|
3663 | changes from other branches without merging branches in the | |
3664 | history graph. This is sometimes known as 'backporting' or |
|
3664 | history graph. This is sometimes known as 'backporting' or | |
3665 | 'cherry-picking'. By default, graft will copy user, date, and |
|
3665 | 'cherry-picking'. By default, graft will copy user, date, and | |
3666 | description from the source changesets. |
|
3666 | description from the source changesets. | |
3667 |
|
3667 | |||
3668 | Changesets that are ancestors of the current revision, that have |
|
3668 | Changesets that are ancestors of the current revision, that have | |
3669 | already been grafted, or that are merges will be skipped. |
|
3669 | already been grafted, or that are merges will be skipped. | |
3670 |
|
3670 | |||
3671 | If --log is specified, log messages will have a comment appended |
|
3671 | If --log is specified, log messages will have a comment appended | |
3672 | of the form:: |
|
3672 | of the form:: | |
3673 |
|
3673 | |||
3674 | (grafted from CHANGESETHASH) |
|
3674 | (grafted from CHANGESETHASH) | |
3675 |
|
3675 | |||
3676 | If --force is specified, revisions will be grafted even if they |
|
3676 | If --force is specified, revisions will be grafted even if they | |
3677 | are already ancestors of or have been grafted to the destination. |
|
3677 | are already ancestors of or have been grafted to the destination. | |
3678 | This is useful when the revisions have since been backed out. |
|
3678 | This is useful when the revisions have since been backed out. | |
3679 |
|
3679 | |||
3680 | If a graft merge results in conflicts, the graft process is |
|
3680 | If a graft merge results in conflicts, the graft process is | |
3681 | interrupted so that the current merge can be manually resolved. |
|
3681 | interrupted so that the current merge can be manually resolved. | |
3682 | Once all conflicts are addressed, the graft process can be |
|
3682 | Once all conflicts are addressed, the graft process can be | |
3683 | continued with the -c/--continue option. |
|
3683 | continued with the -c/--continue option. | |
3684 |
|
3684 | |||
3685 | .. note:: |
|
3685 | .. note:: | |
3686 |
|
3686 | |||
3687 | The -c/--continue option does not reapply earlier options, except |
|
3687 | The -c/--continue option does not reapply earlier options, except | |
3688 | for --force. |
|
3688 | for --force. | |
3689 |
|
3689 | |||
3690 | .. container:: verbose |
|
3690 | .. container:: verbose | |
3691 |
|
3691 | |||
3692 | Examples: |
|
3692 | Examples: | |
3693 |
|
3693 | |||
3694 | - copy a single change to the stable branch and edit its description:: |
|
3694 | - copy a single change to the stable branch and edit its description:: | |
3695 |
|
3695 | |||
3696 | hg update stable |
|
3696 | hg update stable | |
3697 | hg graft --edit 9393 |
|
3697 | hg graft --edit 9393 | |
3698 |
|
3698 | |||
3699 | - graft a range of changesets with one exception, updating dates:: |
|
3699 | - graft a range of changesets with one exception, updating dates:: | |
3700 |
|
3700 | |||
3701 | hg graft -D "2085::2093 and not 2091" |
|
3701 | hg graft -D "2085::2093 and not 2091" | |
3702 |
|
3702 | |||
3703 | - continue a graft after resolving conflicts:: |
|
3703 | - continue a graft after resolving conflicts:: | |
3704 |
|
3704 | |||
3705 | hg graft -c |
|
3705 | hg graft -c | |
3706 |
|
3706 | |||
3707 | - show the source of a grafted changeset:: |
|
3707 | - show the source of a grafted changeset:: | |
3708 |
|
3708 | |||
3709 | hg log --debug -r . |
|
3709 | hg log --debug -r . | |
3710 |
|
3710 | |||
3711 | See :hg:`help revisions` and :hg:`help revsets` for more about |
|
3711 | See :hg:`help revisions` and :hg:`help revsets` for more about | |
3712 | specifying revisions. |
|
3712 | specifying revisions. | |
3713 |
|
3713 | |||
3714 | Returns 0 on successful completion. |
|
3714 | Returns 0 on successful completion. | |
3715 | ''' |
|
3715 | ''' | |
3716 |
|
3716 | |||
3717 | revs = list(revs) |
|
3717 | revs = list(revs) | |
3718 | revs.extend(opts['rev']) |
|
3718 | revs.extend(opts['rev']) | |
3719 |
|
3719 | |||
3720 | if not opts.get('user') and opts.get('currentuser'): |
|
3720 | if not opts.get('user') and opts.get('currentuser'): | |
3721 | opts['user'] = ui.username() |
|
3721 | opts['user'] = ui.username() | |
3722 | if not opts.get('date') and opts.get('currentdate'): |
|
3722 | if not opts.get('date') and opts.get('currentdate'): | |
3723 | opts['date'] = "%d %d" % util.makedate() |
|
3723 | opts['date'] = "%d %d" % util.makedate() | |
3724 |
|
3724 | |||
3725 | editor = cmdutil.getcommiteditor(editform='graft', **opts) |
|
3725 | editor = cmdutil.getcommiteditor(editform='graft', **opts) | |
3726 |
|
3726 | |||
3727 | cont = False |
|
3727 | cont = False | |
3728 | if opts['continue']: |
|
3728 | if opts['continue']: | |
3729 | cont = True |
|
3729 | cont = True | |
3730 | if revs: |
|
3730 | if revs: | |
3731 | raise error.Abort(_("can't specify --continue and revisions")) |
|
3731 | raise error.Abort(_("can't specify --continue and revisions")) | |
3732 | # read in unfinished revisions |
|
3732 | # read in unfinished revisions | |
3733 | try: |
|
3733 | try: | |
3734 | nodes = repo.vfs.read('graftstate').splitlines() |
|
3734 | nodes = repo.vfs.read('graftstate').splitlines() | |
3735 | revs = [repo[node].rev() for node in nodes] |
|
3735 | revs = [repo[node].rev() for node in nodes] | |
3736 | except IOError as inst: |
|
3736 | except IOError as inst: | |
3737 | if inst.errno != errno.ENOENT: |
|
3737 | if inst.errno != errno.ENOENT: | |
3738 | raise |
|
3738 | raise | |
3739 | raise error.Abort(_("no graft state found, can't continue")) |
|
3739 | raise error.Abort(_("no graft state found, can't continue")) | |
3740 | else: |
|
3740 | else: | |
3741 | cmdutil.checkunfinished(repo) |
|
3741 | cmdutil.checkunfinished(repo) | |
3742 | cmdutil.bailifchanged(repo) |
|
3742 | cmdutil.bailifchanged(repo) | |
3743 | if not revs: |
|
3743 | if not revs: | |
3744 | raise error.Abort(_('no revisions specified')) |
|
3744 | raise error.Abort(_('no revisions specified')) | |
3745 | revs = scmutil.revrange(repo, revs) |
|
3745 | revs = scmutil.revrange(repo, revs) | |
3746 |
|
3746 | |||
3747 | skipped = set() |
|
3747 | skipped = set() | |
3748 | # check for merges |
|
3748 | # check for merges | |
3749 | for rev in repo.revs('%ld and merge()', revs): |
|
3749 | for rev in repo.revs('%ld and merge()', revs): | |
3750 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) |
|
3750 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) | |
3751 | skipped.add(rev) |
|
3751 | skipped.add(rev) | |
3752 | revs = [r for r in revs if r not in skipped] |
|
3752 | revs = [r for r in revs if r not in skipped] | |
3753 | if not revs: |
|
3753 | if not revs: | |
3754 | return -1 |
|
3754 | return -1 | |
3755 |
|
3755 | |||
3756 | # Don't check in the --continue case, in effect retaining --force across |
|
3756 | # Don't check in the --continue case, in effect retaining --force across | |
3757 | # --continues. That's because without --force, any revisions we decided to |
|
3757 | # --continues. That's because without --force, any revisions we decided to | |
3758 | # skip would have been filtered out here, so they wouldn't have made their |
|
3758 | # skip would have been filtered out here, so they wouldn't have made their | |
3759 | # way to the graftstate. With --force, any revisions we would have otherwise |
|
3759 | # way to the graftstate. With --force, any revisions we would have otherwise | |
3760 | # skipped would not have been filtered out, and if they hadn't been applied |
|
3760 | # skipped would not have been filtered out, and if they hadn't been applied | |
3761 | # already, they'd have been in the graftstate. |
|
3761 | # already, they'd have been in the graftstate. | |
3762 | if not (cont or opts.get('force')): |
|
3762 | if not (cont or opts.get('force')): | |
3763 | # check for ancestors of dest branch |
|
3763 | # check for ancestors of dest branch | |
3764 | crev = repo['.'].rev() |
|
3764 | crev = repo['.'].rev() | |
3765 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
3765 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
3766 | # Cannot use x.remove(y) on smart set, this has to be a list. |
|
3766 | # Cannot use x.remove(y) on smart set, this has to be a list. | |
3767 | # XXX make this lazy in the future |
|
3767 | # XXX make this lazy in the future | |
3768 | revs = list(revs) |
|
3768 | revs = list(revs) | |
3769 | # don't mutate while iterating, create a copy |
|
3769 | # don't mutate while iterating, create a copy | |
3770 | for rev in list(revs): |
|
3770 | for rev in list(revs): | |
3771 | if rev in ancestors: |
|
3771 | if rev in ancestors: | |
3772 | ui.warn(_('skipping ancestor revision %d:%s\n') % |
|
3772 | ui.warn(_('skipping ancestor revision %d:%s\n') % | |
3773 | (rev, repo[rev])) |
|
3773 | (rev, repo[rev])) | |
3774 | # XXX remove on list is slow |
|
3774 | # XXX remove on list is slow | |
3775 | revs.remove(rev) |
|
3775 | revs.remove(rev) | |
3776 | if not revs: |
|
3776 | if not revs: | |
3777 | return -1 |
|
3777 | return -1 | |
3778 |
|
3778 | |||
3779 | # analyze revs for earlier grafts |
|
3779 | # analyze revs for earlier grafts | |
3780 | ids = {} |
|
3780 | ids = {} | |
3781 | for ctx in repo.set("%ld", revs): |
|
3781 | for ctx in repo.set("%ld", revs): | |
3782 | ids[ctx.hex()] = ctx.rev() |
|
3782 | ids[ctx.hex()] = ctx.rev() | |
3783 | n = ctx.extra().get('source') |
|
3783 | n = ctx.extra().get('source') | |
3784 | if n: |
|
3784 | if n: | |
3785 | ids[n] = ctx.rev() |
|
3785 | ids[n] = ctx.rev() | |
3786 |
|
3786 | |||
3787 | # check ancestors for earlier grafts |
|
3787 | # check ancestors for earlier grafts | |
3788 | ui.debug('scanning for duplicate grafts\n') |
|
3788 | ui.debug('scanning for duplicate grafts\n') | |
3789 |
|
3789 | |||
3790 | for rev in repo.changelog.findmissingrevs(revs, [crev]): |
|
3790 | for rev in repo.changelog.findmissingrevs(revs, [crev]): | |
3791 | ctx = repo[rev] |
|
3791 | ctx = repo[rev] | |
3792 | n = ctx.extra().get('source') |
|
3792 | n = ctx.extra().get('source') | |
3793 | if n in ids: |
|
3793 | if n in ids: | |
3794 | try: |
|
3794 | try: | |
3795 | r = repo[n].rev() |
|
3795 | r = repo[n].rev() | |
3796 | except error.RepoLookupError: |
|
3796 | except error.RepoLookupError: | |
3797 | r = None |
|
3797 | r = None | |
3798 | if r in revs: |
|
3798 | if r in revs: | |
3799 | ui.warn(_('skipping revision %d:%s ' |
|
3799 | ui.warn(_('skipping revision %d:%s ' | |
3800 | '(already grafted to %d:%s)\n') |
|
3800 | '(already grafted to %d:%s)\n') | |
3801 | % (r, repo[r], rev, ctx)) |
|
3801 | % (r, repo[r], rev, ctx)) | |
3802 | revs.remove(r) |
|
3802 | revs.remove(r) | |
3803 | elif ids[n] in revs: |
|
3803 | elif ids[n] in revs: | |
3804 | if r is None: |
|
3804 | if r is None: | |
3805 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
3805 | ui.warn(_('skipping already grafted revision %d:%s ' | |
3806 | '(%d:%s also has unknown origin %s)\n') |
|
3806 | '(%d:%s also has unknown origin %s)\n') | |
3807 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) |
|
3807 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) | |
3808 | else: |
|
3808 | else: | |
3809 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
3809 | ui.warn(_('skipping already grafted revision %d:%s ' | |
3810 | '(%d:%s also has origin %d:%s)\n') |
|
3810 | '(%d:%s also has origin %d:%s)\n') | |
3811 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
|
3811 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) | |
3812 | revs.remove(ids[n]) |
|
3812 | revs.remove(ids[n]) | |
3813 | elif ctx.hex() in ids: |
|
3813 | elif ctx.hex() in ids: | |
3814 | r = ids[ctx.hex()] |
|
3814 | r = ids[ctx.hex()] | |
3815 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
3815 | ui.warn(_('skipping already grafted revision %d:%s ' | |
3816 | '(was grafted from %d:%s)\n') % |
|
3816 | '(was grafted from %d:%s)\n') % | |
3817 | (r, repo[r], rev, ctx)) |
|
3817 | (r, repo[r], rev, ctx)) | |
3818 | revs.remove(r) |
|
3818 | revs.remove(r) | |
3819 | if not revs: |
|
3819 | if not revs: | |
3820 | return -1 |
|
3820 | return -1 | |
3821 |
|
3821 | |||
3822 | wlock = repo.wlock() |
|
3822 | wlock = repo.wlock() | |
3823 | try: |
|
3823 | try: | |
3824 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
3824 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
3825 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
3825 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |
3826 | ctx.description().split('\n', 1)[0]) |
|
3826 | ctx.description().split('\n', 1)[0]) | |
3827 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
3827 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | |
3828 | if names: |
|
3828 | if names: | |
3829 | desc += ' (%s)' % ' '.join(names) |
|
3829 | desc += ' (%s)' % ' '.join(names) | |
3830 | ui.status(_('grafting %s\n') % desc) |
|
3830 | ui.status(_('grafting %s\n') % desc) | |
3831 | if opts.get('dry_run'): |
|
3831 | if opts.get('dry_run'): | |
3832 | continue |
|
3832 | continue | |
3833 |
|
3833 | |||
3834 |
|
|
3834 | extra = ctx.extra().copy() | |
3835 |
extra |
|
3835 | del extra['branch'] | |
|
3836 | source = extra.get('source') | |||
3836 | if source: |
|
3837 | if source: | |
3837 | extra['source'] = source |
|
|||
3838 | extra['intermediate-source'] = ctx.hex() |
|
3838 | extra['intermediate-source'] = ctx.hex() | |
3839 | else: |
|
3839 | else: | |
3840 | extra['source'] = ctx.hex() |
|
3840 | extra['source'] = ctx.hex() | |
3841 | user = ctx.user() |
|
3841 | user = ctx.user() | |
3842 | if opts.get('user'): |
|
3842 | if opts.get('user'): | |
3843 | user = opts['user'] |
|
3843 | user = opts['user'] | |
3844 | date = ctx.date() |
|
3844 | date = ctx.date() | |
3845 | if opts.get('date'): |
|
3845 | if opts.get('date'): | |
3846 | date = opts['date'] |
|
3846 | date = opts['date'] | |
3847 | message = ctx.description() |
|
3847 | message = ctx.description() | |
3848 | if opts.get('log'): |
|
3848 | if opts.get('log'): | |
3849 | message += '\n(grafted from %s)' % ctx.hex() |
|
3849 | message += '\n(grafted from %s)' % ctx.hex() | |
3850 |
|
3850 | |||
3851 | # we don't merge the first commit when continuing |
|
3851 | # we don't merge the first commit when continuing | |
3852 | if not cont: |
|
3852 | if not cont: | |
3853 | # perform the graft merge with p1(rev) as 'ancestor' |
|
3853 | # perform the graft merge with p1(rev) as 'ancestor' | |
3854 | try: |
|
3854 | try: | |
3855 | # ui.forcemerge is an internal variable, do not document |
|
3855 | # ui.forcemerge is an internal variable, do not document | |
3856 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
3856 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
3857 | 'graft') |
|
3857 | 'graft') | |
3858 | stats = mergemod.graft(repo, ctx, ctx.p1(), |
|
3858 | stats = mergemod.graft(repo, ctx, ctx.p1(), | |
3859 | ['local', 'graft']) |
|
3859 | ['local', 'graft']) | |
3860 | finally: |
|
3860 | finally: | |
3861 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
3861 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | |
3862 | # report any conflicts |
|
3862 | # report any conflicts | |
3863 | if stats and stats[3] > 0: |
|
3863 | if stats and stats[3] > 0: | |
3864 | # write out state for --continue |
|
3864 | # write out state for --continue | |
3865 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
3865 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
3866 | repo.vfs.write('graftstate', ''.join(nodelines)) |
|
3866 | repo.vfs.write('graftstate', ''.join(nodelines)) | |
3867 | raise error.Abort( |
|
3867 | raise error.Abort( | |
3868 | _("unresolved conflicts, can't continue"), |
|
3868 | _("unresolved conflicts, can't continue"), | |
3869 | hint=_('use hg resolve and hg graft --continue')) |
|
3869 | hint=_('use hg resolve and hg graft --continue')) | |
3870 | else: |
|
3870 | else: | |
3871 | cont = False |
|
3871 | cont = False | |
3872 |
|
3872 | |||
3873 | # commit |
|
3873 | # commit | |
3874 | node = repo.commit(text=message, user=user, |
|
3874 | node = repo.commit(text=message, user=user, | |
3875 | date=date, extra=extra, editor=editor) |
|
3875 | date=date, extra=extra, editor=editor) | |
3876 | if node is None: |
|
3876 | if node is None: | |
3877 | ui.warn( |
|
3877 | ui.warn( | |
3878 | _('note: graft of %d:%s created no changes to commit\n') % |
|
3878 | _('note: graft of %d:%s created no changes to commit\n') % | |
3879 | (ctx.rev(), ctx)) |
|
3879 | (ctx.rev(), ctx)) | |
3880 | finally: |
|
3880 | finally: | |
3881 | wlock.release() |
|
3881 | wlock.release() | |
3882 |
|
3882 | |||
3883 | # remove state when we complete successfully |
|
3883 | # remove state when we complete successfully | |
3884 | if not opts.get('dry_run'): |
|
3884 | if not opts.get('dry_run'): | |
3885 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
|
3885 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
3886 |
|
3886 | |||
3887 | return 0 |
|
3887 | return 0 | |
3888 |
|
3888 | |||
3889 | @command('grep', |
|
3889 | @command('grep', | |
3890 | [('0', 'print0', None, _('end fields with NUL')), |
|
3890 | [('0', 'print0', None, _('end fields with NUL')), | |
3891 | ('', 'all', None, _('print all revisions that match')), |
|
3891 | ('', 'all', None, _('print all revisions that match')), | |
3892 | ('a', 'text', None, _('treat all files as text')), |
|
3892 | ('a', 'text', None, _('treat all files as text')), | |
3893 | ('f', 'follow', None, |
|
3893 | ('f', 'follow', None, | |
3894 | _('follow changeset history,' |
|
3894 | _('follow changeset history,' | |
3895 | ' or file history across copies and renames')), |
|
3895 | ' or file history across copies and renames')), | |
3896 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
3896 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
3897 | ('l', 'files-with-matches', None, |
|
3897 | ('l', 'files-with-matches', None, | |
3898 | _('print only filenames and revisions that match')), |
|
3898 | _('print only filenames and revisions that match')), | |
3899 | ('n', 'line-number', None, _('print matching line numbers')), |
|
3899 | ('n', 'line-number', None, _('print matching line numbers')), | |
3900 | ('r', 'rev', [], |
|
3900 | ('r', 'rev', [], | |
3901 | _('only search files changed within revision range'), _('REV')), |
|
3901 | _('only search files changed within revision range'), _('REV')), | |
3902 | ('u', 'user', None, _('list the author (long with -v)')), |
|
3902 | ('u', 'user', None, _('list the author (long with -v)')), | |
3903 | ('d', 'date', None, _('list the date (short with -q)')), |
|
3903 | ('d', 'date', None, _('list the date (short with -q)')), | |
3904 | ] + walkopts, |
|
3904 | ] + walkopts, | |
3905 | _('[OPTION]... PATTERN [FILE]...'), |
|
3905 | _('[OPTION]... PATTERN [FILE]...'), | |
3906 | inferrepo=True) |
|
3906 | inferrepo=True) | |
3907 | def grep(ui, repo, pattern, *pats, **opts): |
|
3907 | def grep(ui, repo, pattern, *pats, **opts): | |
3908 | """search for a pattern in specified files and revisions |
|
3908 | """search for a pattern in specified files and revisions | |
3909 |
|
3909 | |||
3910 | Search revisions of files for a regular expression. |
|
3910 | Search revisions of files for a regular expression. | |
3911 |
|
3911 | |||
3912 | This command behaves differently than Unix grep. It only accepts |
|
3912 | This command behaves differently than Unix grep. It only accepts | |
3913 | Python/Perl regexps. It searches repository history, not the |
|
3913 | Python/Perl regexps. It searches repository history, not the | |
3914 | working directory. It always prints the revision number in which a |
|
3914 | working directory. It always prints the revision number in which a | |
3915 | match appears. |
|
3915 | match appears. | |
3916 |
|
3916 | |||
3917 | By default, grep only prints output for the first revision of a |
|
3917 | By default, grep only prints output for the first revision of a | |
3918 | file in which it finds a match. To get it to print every revision |
|
3918 | file in which it finds a match. To get it to print every revision | |
3919 | that contains a change in match status ("-" for a match that |
|
3919 | that contains a change in match status ("-" for a match that | |
3920 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
3920 | becomes a non-match, or "+" for a non-match that becomes a match), | |
3921 | use the --all flag. |
|
3921 | use the --all flag. | |
3922 |
|
3922 | |||
3923 | Returns 0 if a match is found, 1 otherwise. |
|
3923 | Returns 0 if a match is found, 1 otherwise. | |
3924 | """ |
|
3924 | """ | |
3925 | reflags = re.M |
|
3925 | reflags = re.M | |
3926 | if opts.get('ignore_case'): |
|
3926 | if opts.get('ignore_case'): | |
3927 | reflags |= re.I |
|
3927 | reflags |= re.I | |
3928 | try: |
|
3928 | try: | |
3929 | regexp = util.re.compile(pattern, reflags) |
|
3929 | regexp = util.re.compile(pattern, reflags) | |
3930 | except re.error as inst: |
|
3930 | except re.error as inst: | |
3931 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
3931 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) | |
3932 | return 1 |
|
3932 | return 1 | |
3933 | sep, eol = ':', '\n' |
|
3933 | sep, eol = ':', '\n' | |
3934 | if opts.get('print0'): |
|
3934 | if opts.get('print0'): | |
3935 | sep = eol = '\0' |
|
3935 | sep = eol = '\0' | |
3936 |
|
3936 | |||
3937 | getfile = util.lrucachefunc(repo.file) |
|
3937 | getfile = util.lrucachefunc(repo.file) | |
3938 |
|
3938 | |||
3939 | def matchlines(body): |
|
3939 | def matchlines(body): | |
3940 | begin = 0 |
|
3940 | begin = 0 | |
3941 | linenum = 0 |
|
3941 | linenum = 0 | |
3942 | while begin < len(body): |
|
3942 | while begin < len(body): | |
3943 | match = regexp.search(body, begin) |
|
3943 | match = regexp.search(body, begin) | |
3944 | if not match: |
|
3944 | if not match: | |
3945 | break |
|
3945 | break | |
3946 | mstart, mend = match.span() |
|
3946 | mstart, mend = match.span() | |
3947 | linenum += body.count('\n', begin, mstart) + 1 |
|
3947 | linenum += body.count('\n', begin, mstart) + 1 | |
3948 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
3948 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
3949 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
3949 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
3950 | lend = begin - 1 |
|
3950 | lend = begin - 1 | |
3951 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
3951 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
3952 |
|
3952 | |||
3953 | class linestate(object): |
|
3953 | class linestate(object): | |
3954 | def __init__(self, line, linenum, colstart, colend): |
|
3954 | def __init__(self, line, linenum, colstart, colend): | |
3955 | self.line = line |
|
3955 | self.line = line | |
3956 | self.linenum = linenum |
|
3956 | self.linenum = linenum | |
3957 | self.colstart = colstart |
|
3957 | self.colstart = colstart | |
3958 | self.colend = colend |
|
3958 | self.colend = colend | |
3959 |
|
3959 | |||
3960 | def __hash__(self): |
|
3960 | def __hash__(self): | |
3961 | return hash((self.linenum, self.line)) |
|
3961 | return hash((self.linenum, self.line)) | |
3962 |
|
3962 | |||
3963 | def __eq__(self, other): |
|
3963 | def __eq__(self, other): | |
3964 | return self.line == other.line |
|
3964 | return self.line == other.line | |
3965 |
|
3965 | |||
3966 | def __iter__(self): |
|
3966 | def __iter__(self): | |
3967 | yield (self.line[:self.colstart], '') |
|
3967 | yield (self.line[:self.colstart], '') | |
3968 | yield (self.line[self.colstart:self.colend], 'grep.match') |
|
3968 | yield (self.line[self.colstart:self.colend], 'grep.match') | |
3969 | rest = self.line[self.colend:] |
|
3969 | rest = self.line[self.colend:] | |
3970 | while rest != '': |
|
3970 | while rest != '': | |
3971 | match = regexp.search(rest) |
|
3971 | match = regexp.search(rest) | |
3972 | if not match: |
|
3972 | if not match: | |
3973 | yield (rest, '') |
|
3973 | yield (rest, '') | |
3974 | break |
|
3974 | break | |
3975 | mstart, mend = match.span() |
|
3975 | mstart, mend = match.span() | |
3976 | yield (rest[:mstart], '') |
|
3976 | yield (rest[:mstart], '') | |
3977 | yield (rest[mstart:mend], 'grep.match') |
|
3977 | yield (rest[mstart:mend], 'grep.match') | |
3978 | rest = rest[mend:] |
|
3978 | rest = rest[mend:] | |
3979 |
|
3979 | |||
3980 | matches = {} |
|
3980 | matches = {} | |
3981 | copies = {} |
|
3981 | copies = {} | |
3982 | def grepbody(fn, rev, body): |
|
3982 | def grepbody(fn, rev, body): | |
3983 | matches[rev].setdefault(fn, []) |
|
3983 | matches[rev].setdefault(fn, []) | |
3984 | m = matches[rev][fn] |
|
3984 | m = matches[rev][fn] | |
3985 | for lnum, cstart, cend, line in matchlines(body): |
|
3985 | for lnum, cstart, cend, line in matchlines(body): | |
3986 | s = linestate(line, lnum, cstart, cend) |
|
3986 | s = linestate(line, lnum, cstart, cend) | |
3987 | m.append(s) |
|
3987 | m.append(s) | |
3988 |
|
3988 | |||
3989 | def difflinestates(a, b): |
|
3989 | def difflinestates(a, b): | |
3990 | sm = difflib.SequenceMatcher(None, a, b) |
|
3990 | sm = difflib.SequenceMatcher(None, a, b) | |
3991 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
3991 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
3992 | if tag == 'insert': |
|
3992 | if tag == 'insert': | |
3993 | for i in xrange(blo, bhi): |
|
3993 | for i in xrange(blo, bhi): | |
3994 | yield ('+', b[i]) |
|
3994 | yield ('+', b[i]) | |
3995 | elif tag == 'delete': |
|
3995 | elif tag == 'delete': | |
3996 | for i in xrange(alo, ahi): |
|
3996 | for i in xrange(alo, ahi): | |
3997 | yield ('-', a[i]) |
|
3997 | yield ('-', a[i]) | |
3998 | elif tag == 'replace': |
|
3998 | elif tag == 'replace': | |
3999 | for i in xrange(alo, ahi): |
|
3999 | for i in xrange(alo, ahi): | |
4000 | yield ('-', a[i]) |
|
4000 | yield ('-', a[i]) | |
4001 | for i in xrange(blo, bhi): |
|
4001 | for i in xrange(blo, bhi): | |
4002 | yield ('+', b[i]) |
|
4002 | yield ('+', b[i]) | |
4003 |
|
4003 | |||
4004 | def display(fn, ctx, pstates, states): |
|
4004 | def display(fn, ctx, pstates, states): | |
4005 | rev = ctx.rev() |
|
4005 | rev = ctx.rev() | |
4006 | if ui.quiet: |
|
4006 | if ui.quiet: | |
4007 | datefunc = util.shortdate |
|
4007 | datefunc = util.shortdate | |
4008 | else: |
|
4008 | else: | |
4009 | datefunc = util.datestr |
|
4009 | datefunc = util.datestr | |
4010 | found = False |
|
4010 | found = False | |
4011 | @util.cachefunc |
|
4011 | @util.cachefunc | |
4012 | def binary(): |
|
4012 | def binary(): | |
4013 | flog = getfile(fn) |
|
4013 | flog = getfile(fn) | |
4014 | return util.binary(flog.read(ctx.filenode(fn))) |
|
4014 | return util.binary(flog.read(ctx.filenode(fn))) | |
4015 |
|
4015 | |||
4016 | if opts.get('all'): |
|
4016 | if opts.get('all'): | |
4017 | iter = difflinestates(pstates, states) |
|
4017 | iter = difflinestates(pstates, states) | |
4018 | else: |
|
4018 | else: | |
4019 | iter = [('', l) for l in states] |
|
4019 | iter = [('', l) for l in states] | |
4020 | for change, l in iter: |
|
4020 | for change, l in iter: | |
4021 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] |
|
4021 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] | |
4022 |
|
4022 | |||
4023 | if opts.get('line_number'): |
|
4023 | if opts.get('line_number'): | |
4024 | cols.append((str(l.linenum), 'grep.linenumber')) |
|
4024 | cols.append((str(l.linenum), 'grep.linenumber')) | |
4025 | if opts.get('all'): |
|
4025 | if opts.get('all'): | |
4026 | cols.append((change, 'grep.change')) |
|
4026 | cols.append((change, 'grep.change')) | |
4027 | if opts.get('user'): |
|
4027 | if opts.get('user'): | |
4028 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) |
|
4028 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) | |
4029 | if opts.get('date'): |
|
4029 | if opts.get('date'): | |
4030 | cols.append((datefunc(ctx.date()), 'grep.date')) |
|
4030 | cols.append((datefunc(ctx.date()), 'grep.date')) | |
4031 | for col, label in cols[:-1]: |
|
4031 | for col, label in cols[:-1]: | |
4032 | ui.write(col, label=label) |
|
4032 | ui.write(col, label=label) | |
4033 | ui.write(sep, label='grep.sep') |
|
4033 | ui.write(sep, label='grep.sep') | |
4034 | ui.write(cols[-1][0], label=cols[-1][1]) |
|
4034 | ui.write(cols[-1][0], label=cols[-1][1]) | |
4035 | if not opts.get('files_with_matches'): |
|
4035 | if not opts.get('files_with_matches'): | |
4036 | ui.write(sep, label='grep.sep') |
|
4036 | ui.write(sep, label='grep.sep') | |
4037 | if not opts.get('text') and binary(): |
|
4037 | if not opts.get('text') and binary(): | |
4038 | ui.write(" Binary file matches") |
|
4038 | ui.write(" Binary file matches") | |
4039 | else: |
|
4039 | else: | |
4040 | for s, label in l: |
|
4040 | for s, label in l: | |
4041 | ui.write(s, label=label) |
|
4041 | ui.write(s, label=label) | |
4042 | ui.write(eol) |
|
4042 | ui.write(eol) | |
4043 | found = True |
|
4043 | found = True | |
4044 | if opts.get('files_with_matches'): |
|
4044 | if opts.get('files_with_matches'): | |
4045 | break |
|
4045 | break | |
4046 | return found |
|
4046 | return found | |
4047 |
|
4047 | |||
4048 | skip = {} |
|
4048 | skip = {} | |
4049 | revfiles = {} |
|
4049 | revfiles = {} | |
4050 | matchfn = scmutil.match(repo[None], pats, opts) |
|
4050 | matchfn = scmutil.match(repo[None], pats, opts) | |
4051 | found = False |
|
4051 | found = False | |
4052 | follow = opts.get('follow') |
|
4052 | follow = opts.get('follow') | |
4053 |
|
4053 | |||
4054 | def prep(ctx, fns): |
|
4054 | def prep(ctx, fns): | |
4055 | rev = ctx.rev() |
|
4055 | rev = ctx.rev() | |
4056 | pctx = ctx.p1() |
|
4056 | pctx = ctx.p1() | |
4057 | parent = pctx.rev() |
|
4057 | parent = pctx.rev() | |
4058 | matches.setdefault(rev, {}) |
|
4058 | matches.setdefault(rev, {}) | |
4059 | matches.setdefault(parent, {}) |
|
4059 | matches.setdefault(parent, {}) | |
4060 | files = revfiles.setdefault(rev, []) |
|
4060 | files = revfiles.setdefault(rev, []) | |
4061 | for fn in fns: |
|
4061 | for fn in fns: | |
4062 | flog = getfile(fn) |
|
4062 | flog = getfile(fn) | |
4063 | try: |
|
4063 | try: | |
4064 | fnode = ctx.filenode(fn) |
|
4064 | fnode = ctx.filenode(fn) | |
4065 | except error.LookupError: |
|
4065 | except error.LookupError: | |
4066 | continue |
|
4066 | continue | |
4067 |
|
4067 | |||
4068 | copied = flog.renamed(fnode) |
|
4068 | copied = flog.renamed(fnode) | |
4069 | copy = follow and copied and copied[0] |
|
4069 | copy = follow and copied and copied[0] | |
4070 | if copy: |
|
4070 | if copy: | |
4071 | copies.setdefault(rev, {})[fn] = copy |
|
4071 | copies.setdefault(rev, {})[fn] = copy | |
4072 | if fn in skip: |
|
4072 | if fn in skip: | |
4073 | if copy: |
|
4073 | if copy: | |
4074 | skip[copy] = True |
|
4074 | skip[copy] = True | |
4075 | continue |
|
4075 | continue | |
4076 | files.append(fn) |
|
4076 | files.append(fn) | |
4077 |
|
4077 | |||
4078 | if fn not in matches[rev]: |
|
4078 | if fn not in matches[rev]: | |
4079 | grepbody(fn, rev, flog.read(fnode)) |
|
4079 | grepbody(fn, rev, flog.read(fnode)) | |
4080 |
|
4080 | |||
4081 | pfn = copy or fn |
|
4081 | pfn = copy or fn | |
4082 | if pfn not in matches[parent]: |
|
4082 | if pfn not in matches[parent]: | |
4083 | try: |
|
4083 | try: | |
4084 | fnode = pctx.filenode(pfn) |
|
4084 | fnode = pctx.filenode(pfn) | |
4085 | grepbody(pfn, parent, flog.read(fnode)) |
|
4085 | grepbody(pfn, parent, flog.read(fnode)) | |
4086 | except error.LookupError: |
|
4086 | except error.LookupError: | |
4087 | pass |
|
4087 | pass | |
4088 |
|
4088 | |||
4089 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
4089 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
4090 | rev = ctx.rev() |
|
4090 | rev = ctx.rev() | |
4091 | parent = ctx.p1().rev() |
|
4091 | parent = ctx.p1().rev() | |
4092 | for fn in sorted(revfiles.get(rev, [])): |
|
4092 | for fn in sorted(revfiles.get(rev, [])): | |
4093 | states = matches[rev][fn] |
|
4093 | states = matches[rev][fn] | |
4094 | copy = copies.get(rev, {}).get(fn) |
|
4094 | copy = copies.get(rev, {}).get(fn) | |
4095 | if fn in skip: |
|
4095 | if fn in skip: | |
4096 | if copy: |
|
4096 | if copy: | |
4097 | skip[copy] = True |
|
4097 | skip[copy] = True | |
4098 | continue |
|
4098 | continue | |
4099 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
4099 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
4100 | if pstates or states: |
|
4100 | if pstates or states: | |
4101 | r = display(fn, ctx, pstates, states) |
|
4101 | r = display(fn, ctx, pstates, states) | |
4102 | found = found or r |
|
4102 | found = found or r | |
4103 | if r and not opts.get('all'): |
|
4103 | if r and not opts.get('all'): | |
4104 | skip[fn] = True |
|
4104 | skip[fn] = True | |
4105 | if copy: |
|
4105 | if copy: | |
4106 | skip[copy] = True |
|
4106 | skip[copy] = True | |
4107 | del matches[rev] |
|
4107 | del matches[rev] | |
4108 | del revfiles[rev] |
|
4108 | del revfiles[rev] | |
4109 |
|
4109 | |||
4110 | return not found |
|
4110 | return not found | |
4111 |
|
4111 | |||
4112 | @command('heads', |
|
4112 | @command('heads', | |
4113 | [('r', 'rev', '', |
|
4113 | [('r', 'rev', '', | |
4114 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
4114 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
4115 | ('t', 'topo', False, _('show topological heads only')), |
|
4115 | ('t', 'topo', False, _('show topological heads only')), | |
4116 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
4116 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
4117 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
4117 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
4118 | ] + templateopts, |
|
4118 | ] + templateopts, | |
4119 | _('[-ct] [-r STARTREV] [REV]...')) |
|
4119 | _('[-ct] [-r STARTREV] [REV]...')) | |
4120 | def heads(ui, repo, *branchrevs, **opts): |
|
4120 | def heads(ui, repo, *branchrevs, **opts): | |
4121 | """show branch heads |
|
4121 | """show branch heads | |
4122 |
|
4122 | |||
4123 | With no arguments, show all open branch heads in the repository. |
|
4123 | With no arguments, show all open branch heads in the repository. | |
4124 | Branch heads are changesets that have no descendants on the |
|
4124 | Branch heads are changesets that have no descendants on the | |
4125 | same branch. They are where development generally takes place and |
|
4125 | same branch. They are where development generally takes place and | |
4126 | are the usual targets for update and merge operations. |
|
4126 | are the usual targets for update and merge operations. | |
4127 |
|
4127 | |||
4128 | If one or more REVs are given, only open branch heads on the |
|
4128 | If one or more REVs are given, only open branch heads on the | |
4129 | branches associated with the specified changesets are shown. This |
|
4129 | branches associated with the specified changesets are shown. This | |
4130 | means that you can use :hg:`heads .` to see the heads on the |
|
4130 | means that you can use :hg:`heads .` to see the heads on the | |
4131 | currently checked-out branch. |
|
4131 | currently checked-out branch. | |
4132 |
|
4132 | |||
4133 | If -c/--closed is specified, also show branch heads marked closed |
|
4133 | If -c/--closed is specified, also show branch heads marked closed | |
4134 | (see :hg:`commit --close-branch`). |
|
4134 | (see :hg:`commit --close-branch`). | |
4135 |
|
4135 | |||
4136 | If STARTREV is specified, only those heads that are descendants of |
|
4136 | If STARTREV is specified, only those heads that are descendants of | |
4137 | STARTREV will be displayed. |
|
4137 | STARTREV will be displayed. | |
4138 |
|
4138 | |||
4139 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
4139 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
4140 | topological heads (changesets with no children) will be shown. |
|
4140 | topological heads (changesets with no children) will be shown. | |
4141 |
|
4141 | |||
4142 | Returns 0 if matching heads are found, 1 if not. |
|
4142 | Returns 0 if matching heads are found, 1 if not. | |
4143 | """ |
|
4143 | """ | |
4144 |
|
4144 | |||
4145 | start = None |
|
4145 | start = None | |
4146 | if 'rev' in opts: |
|
4146 | if 'rev' in opts: | |
4147 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
4147 | start = scmutil.revsingle(repo, opts['rev'], None).node() | |
4148 |
|
4148 | |||
4149 | if opts.get('topo'): |
|
4149 | if opts.get('topo'): | |
4150 | heads = [repo[h] for h in repo.heads(start)] |
|
4150 | heads = [repo[h] for h in repo.heads(start)] | |
4151 | else: |
|
4151 | else: | |
4152 | heads = [] |
|
4152 | heads = [] | |
4153 | for branch in repo.branchmap(): |
|
4153 | for branch in repo.branchmap(): | |
4154 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
4154 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
4155 | heads = [repo[h] for h in heads] |
|
4155 | heads = [repo[h] for h in heads] | |
4156 |
|
4156 | |||
4157 | if branchrevs: |
|
4157 | if branchrevs: | |
4158 | branches = set(repo[br].branch() for br in branchrevs) |
|
4158 | branches = set(repo[br].branch() for br in branchrevs) | |
4159 | heads = [h for h in heads if h.branch() in branches] |
|
4159 | heads = [h for h in heads if h.branch() in branches] | |
4160 |
|
4160 | |||
4161 | if opts.get('active') and branchrevs: |
|
4161 | if opts.get('active') and branchrevs: | |
4162 | dagheads = repo.heads(start) |
|
4162 | dagheads = repo.heads(start) | |
4163 | heads = [h for h in heads if h.node() in dagheads] |
|
4163 | heads = [h for h in heads if h.node() in dagheads] | |
4164 |
|
4164 | |||
4165 | if branchrevs: |
|
4165 | if branchrevs: | |
4166 | haveheads = set(h.branch() for h in heads) |
|
4166 | haveheads = set(h.branch() for h in heads) | |
4167 | if branches - haveheads: |
|
4167 | if branches - haveheads: | |
4168 | headless = ', '.join(b for b in branches - haveheads) |
|
4168 | headless = ', '.join(b for b in branches - haveheads) | |
4169 | msg = _('no open branch heads found on branches %s') |
|
4169 | msg = _('no open branch heads found on branches %s') | |
4170 | if opts.get('rev'): |
|
4170 | if opts.get('rev'): | |
4171 | msg += _(' (started at %s)') % opts['rev'] |
|
4171 | msg += _(' (started at %s)') % opts['rev'] | |
4172 | ui.warn((msg + '\n') % headless) |
|
4172 | ui.warn((msg + '\n') % headless) | |
4173 |
|
4173 | |||
4174 | if not heads: |
|
4174 | if not heads: | |
4175 | return 1 |
|
4175 | return 1 | |
4176 |
|
4176 | |||
4177 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
4177 | heads = sorted(heads, key=lambda x: -x.rev()) | |
4178 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4178 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4179 | for ctx in heads: |
|
4179 | for ctx in heads: | |
4180 | displayer.show(ctx) |
|
4180 | displayer.show(ctx) | |
4181 | displayer.close() |
|
4181 | displayer.close() | |
4182 |
|
4182 | |||
4183 | @command('help', |
|
4183 | @command('help', | |
4184 | [('e', 'extension', None, _('show only help for extensions')), |
|
4184 | [('e', 'extension', None, _('show only help for extensions')), | |
4185 | ('c', 'command', None, _('show only help for commands')), |
|
4185 | ('c', 'command', None, _('show only help for commands')), | |
4186 | ('k', 'keyword', None, _('show topics matching keyword')), |
|
4186 | ('k', 'keyword', None, _('show topics matching keyword')), | |
4187 | ], |
|
4187 | ], | |
4188 | _('[-eck] [TOPIC]'), |
|
4188 | _('[-eck] [TOPIC]'), | |
4189 | norepo=True) |
|
4189 | norepo=True) | |
4190 | def help_(ui, name=None, **opts): |
|
4190 | def help_(ui, name=None, **opts): | |
4191 | """show help for a given topic or a help overview |
|
4191 | """show help for a given topic or a help overview | |
4192 |
|
4192 | |||
4193 | With no arguments, print a list of commands with short help messages. |
|
4193 | With no arguments, print a list of commands with short help messages. | |
4194 |
|
4194 | |||
4195 | Given a topic, extension, or command name, print help for that |
|
4195 | Given a topic, extension, or command name, print help for that | |
4196 | topic. |
|
4196 | topic. | |
4197 |
|
4197 | |||
4198 | Returns 0 if successful. |
|
4198 | Returns 0 if successful. | |
4199 | """ |
|
4199 | """ | |
4200 |
|
4200 | |||
4201 | textwidth = min(ui.termwidth(), 80) - 2 |
|
4201 | textwidth = min(ui.termwidth(), 80) - 2 | |
4202 |
|
4202 | |||
4203 | keep = [] |
|
4203 | keep = [] | |
4204 | if ui.verbose: |
|
4204 | if ui.verbose: | |
4205 | keep.append('verbose') |
|
4205 | keep.append('verbose') | |
4206 | if sys.platform.startswith('win'): |
|
4206 | if sys.platform.startswith('win'): | |
4207 | keep.append('windows') |
|
4207 | keep.append('windows') | |
4208 | elif sys.platform == 'OpenVMS': |
|
4208 | elif sys.platform == 'OpenVMS': | |
4209 | keep.append('vms') |
|
4209 | keep.append('vms') | |
4210 | elif sys.platform == 'plan9': |
|
4210 | elif sys.platform == 'plan9': | |
4211 | keep.append('plan9') |
|
4211 | keep.append('plan9') | |
4212 | else: |
|
4212 | else: | |
4213 | keep.append('unix') |
|
4213 | keep.append('unix') | |
4214 | keep.append(sys.platform.lower()) |
|
4214 | keep.append(sys.platform.lower()) | |
4215 |
|
4215 | |||
4216 | section = None |
|
4216 | section = None | |
4217 | if name and '.' in name: |
|
4217 | if name and '.' in name: | |
4218 | name, section = name.split('.', 1) |
|
4218 | name, section = name.split('.', 1) | |
4219 | section = section.lower() |
|
4219 | section = section.lower() | |
4220 |
|
4220 | |||
4221 | text = help.help_(ui, name, **opts) |
|
4221 | text = help.help_(ui, name, **opts) | |
4222 |
|
4222 | |||
4223 | formatted, pruned = minirst.format(text, textwidth, keep=keep, |
|
4223 | formatted, pruned = minirst.format(text, textwidth, keep=keep, | |
4224 | section=section) |
|
4224 | section=section) | |
4225 |
|
4225 | |||
4226 | # We could have been given a weird ".foo" section without a name |
|
4226 | # We could have been given a weird ".foo" section without a name | |
4227 | # to look for, or we could have simply failed to found "foo.bar" |
|
4227 | # to look for, or we could have simply failed to found "foo.bar" | |
4228 | # because bar isn't a section of foo |
|
4228 | # because bar isn't a section of foo | |
4229 | if section and not (formatted and name): |
|
4229 | if section and not (formatted and name): | |
4230 | raise error.Abort(_("help section not found")) |
|
4230 | raise error.Abort(_("help section not found")) | |
4231 |
|
4231 | |||
4232 | if 'verbose' in pruned: |
|
4232 | if 'verbose' in pruned: | |
4233 | keep.append('omitted') |
|
4233 | keep.append('omitted') | |
4234 | else: |
|
4234 | else: | |
4235 | keep.append('notomitted') |
|
4235 | keep.append('notomitted') | |
4236 | formatted, pruned = minirst.format(text, textwidth, keep=keep, |
|
4236 | formatted, pruned = minirst.format(text, textwidth, keep=keep, | |
4237 | section=section) |
|
4237 | section=section) | |
4238 | ui.write(formatted) |
|
4238 | ui.write(formatted) | |
4239 |
|
4239 | |||
4240 |
|
4240 | |||
4241 | @command('identify|id', |
|
4241 | @command('identify|id', | |
4242 | [('r', 'rev', '', |
|
4242 | [('r', 'rev', '', | |
4243 | _('identify the specified revision'), _('REV')), |
|
4243 | _('identify the specified revision'), _('REV')), | |
4244 | ('n', 'num', None, _('show local revision number')), |
|
4244 | ('n', 'num', None, _('show local revision number')), | |
4245 | ('i', 'id', None, _('show global revision id')), |
|
4245 | ('i', 'id', None, _('show global revision id')), | |
4246 | ('b', 'branch', None, _('show branch')), |
|
4246 | ('b', 'branch', None, _('show branch')), | |
4247 | ('t', 'tags', None, _('show tags')), |
|
4247 | ('t', 'tags', None, _('show tags')), | |
4248 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
4248 | ('B', 'bookmarks', None, _('show bookmarks')), | |
4249 | ] + remoteopts, |
|
4249 | ] + remoteopts, | |
4250 | _('[-nibtB] [-r REV] [SOURCE]'), |
|
4250 | _('[-nibtB] [-r REV] [SOURCE]'), | |
4251 | optionalrepo=True) |
|
4251 | optionalrepo=True) | |
4252 | def identify(ui, repo, source=None, rev=None, |
|
4252 | def identify(ui, repo, source=None, rev=None, | |
4253 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
4253 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
4254 | """identify the working directory or specified revision |
|
4254 | """identify the working directory or specified revision | |
4255 |
|
4255 | |||
4256 | Print a summary identifying the repository state at REV using one or |
|
4256 | Print a summary identifying the repository state at REV using one or | |
4257 | two parent hash identifiers, followed by a "+" if the working |
|
4257 | two parent hash identifiers, followed by a "+" if the working | |
4258 | directory has uncommitted changes, the branch name (if not default), |
|
4258 | directory has uncommitted changes, the branch name (if not default), | |
4259 | a list of tags, and a list of bookmarks. |
|
4259 | a list of tags, and a list of bookmarks. | |
4260 |
|
4260 | |||
4261 | When REV is not given, print a summary of the current state of the |
|
4261 | When REV is not given, print a summary of the current state of the | |
4262 | repository. |
|
4262 | repository. | |
4263 |
|
4263 | |||
4264 | Specifying a path to a repository root or Mercurial bundle will |
|
4264 | Specifying a path to a repository root or Mercurial bundle will | |
4265 | cause lookup to operate on that repository/bundle. |
|
4265 | cause lookup to operate on that repository/bundle. | |
4266 |
|
4266 | |||
4267 | .. container:: verbose |
|
4267 | .. container:: verbose | |
4268 |
|
4268 | |||
4269 | Examples: |
|
4269 | Examples: | |
4270 |
|
4270 | |||
4271 | - generate a build identifier for the working directory:: |
|
4271 | - generate a build identifier for the working directory:: | |
4272 |
|
4272 | |||
4273 | hg id --id > build-id.dat |
|
4273 | hg id --id > build-id.dat | |
4274 |
|
4274 | |||
4275 | - find the revision corresponding to a tag:: |
|
4275 | - find the revision corresponding to a tag:: | |
4276 |
|
4276 | |||
4277 | hg id -n -r 1.3 |
|
4277 | hg id -n -r 1.3 | |
4278 |
|
4278 | |||
4279 | - check the most recent revision of a remote repository:: |
|
4279 | - check the most recent revision of a remote repository:: | |
4280 |
|
4280 | |||
4281 | hg id -r tip http://selenic.com/hg/ |
|
4281 | hg id -r tip http://selenic.com/hg/ | |
4282 |
|
4282 | |||
4283 | See :hg:`log` for generating more information about specific revisions, |
|
4283 | See :hg:`log` for generating more information about specific revisions, | |
4284 | including full hash identifiers. |
|
4284 | including full hash identifiers. | |
4285 |
|
4285 | |||
4286 | Returns 0 if successful. |
|
4286 | Returns 0 if successful. | |
4287 | """ |
|
4287 | """ | |
4288 |
|
4288 | |||
4289 | if not repo and not source: |
|
4289 | if not repo and not source: | |
4290 | raise error.Abort(_("there is no Mercurial repository here " |
|
4290 | raise error.Abort(_("there is no Mercurial repository here " | |
4291 | "(.hg not found)")) |
|
4291 | "(.hg not found)")) | |
4292 |
|
4292 | |||
4293 | if ui.debugflag: |
|
4293 | if ui.debugflag: | |
4294 | hexfunc = hex |
|
4294 | hexfunc = hex | |
4295 | else: |
|
4295 | else: | |
4296 | hexfunc = short |
|
4296 | hexfunc = short | |
4297 | default = not (num or id or branch or tags or bookmarks) |
|
4297 | default = not (num or id or branch or tags or bookmarks) | |
4298 | output = [] |
|
4298 | output = [] | |
4299 | revs = [] |
|
4299 | revs = [] | |
4300 |
|
4300 | |||
4301 | if source: |
|
4301 | if source: | |
4302 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
4302 | source, branches = hg.parseurl(ui.expandpath(source)) | |
4303 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
4303 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
4304 | repo = peer.local() |
|
4304 | repo = peer.local() | |
4305 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
4305 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
4306 |
|
4306 | |||
4307 | if not repo: |
|
4307 | if not repo: | |
4308 | if num or branch or tags: |
|
4308 | if num or branch or tags: | |
4309 | raise error.Abort( |
|
4309 | raise error.Abort( | |
4310 | _("can't query remote revision number, branch, or tags")) |
|
4310 | _("can't query remote revision number, branch, or tags")) | |
4311 | if not rev and revs: |
|
4311 | if not rev and revs: | |
4312 | rev = revs[0] |
|
4312 | rev = revs[0] | |
4313 | if not rev: |
|
4313 | if not rev: | |
4314 | rev = "tip" |
|
4314 | rev = "tip" | |
4315 |
|
4315 | |||
4316 | remoterev = peer.lookup(rev) |
|
4316 | remoterev = peer.lookup(rev) | |
4317 | if default or id: |
|
4317 | if default or id: | |
4318 | output = [hexfunc(remoterev)] |
|
4318 | output = [hexfunc(remoterev)] | |
4319 |
|
4319 | |||
4320 | def getbms(): |
|
4320 | def getbms(): | |
4321 | bms = [] |
|
4321 | bms = [] | |
4322 |
|
4322 | |||
4323 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
4323 | if 'bookmarks' in peer.listkeys('namespaces'): | |
4324 | hexremoterev = hex(remoterev) |
|
4324 | hexremoterev = hex(remoterev) | |
4325 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
4325 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
4326 | if bmr == hexremoterev] |
|
4326 | if bmr == hexremoterev] | |
4327 |
|
4327 | |||
4328 | return sorted(bms) |
|
4328 | return sorted(bms) | |
4329 |
|
4329 | |||
4330 | if bookmarks: |
|
4330 | if bookmarks: | |
4331 | output.extend(getbms()) |
|
4331 | output.extend(getbms()) | |
4332 | elif default and not ui.quiet: |
|
4332 | elif default and not ui.quiet: | |
4333 | # multiple bookmarks for a single parent separated by '/' |
|
4333 | # multiple bookmarks for a single parent separated by '/' | |
4334 | bm = '/'.join(getbms()) |
|
4334 | bm = '/'.join(getbms()) | |
4335 | if bm: |
|
4335 | if bm: | |
4336 | output.append(bm) |
|
4336 | output.append(bm) | |
4337 | else: |
|
4337 | else: | |
4338 | ctx = scmutil.revsingle(repo, rev, None) |
|
4338 | ctx = scmutil.revsingle(repo, rev, None) | |
4339 |
|
4339 | |||
4340 | if ctx.rev() is None: |
|
4340 | if ctx.rev() is None: | |
4341 | ctx = repo[None] |
|
4341 | ctx = repo[None] | |
4342 | parents = ctx.parents() |
|
4342 | parents = ctx.parents() | |
4343 | taglist = [] |
|
4343 | taglist = [] | |
4344 | for p in parents: |
|
4344 | for p in parents: | |
4345 | taglist.extend(p.tags()) |
|
4345 | taglist.extend(p.tags()) | |
4346 |
|
4346 | |||
4347 | changed = "" |
|
4347 | changed = "" | |
4348 | if default or id or num: |
|
4348 | if default or id or num: | |
4349 | if (any(repo.status()) |
|
4349 | if (any(repo.status()) | |
4350 | or any(ctx.sub(s).dirty() for s in ctx.substate)): |
|
4350 | or any(ctx.sub(s).dirty() for s in ctx.substate)): | |
4351 | changed = '+' |
|
4351 | changed = '+' | |
4352 | if default or id: |
|
4352 | if default or id: | |
4353 | output = ["%s%s" % |
|
4353 | output = ["%s%s" % | |
4354 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
|
4354 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] | |
4355 | if num: |
|
4355 | if num: | |
4356 | output.append("%s%s" % |
|
4356 | output.append("%s%s" % | |
4357 | ('+'.join([str(p.rev()) for p in parents]), changed)) |
|
4357 | ('+'.join([str(p.rev()) for p in parents]), changed)) | |
4358 | else: |
|
4358 | else: | |
4359 | if default or id: |
|
4359 | if default or id: | |
4360 | output = [hexfunc(ctx.node())] |
|
4360 | output = [hexfunc(ctx.node())] | |
4361 | if num: |
|
4361 | if num: | |
4362 | output.append(str(ctx.rev())) |
|
4362 | output.append(str(ctx.rev())) | |
4363 | taglist = ctx.tags() |
|
4363 | taglist = ctx.tags() | |
4364 |
|
4364 | |||
4365 | if default and not ui.quiet: |
|
4365 | if default and not ui.quiet: | |
4366 | b = ctx.branch() |
|
4366 | b = ctx.branch() | |
4367 | if b != 'default': |
|
4367 | if b != 'default': | |
4368 | output.append("(%s)" % b) |
|
4368 | output.append("(%s)" % b) | |
4369 |
|
4369 | |||
4370 | # multiple tags for a single parent separated by '/' |
|
4370 | # multiple tags for a single parent separated by '/' | |
4371 | t = '/'.join(taglist) |
|
4371 | t = '/'.join(taglist) | |
4372 | if t: |
|
4372 | if t: | |
4373 | output.append(t) |
|
4373 | output.append(t) | |
4374 |
|
4374 | |||
4375 | # multiple bookmarks for a single parent separated by '/' |
|
4375 | # multiple bookmarks for a single parent separated by '/' | |
4376 | bm = '/'.join(ctx.bookmarks()) |
|
4376 | bm = '/'.join(ctx.bookmarks()) | |
4377 | if bm: |
|
4377 | if bm: | |
4378 | output.append(bm) |
|
4378 | output.append(bm) | |
4379 | else: |
|
4379 | else: | |
4380 | if branch: |
|
4380 | if branch: | |
4381 | output.append(ctx.branch()) |
|
4381 | output.append(ctx.branch()) | |
4382 |
|
4382 | |||
4383 | if tags: |
|
4383 | if tags: | |
4384 | output.extend(taglist) |
|
4384 | output.extend(taglist) | |
4385 |
|
4385 | |||
4386 | if bookmarks: |
|
4386 | if bookmarks: | |
4387 | output.extend(ctx.bookmarks()) |
|
4387 | output.extend(ctx.bookmarks()) | |
4388 |
|
4388 | |||
4389 | ui.write("%s\n" % ' '.join(output)) |
|
4389 | ui.write("%s\n" % ' '.join(output)) | |
4390 |
|
4390 | |||
4391 | @command('import|patch', |
|
4391 | @command('import|patch', | |
4392 | [('p', 'strip', 1, |
|
4392 | [('p', 'strip', 1, | |
4393 | _('directory strip option for patch. This has the same ' |
|
4393 | _('directory strip option for patch. This has the same ' | |
4394 | 'meaning as the corresponding patch option'), _('NUM')), |
|
4394 | 'meaning as the corresponding patch option'), _('NUM')), | |
4395 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
4395 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
4396 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
4396 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
4397 | ('f', 'force', None, |
|
4397 | ('f', 'force', None, | |
4398 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
4398 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
4399 | ('', 'no-commit', None, |
|
4399 | ('', 'no-commit', None, | |
4400 | _("don't commit, just update the working directory")), |
|
4400 | _("don't commit, just update the working directory")), | |
4401 | ('', 'bypass', None, |
|
4401 | ('', 'bypass', None, | |
4402 | _("apply patch without touching the working directory")), |
|
4402 | _("apply patch without touching the working directory")), | |
4403 | ('', 'partial', None, |
|
4403 | ('', 'partial', None, | |
4404 | _('commit even if some hunks fail')), |
|
4404 | _('commit even if some hunks fail')), | |
4405 | ('', 'exact', None, |
|
4405 | ('', 'exact', None, | |
4406 | _('apply patch to the nodes from which it was generated')), |
|
4406 | _('apply patch to the nodes from which it was generated')), | |
4407 | ('', 'prefix', '', |
|
4407 | ('', 'prefix', '', | |
4408 | _('apply patch to subdirectory'), _('DIR')), |
|
4408 | _('apply patch to subdirectory'), _('DIR')), | |
4409 | ('', 'import-branch', None, |
|
4409 | ('', 'import-branch', None, | |
4410 | _('use any branch information in patch (implied by --exact)'))] + |
|
4410 | _('use any branch information in patch (implied by --exact)'))] + | |
4411 | commitopts + commitopts2 + similarityopts, |
|
4411 | commitopts + commitopts2 + similarityopts, | |
4412 | _('[OPTION]... PATCH...')) |
|
4412 | _('[OPTION]... PATCH...')) | |
4413 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
4413 | def import_(ui, repo, patch1=None, *patches, **opts): | |
4414 | """import an ordered set of patches |
|
4414 | """import an ordered set of patches | |
4415 |
|
4415 | |||
4416 | Import a list of patches and commit them individually (unless |
|
4416 | Import a list of patches and commit them individually (unless | |
4417 | --no-commit is specified). |
|
4417 | --no-commit is specified). | |
4418 |
|
4418 | |||
4419 | Because import first applies changes to the working directory, |
|
4419 | Because import first applies changes to the working directory, | |
4420 | import will abort if there are outstanding changes. |
|
4420 | import will abort if there are outstanding changes. | |
4421 |
|
4421 | |||
4422 | You can import a patch straight from a mail message. Even patches |
|
4422 | You can import a patch straight from a mail message. Even patches | |
4423 | as attachments work (to use the body part, it must have type |
|
4423 | as attachments work (to use the body part, it must have type | |
4424 | text/plain or text/x-patch). From and Subject headers of email |
|
4424 | text/plain or text/x-patch). From and Subject headers of email | |
4425 | message are used as default committer and commit message. All |
|
4425 | message are used as default committer and commit message. All | |
4426 | text/plain body parts before first diff are added to commit |
|
4426 | text/plain body parts before first diff are added to commit | |
4427 | message. |
|
4427 | message. | |
4428 |
|
4428 | |||
4429 | If the imported patch was generated by :hg:`export`, user and |
|
4429 | If the imported patch was generated by :hg:`export`, user and | |
4430 | description from patch override values from message headers and |
|
4430 | description from patch override values from message headers and | |
4431 | body. Values given on command line with -m/--message and -u/--user |
|
4431 | body. Values given on command line with -m/--message and -u/--user | |
4432 | override these. |
|
4432 | override these. | |
4433 |
|
4433 | |||
4434 | If --exact is specified, import will set the working directory to |
|
4434 | If --exact is specified, import will set the working directory to | |
4435 | the parent of each patch before applying it, and will abort if the |
|
4435 | the parent of each patch before applying it, and will abort if the | |
4436 | resulting changeset has a different ID than the one recorded in |
|
4436 | resulting changeset has a different ID than the one recorded in | |
4437 | the patch. This may happen due to character set problems or other |
|
4437 | the patch. This may happen due to character set problems or other | |
4438 | deficiencies in the text patch format. |
|
4438 | deficiencies in the text patch format. | |
4439 |
|
4439 | |||
4440 | Use --bypass to apply and commit patches directly to the |
|
4440 | Use --bypass to apply and commit patches directly to the | |
4441 | repository, not touching the working directory. Without --exact, |
|
4441 | repository, not touching the working directory. Without --exact, | |
4442 | patches will be applied on top of the working directory parent |
|
4442 | patches will be applied on top of the working directory parent | |
4443 | revision. |
|
4443 | revision. | |
4444 |
|
4444 | |||
4445 | With -s/--similarity, hg will attempt to discover renames and |
|
4445 | With -s/--similarity, hg will attempt to discover renames and | |
4446 | copies in the patch in the same way as :hg:`addremove`. |
|
4446 | copies in the patch in the same way as :hg:`addremove`. | |
4447 |
|
4447 | |||
4448 | Use --partial to ensure a changeset will be created from the patch |
|
4448 | Use --partial to ensure a changeset will be created from the patch | |
4449 | even if some hunks fail to apply. Hunks that fail to apply will be |
|
4449 | even if some hunks fail to apply. Hunks that fail to apply will be | |
4450 | written to a <target-file>.rej file. Conflicts can then be resolved |
|
4450 | written to a <target-file>.rej file. Conflicts can then be resolved | |
4451 | by hand before :hg:`commit --amend` is run to update the created |
|
4451 | by hand before :hg:`commit --amend` is run to update the created | |
4452 | changeset. This flag exists to let people import patches that |
|
4452 | changeset. This flag exists to let people import patches that | |
4453 | partially apply without losing the associated metadata (author, |
|
4453 | partially apply without losing the associated metadata (author, | |
4454 | date, description, ...). Note that when none of the hunk applies |
|
4454 | date, description, ...). Note that when none of the hunk applies | |
4455 | cleanly, :hg:`import --partial` will create an empty changeset, |
|
4455 | cleanly, :hg:`import --partial` will create an empty changeset, | |
4456 | importing only the patch metadata. |
|
4456 | importing only the patch metadata. | |
4457 |
|
4457 | |||
4458 | It is possible to use external patch programs to perform the patch |
|
4458 | It is possible to use external patch programs to perform the patch | |
4459 | by setting the ``ui.patch`` configuration option. For the default |
|
4459 | by setting the ``ui.patch`` configuration option. For the default | |
4460 | internal tool, the fuzz can also be configured via ``patch.fuzz``. |
|
4460 | internal tool, the fuzz can also be configured via ``patch.fuzz``. | |
4461 | See :hg:`help config` for more information about configuration |
|
4461 | See :hg:`help config` for more information about configuration | |
4462 | files and how to use these options. |
|
4462 | files and how to use these options. | |
4463 |
|
4463 | |||
4464 | To read a patch from standard input, use "-" as the patch name. If |
|
4464 | To read a patch from standard input, use "-" as the patch name. If | |
4465 | a URL is specified, the patch will be downloaded from it. |
|
4465 | a URL is specified, the patch will be downloaded from it. | |
4466 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4466 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4467 |
|
4467 | |||
4468 | .. container:: verbose |
|
4468 | .. container:: verbose | |
4469 |
|
4469 | |||
4470 | Examples: |
|
4470 | Examples: | |
4471 |
|
4471 | |||
4472 | - import a traditional patch from a website and detect renames:: |
|
4472 | - import a traditional patch from a website and detect renames:: | |
4473 |
|
4473 | |||
4474 | hg import -s 80 http://example.com/bugfix.patch |
|
4474 | hg import -s 80 http://example.com/bugfix.patch | |
4475 |
|
4475 | |||
4476 | - import a changeset from an hgweb server:: |
|
4476 | - import a changeset from an hgweb server:: | |
4477 |
|
4477 | |||
4478 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa |
|
4478 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa | |
4479 |
|
4479 | |||
4480 | - import all the patches in an Unix-style mbox:: |
|
4480 | - import all the patches in an Unix-style mbox:: | |
4481 |
|
4481 | |||
4482 | hg import incoming-patches.mbox |
|
4482 | hg import incoming-patches.mbox | |
4483 |
|
4483 | |||
4484 | - attempt to exactly restore an exported changeset (not always |
|
4484 | - attempt to exactly restore an exported changeset (not always | |
4485 | possible):: |
|
4485 | possible):: | |
4486 |
|
4486 | |||
4487 | hg import --exact proposed-fix.patch |
|
4487 | hg import --exact proposed-fix.patch | |
4488 |
|
4488 | |||
4489 | - use an external tool to apply a patch which is too fuzzy for |
|
4489 | - use an external tool to apply a patch which is too fuzzy for | |
4490 | the default internal tool. |
|
4490 | the default internal tool. | |
4491 |
|
4491 | |||
4492 | hg import --config ui.patch="patch --merge" fuzzy.patch |
|
4492 | hg import --config ui.patch="patch --merge" fuzzy.patch | |
4493 |
|
4493 | |||
4494 | - change the default fuzzing from 2 to a less strict 7 |
|
4494 | - change the default fuzzing from 2 to a less strict 7 | |
4495 |
|
4495 | |||
4496 | hg import --config ui.fuzz=7 fuzz.patch |
|
4496 | hg import --config ui.fuzz=7 fuzz.patch | |
4497 |
|
4497 | |||
4498 | Returns 0 on success, 1 on partial success (see --partial). |
|
4498 | Returns 0 on success, 1 on partial success (see --partial). | |
4499 | """ |
|
4499 | """ | |
4500 |
|
4500 | |||
4501 | if not patch1: |
|
4501 | if not patch1: | |
4502 | raise error.Abort(_('need at least one patch to import')) |
|
4502 | raise error.Abort(_('need at least one patch to import')) | |
4503 |
|
4503 | |||
4504 | patches = (patch1,) + patches |
|
4504 | patches = (patch1,) + patches | |
4505 |
|
4505 | |||
4506 | date = opts.get('date') |
|
4506 | date = opts.get('date') | |
4507 | if date: |
|
4507 | if date: | |
4508 | opts['date'] = util.parsedate(date) |
|
4508 | opts['date'] = util.parsedate(date) | |
4509 |
|
4509 | |||
4510 | update = not opts.get('bypass') |
|
4510 | update = not opts.get('bypass') | |
4511 | if not update and opts.get('no_commit'): |
|
4511 | if not update and opts.get('no_commit'): | |
4512 | raise error.Abort(_('cannot use --no-commit with --bypass')) |
|
4512 | raise error.Abort(_('cannot use --no-commit with --bypass')) | |
4513 | try: |
|
4513 | try: | |
4514 | sim = float(opts.get('similarity') or 0) |
|
4514 | sim = float(opts.get('similarity') or 0) | |
4515 | except ValueError: |
|
4515 | except ValueError: | |
4516 | raise error.Abort(_('similarity must be a number')) |
|
4516 | raise error.Abort(_('similarity must be a number')) | |
4517 | if sim < 0 or sim > 100: |
|
4517 | if sim < 0 or sim > 100: | |
4518 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
4518 | raise error.Abort(_('similarity must be between 0 and 100')) | |
4519 | if sim and not update: |
|
4519 | if sim and not update: | |
4520 | raise error.Abort(_('cannot use --similarity with --bypass')) |
|
4520 | raise error.Abort(_('cannot use --similarity with --bypass')) | |
4521 | if opts.get('exact') and opts.get('edit'): |
|
4521 | if opts.get('exact') and opts.get('edit'): | |
4522 | raise error.Abort(_('cannot use --exact with --edit')) |
|
4522 | raise error.Abort(_('cannot use --exact with --edit')) | |
4523 | if opts.get('exact') and opts.get('prefix'): |
|
4523 | if opts.get('exact') and opts.get('prefix'): | |
4524 | raise error.Abort(_('cannot use --exact with --prefix')) |
|
4524 | raise error.Abort(_('cannot use --exact with --prefix')) | |
4525 |
|
4525 | |||
4526 | if update: |
|
4526 | if update: | |
4527 | cmdutil.checkunfinished(repo) |
|
4527 | cmdutil.checkunfinished(repo) | |
4528 | if (opts.get('exact') or not opts.get('force')) and update: |
|
4528 | if (opts.get('exact') or not opts.get('force')) and update: | |
4529 | cmdutil.bailifchanged(repo) |
|
4529 | cmdutil.bailifchanged(repo) | |
4530 |
|
4530 | |||
4531 | base = opts["base"] |
|
4531 | base = opts["base"] | |
4532 | wlock = dsguard = lock = tr = None |
|
4532 | wlock = dsguard = lock = tr = None | |
4533 | msgs = [] |
|
4533 | msgs = [] | |
4534 | ret = 0 |
|
4534 | ret = 0 | |
4535 |
|
4535 | |||
4536 |
|
4536 | |||
4537 | try: |
|
4537 | try: | |
4538 | try: |
|
4538 | try: | |
4539 | wlock = repo.wlock() |
|
4539 | wlock = repo.wlock() | |
4540 | if not opts.get('no_commit'): |
|
4540 | if not opts.get('no_commit'): | |
4541 | lock = repo.lock() |
|
4541 | lock = repo.lock() | |
4542 | tr = repo.transaction('import') |
|
4542 | tr = repo.transaction('import') | |
4543 | else: |
|
4543 | else: | |
4544 | dsguard = cmdutil.dirstateguard(repo, 'import') |
|
4544 | dsguard = cmdutil.dirstateguard(repo, 'import') | |
4545 | parents = repo.parents() |
|
4545 | parents = repo.parents() | |
4546 | for patchurl in patches: |
|
4546 | for patchurl in patches: | |
4547 | if patchurl == '-': |
|
4547 | if patchurl == '-': | |
4548 | ui.status(_('applying patch from stdin\n')) |
|
4548 | ui.status(_('applying patch from stdin\n')) | |
4549 | patchfile = ui.fin |
|
4549 | patchfile = ui.fin | |
4550 | patchurl = 'stdin' # for error message |
|
4550 | patchurl = 'stdin' # for error message | |
4551 | else: |
|
4551 | else: | |
4552 | patchurl = os.path.join(base, patchurl) |
|
4552 | patchurl = os.path.join(base, patchurl) | |
4553 | ui.status(_('applying %s\n') % patchurl) |
|
4553 | ui.status(_('applying %s\n') % patchurl) | |
4554 | patchfile = hg.openpath(ui, patchurl) |
|
4554 | patchfile = hg.openpath(ui, patchurl) | |
4555 |
|
4555 | |||
4556 | haspatch = False |
|
4556 | haspatch = False | |
4557 | for hunk in patch.split(patchfile): |
|
4557 | for hunk in patch.split(patchfile): | |
4558 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, |
|
4558 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, | |
4559 | parents, opts, |
|
4559 | parents, opts, | |
4560 | msgs, hg.clean) |
|
4560 | msgs, hg.clean) | |
4561 | if msg: |
|
4561 | if msg: | |
4562 | haspatch = True |
|
4562 | haspatch = True | |
4563 | ui.note(msg + '\n') |
|
4563 | ui.note(msg + '\n') | |
4564 | if update or opts.get('exact'): |
|
4564 | if update or opts.get('exact'): | |
4565 | parents = repo.parents() |
|
4565 | parents = repo.parents() | |
4566 | else: |
|
4566 | else: | |
4567 | parents = [repo[node]] |
|
4567 | parents = [repo[node]] | |
4568 | if rej: |
|
4568 | if rej: | |
4569 | ui.write_err(_("patch applied partially\n")) |
|
4569 | ui.write_err(_("patch applied partially\n")) | |
4570 | ui.write_err(_("(fix the .rej files and run " |
|
4570 | ui.write_err(_("(fix the .rej files and run " | |
4571 | "`hg commit --amend`)\n")) |
|
4571 | "`hg commit --amend`)\n")) | |
4572 | ret = 1 |
|
4572 | ret = 1 | |
4573 | break |
|
4573 | break | |
4574 |
|
4574 | |||
4575 | if not haspatch: |
|
4575 | if not haspatch: | |
4576 | raise error.Abort(_('%s: no diffs found') % patchurl) |
|
4576 | raise error.Abort(_('%s: no diffs found') % patchurl) | |
4577 |
|
4577 | |||
4578 | if tr: |
|
4578 | if tr: | |
4579 | tr.close() |
|
4579 | tr.close() | |
4580 | if msgs: |
|
4580 | if msgs: | |
4581 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
4581 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
4582 | if dsguard: |
|
4582 | if dsguard: | |
4583 | dsguard.close() |
|
4583 | dsguard.close() | |
4584 | return ret |
|
4584 | return ret | |
4585 | finally: |
|
4585 | finally: | |
4586 | # TODO: get rid of this meaningless try/finally enclosing. |
|
4586 | # TODO: get rid of this meaningless try/finally enclosing. | |
4587 | # this is kept only to reduce changes in a patch. |
|
4587 | # this is kept only to reduce changes in a patch. | |
4588 | pass |
|
4588 | pass | |
4589 | finally: |
|
4589 | finally: | |
4590 | if tr: |
|
4590 | if tr: | |
4591 | tr.release() |
|
4591 | tr.release() | |
4592 | release(lock, dsguard, wlock) |
|
4592 | release(lock, dsguard, wlock) | |
4593 |
|
4593 | |||
4594 | @command('incoming|in', |
|
4594 | @command('incoming|in', | |
4595 | [('f', 'force', None, |
|
4595 | [('f', 'force', None, | |
4596 | _('run even if remote repository is unrelated')), |
|
4596 | _('run even if remote repository is unrelated')), | |
4597 | ('n', 'newest-first', None, _('show newest record first')), |
|
4597 | ('n', 'newest-first', None, _('show newest record first')), | |
4598 | ('', 'bundle', '', |
|
4598 | ('', 'bundle', '', | |
4599 | _('file to store the bundles into'), _('FILE')), |
|
4599 | _('file to store the bundles into'), _('FILE')), | |
4600 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
4600 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
4601 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
4601 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
4602 | ('b', 'branch', [], |
|
4602 | ('b', 'branch', [], | |
4603 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
4603 | _('a specific branch you would like to pull'), _('BRANCH')), | |
4604 | ] + logopts + remoteopts + subrepoopts, |
|
4604 | ] + logopts + remoteopts + subrepoopts, | |
4605 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
4605 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
4606 | def incoming(ui, repo, source="default", **opts): |
|
4606 | def incoming(ui, repo, source="default", **opts): | |
4607 | """show new changesets found in source |
|
4607 | """show new changesets found in source | |
4608 |
|
4608 | |||
4609 | Show new changesets found in the specified path/URL or the default |
|
4609 | Show new changesets found in the specified path/URL or the default | |
4610 | pull location. These are the changesets that would have been pulled |
|
4610 | pull location. These are the changesets that would have been pulled | |
4611 | if a pull at the time you issued this command. |
|
4611 | if a pull at the time you issued this command. | |
4612 |
|
4612 | |||
4613 | See pull for valid source format details. |
|
4613 | See pull for valid source format details. | |
4614 |
|
4614 | |||
4615 | .. container:: verbose |
|
4615 | .. container:: verbose | |
4616 |
|
4616 | |||
4617 | With -B/--bookmarks, the result of bookmark comparison between |
|
4617 | With -B/--bookmarks, the result of bookmark comparison between | |
4618 | local and remote repositories is displayed. With -v/--verbose, |
|
4618 | local and remote repositories is displayed. With -v/--verbose, | |
4619 | status is also displayed for each bookmark like below:: |
|
4619 | status is also displayed for each bookmark like below:: | |
4620 |
|
4620 | |||
4621 | BM1 01234567890a added |
|
4621 | BM1 01234567890a added | |
4622 | BM2 1234567890ab advanced |
|
4622 | BM2 1234567890ab advanced | |
4623 | BM3 234567890abc diverged |
|
4623 | BM3 234567890abc diverged | |
4624 | BM4 34567890abcd changed |
|
4624 | BM4 34567890abcd changed | |
4625 |
|
4625 | |||
4626 | The action taken locally when pulling depends on the |
|
4626 | The action taken locally when pulling depends on the | |
4627 | status of each bookmark: |
|
4627 | status of each bookmark: | |
4628 |
|
4628 | |||
4629 | :``added``: pull will create it |
|
4629 | :``added``: pull will create it | |
4630 | :``advanced``: pull will update it |
|
4630 | :``advanced``: pull will update it | |
4631 | :``diverged``: pull will create a divergent bookmark |
|
4631 | :``diverged``: pull will create a divergent bookmark | |
4632 | :``changed``: result depends on remote changesets |
|
4632 | :``changed``: result depends on remote changesets | |
4633 |
|
4633 | |||
4634 | From the point of view of pulling behavior, bookmark |
|
4634 | From the point of view of pulling behavior, bookmark | |
4635 | existing only in the remote repository are treated as ``added``, |
|
4635 | existing only in the remote repository are treated as ``added``, | |
4636 | even if it is in fact locally deleted. |
|
4636 | even if it is in fact locally deleted. | |
4637 |
|
4637 | |||
4638 | .. container:: verbose |
|
4638 | .. container:: verbose | |
4639 |
|
4639 | |||
4640 | For remote repository, using --bundle avoids downloading the |
|
4640 | For remote repository, using --bundle avoids downloading the | |
4641 | changesets twice if the incoming is followed by a pull. |
|
4641 | changesets twice if the incoming is followed by a pull. | |
4642 |
|
4642 | |||
4643 | Examples: |
|
4643 | Examples: | |
4644 |
|
4644 | |||
4645 | - show incoming changes with patches and full description:: |
|
4645 | - show incoming changes with patches and full description:: | |
4646 |
|
4646 | |||
4647 | hg incoming -vp |
|
4647 | hg incoming -vp | |
4648 |
|
4648 | |||
4649 | - show incoming changes excluding merges, store a bundle:: |
|
4649 | - show incoming changes excluding merges, store a bundle:: | |
4650 |
|
4650 | |||
4651 | hg in -vpM --bundle incoming.hg |
|
4651 | hg in -vpM --bundle incoming.hg | |
4652 | hg pull incoming.hg |
|
4652 | hg pull incoming.hg | |
4653 |
|
4653 | |||
4654 | - briefly list changes inside a bundle:: |
|
4654 | - briefly list changes inside a bundle:: | |
4655 |
|
4655 | |||
4656 | hg in changes.hg -T "{desc|firstline}\\n" |
|
4656 | hg in changes.hg -T "{desc|firstline}\\n" | |
4657 |
|
4657 | |||
4658 | Returns 0 if there are incoming changes, 1 otherwise. |
|
4658 | Returns 0 if there are incoming changes, 1 otherwise. | |
4659 | """ |
|
4659 | """ | |
4660 | if opts.get('graph'): |
|
4660 | if opts.get('graph'): | |
4661 | cmdutil.checkunsupportedgraphflags([], opts) |
|
4661 | cmdutil.checkunsupportedgraphflags([], opts) | |
4662 | def display(other, chlist, displayer): |
|
4662 | def display(other, chlist, displayer): | |
4663 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
4663 | revdag = cmdutil.graphrevs(other, chlist, opts) | |
4664 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
4664 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
4665 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
4665 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
4666 | graphmod.asciiedges) |
|
4666 | graphmod.asciiedges) | |
4667 |
|
4667 | |||
4668 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
4668 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
4669 | return 0 |
|
4669 | return 0 | |
4670 |
|
4670 | |||
4671 | if opts.get('bundle') and opts.get('subrepos'): |
|
4671 | if opts.get('bundle') and opts.get('subrepos'): | |
4672 | raise error.Abort(_('cannot combine --bundle and --subrepos')) |
|
4672 | raise error.Abort(_('cannot combine --bundle and --subrepos')) | |
4673 |
|
4673 | |||
4674 | if opts.get('bookmarks'): |
|
4674 | if opts.get('bookmarks'): | |
4675 | source, branches = hg.parseurl(ui.expandpath(source), |
|
4675 | source, branches = hg.parseurl(ui.expandpath(source), | |
4676 | opts.get('branch')) |
|
4676 | opts.get('branch')) | |
4677 | other = hg.peer(repo, opts, source) |
|
4677 | other = hg.peer(repo, opts, source) | |
4678 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
4678 | if 'bookmarks' not in other.listkeys('namespaces'): | |
4679 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
4679 | ui.warn(_("remote doesn't support bookmarks\n")) | |
4680 | return 0 |
|
4680 | return 0 | |
4681 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
4681 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
4682 | return bookmarks.incoming(ui, repo, other) |
|
4682 | return bookmarks.incoming(ui, repo, other) | |
4683 |
|
4683 | |||
4684 | repo._subtoppath = ui.expandpath(source) |
|
4684 | repo._subtoppath = ui.expandpath(source) | |
4685 | try: |
|
4685 | try: | |
4686 | return hg.incoming(ui, repo, source, opts) |
|
4686 | return hg.incoming(ui, repo, source, opts) | |
4687 | finally: |
|
4687 | finally: | |
4688 | del repo._subtoppath |
|
4688 | del repo._subtoppath | |
4689 |
|
4689 | |||
4690 |
|
4690 | |||
4691 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), |
|
4691 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), | |
4692 | norepo=True) |
|
4692 | norepo=True) | |
4693 | def init(ui, dest=".", **opts): |
|
4693 | def init(ui, dest=".", **opts): | |
4694 | """create a new repository in the given directory |
|
4694 | """create a new repository in the given directory | |
4695 |
|
4695 | |||
4696 | Initialize a new repository in the given directory. If the given |
|
4696 | Initialize a new repository in the given directory. If the given | |
4697 | directory does not exist, it will be created. |
|
4697 | directory does not exist, it will be created. | |
4698 |
|
4698 | |||
4699 | If no directory is given, the current directory is used. |
|
4699 | If no directory is given, the current directory is used. | |
4700 |
|
4700 | |||
4701 | It is possible to specify an ``ssh://`` URL as the destination. |
|
4701 | It is possible to specify an ``ssh://`` URL as the destination. | |
4702 | See :hg:`help urls` for more information. |
|
4702 | See :hg:`help urls` for more information. | |
4703 |
|
4703 | |||
4704 | Returns 0 on success. |
|
4704 | Returns 0 on success. | |
4705 | """ |
|
4705 | """ | |
4706 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
4706 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
4707 |
|
4707 | |||
4708 | @command('locate', |
|
4708 | @command('locate', | |
4709 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
4709 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
4710 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
4710 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
4711 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
4711 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
4712 | ] + walkopts, |
|
4712 | ] + walkopts, | |
4713 | _('[OPTION]... [PATTERN]...')) |
|
4713 | _('[OPTION]... [PATTERN]...')) | |
4714 | def locate(ui, repo, *pats, **opts): |
|
4714 | def locate(ui, repo, *pats, **opts): | |
4715 | """locate files matching specific patterns (DEPRECATED) |
|
4715 | """locate files matching specific patterns (DEPRECATED) | |
4716 |
|
4716 | |||
4717 | Print files under Mercurial control in the working directory whose |
|
4717 | Print files under Mercurial control in the working directory whose | |
4718 | names match the given patterns. |
|
4718 | names match the given patterns. | |
4719 |
|
4719 | |||
4720 | By default, this command searches all directories in the working |
|
4720 | By default, this command searches all directories in the working | |
4721 | directory. To search just the current directory and its |
|
4721 | directory. To search just the current directory and its | |
4722 | subdirectories, use "--include .". |
|
4722 | subdirectories, use "--include .". | |
4723 |
|
4723 | |||
4724 | If no patterns are given to match, this command prints the names |
|
4724 | If no patterns are given to match, this command prints the names | |
4725 | of all files under Mercurial control in the working directory. |
|
4725 | of all files under Mercurial control in the working directory. | |
4726 |
|
4726 | |||
4727 | If you want to feed the output of this command into the "xargs" |
|
4727 | If you want to feed the output of this command into the "xargs" | |
4728 | command, use the -0 option to both this command and "xargs". This |
|
4728 | command, use the -0 option to both this command and "xargs". This | |
4729 | will avoid the problem of "xargs" treating single filenames that |
|
4729 | will avoid the problem of "xargs" treating single filenames that | |
4730 | contain whitespace as multiple filenames. |
|
4730 | contain whitespace as multiple filenames. | |
4731 |
|
4731 | |||
4732 | See :hg:`help files` for a more versatile command. |
|
4732 | See :hg:`help files` for a more versatile command. | |
4733 |
|
4733 | |||
4734 | Returns 0 if a match is found, 1 otherwise. |
|
4734 | Returns 0 if a match is found, 1 otherwise. | |
4735 | """ |
|
4735 | """ | |
4736 | if opts.get('print0'): |
|
4736 | if opts.get('print0'): | |
4737 | end = '\0' |
|
4737 | end = '\0' | |
4738 | else: |
|
4738 | else: | |
4739 | end = '\n' |
|
4739 | end = '\n' | |
4740 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
4740 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() | |
4741 |
|
4741 | |||
4742 | ret = 1 |
|
4742 | ret = 1 | |
4743 | ctx = repo[rev] |
|
4743 | ctx = repo[rev] | |
4744 | m = scmutil.match(ctx, pats, opts, default='relglob', |
|
4744 | m = scmutil.match(ctx, pats, opts, default='relglob', | |
4745 | badfn=lambda x, y: False) |
|
4745 | badfn=lambda x, y: False) | |
4746 |
|
4746 | |||
4747 | for abs in ctx.matches(m): |
|
4747 | for abs in ctx.matches(m): | |
4748 | if opts.get('fullpath'): |
|
4748 | if opts.get('fullpath'): | |
4749 | ui.write(repo.wjoin(abs), end) |
|
4749 | ui.write(repo.wjoin(abs), end) | |
4750 | else: |
|
4750 | else: | |
4751 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
4751 | ui.write(((pats and m.rel(abs)) or abs), end) | |
4752 | ret = 0 |
|
4752 | ret = 0 | |
4753 |
|
4753 | |||
4754 | return ret |
|
4754 | return ret | |
4755 |
|
4755 | |||
4756 | @command('^log|history', |
|
4756 | @command('^log|history', | |
4757 | [('f', 'follow', None, |
|
4757 | [('f', 'follow', None, | |
4758 | _('follow changeset history, or file history across copies and renames')), |
|
4758 | _('follow changeset history, or file history across copies and renames')), | |
4759 | ('', 'follow-first', None, |
|
4759 | ('', 'follow-first', None, | |
4760 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
4760 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
4761 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
4761 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
4762 | ('C', 'copies', None, _('show copied files')), |
|
4762 | ('C', 'copies', None, _('show copied files')), | |
4763 | ('k', 'keyword', [], |
|
4763 | ('k', 'keyword', [], | |
4764 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
4764 | _('do case-insensitive search for a given text'), _('TEXT')), | |
4765 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), |
|
4765 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), | |
4766 | ('', 'removed', None, _('include revisions where files were removed')), |
|
4766 | ('', 'removed', None, _('include revisions where files were removed')), | |
4767 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
4767 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
4768 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
4768 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
4769 | ('', 'only-branch', [], |
|
4769 | ('', 'only-branch', [], | |
4770 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
4770 | _('show only changesets within the given named branch (DEPRECATED)'), | |
4771 | _('BRANCH')), |
|
4771 | _('BRANCH')), | |
4772 | ('b', 'branch', [], |
|
4772 | ('b', 'branch', [], | |
4773 | _('show changesets within the given named branch'), _('BRANCH')), |
|
4773 | _('show changesets within the given named branch'), _('BRANCH')), | |
4774 | ('P', 'prune', [], |
|
4774 | ('P', 'prune', [], | |
4775 | _('do not display revision or any of its ancestors'), _('REV')), |
|
4775 | _('do not display revision or any of its ancestors'), _('REV')), | |
4776 | ] + logopts + walkopts, |
|
4776 | ] + logopts + walkopts, | |
4777 | _('[OPTION]... [FILE]'), |
|
4777 | _('[OPTION]... [FILE]'), | |
4778 | inferrepo=True) |
|
4778 | inferrepo=True) | |
4779 | def log(ui, repo, *pats, **opts): |
|
4779 | def log(ui, repo, *pats, **opts): | |
4780 | """show revision history of entire repository or files |
|
4780 | """show revision history of entire repository or files | |
4781 |
|
4781 | |||
4782 | Print the revision history of the specified files or the entire |
|
4782 | Print the revision history of the specified files or the entire | |
4783 | project. |
|
4783 | project. | |
4784 |
|
4784 | |||
4785 | If no revision range is specified, the default is ``tip:0`` unless |
|
4785 | If no revision range is specified, the default is ``tip:0`` unless | |
4786 | --follow is set, in which case the working directory parent is |
|
4786 | --follow is set, in which case the working directory parent is | |
4787 | used as the starting revision. |
|
4787 | used as the starting revision. | |
4788 |
|
4788 | |||
4789 | File history is shown without following rename or copy history of |
|
4789 | File history is shown without following rename or copy history of | |
4790 | files. Use -f/--follow with a filename to follow history across |
|
4790 | files. Use -f/--follow with a filename to follow history across | |
4791 | renames and copies. --follow without a filename will only show |
|
4791 | renames and copies. --follow without a filename will only show | |
4792 | ancestors or descendants of the starting revision. |
|
4792 | ancestors or descendants of the starting revision. | |
4793 |
|
4793 | |||
4794 | By default this command prints revision number and changeset id, |
|
4794 | By default this command prints revision number and changeset id, | |
4795 | tags, non-trivial parents, user, date and time, and a summary for |
|
4795 | tags, non-trivial parents, user, date and time, and a summary for | |
4796 | each commit. When the -v/--verbose switch is used, the list of |
|
4796 | each commit. When the -v/--verbose switch is used, the list of | |
4797 | changed files and full commit message are shown. |
|
4797 | changed files and full commit message are shown. | |
4798 |
|
4798 | |||
4799 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
4799 | With --graph the revisions are shown as an ASCII art DAG with the most | |
4800 | recent changeset at the top. |
|
4800 | recent changeset at the top. | |
4801 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, |
|
4801 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, | |
4802 | and '+' represents a fork where the changeset from the lines below is a |
|
4802 | and '+' represents a fork where the changeset from the lines below is a | |
4803 | parent of the 'o' merge on the same line. |
|
4803 | parent of the 'o' merge on the same line. | |
4804 |
|
4804 | |||
4805 | .. note:: |
|
4805 | .. note:: | |
4806 |
|
4806 | |||
4807 | log -p/--patch may generate unexpected diff output for merge |
|
4807 | log -p/--patch may generate unexpected diff output for merge | |
4808 | changesets, as it will only compare the merge changeset against |
|
4808 | changesets, as it will only compare the merge changeset against | |
4809 | its first parent. Also, only files different from BOTH parents |
|
4809 | its first parent. Also, only files different from BOTH parents | |
4810 | will appear in files:. |
|
4810 | will appear in files:. | |
4811 |
|
4811 | |||
4812 | .. note:: |
|
4812 | .. note:: | |
4813 |
|
4813 | |||
4814 | for performance reasons, log FILE may omit duplicate changes |
|
4814 | for performance reasons, log FILE may omit duplicate changes | |
4815 | made on branches and will not show removals or mode changes. To |
|
4815 | made on branches and will not show removals or mode changes. To | |
4816 | see all such changes, use the --removed switch. |
|
4816 | see all such changes, use the --removed switch. | |
4817 |
|
4817 | |||
4818 | .. container:: verbose |
|
4818 | .. container:: verbose | |
4819 |
|
4819 | |||
4820 | Some examples: |
|
4820 | Some examples: | |
4821 |
|
4821 | |||
4822 | - changesets with full descriptions and file lists:: |
|
4822 | - changesets with full descriptions and file lists:: | |
4823 |
|
4823 | |||
4824 | hg log -v |
|
4824 | hg log -v | |
4825 |
|
4825 | |||
4826 | - changesets ancestral to the working directory:: |
|
4826 | - changesets ancestral to the working directory:: | |
4827 |
|
4827 | |||
4828 | hg log -f |
|
4828 | hg log -f | |
4829 |
|
4829 | |||
4830 | - last 10 commits on the current branch:: |
|
4830 | - last 10 commits on the current branch:: | |
4831 |
|
4831 | |||
4832 | hg log -l 10 -b . |
|
4832 | hg log -l 10 -b . | |
4833 |
|
4833 | |||
4834 | - changesets showing all modifications of a file, including removals:: |
|
4834 | - changesets showing all modifications of a file, including removals:: | |
4835 |
|
4835 | |||
4836 | hg log --removed file.c |
|
4836 | hg log --removed file.c | |
4837 |
|
4837 | |||
4838 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
4838 | - all changesets that touch a directory, with diffs, excluding merges:: | |
4839 |
|
4839 | |||
4840 | hg log -Mp lib/ |
|
4840 | hg log -Mp lib/ | |
4841 |
|
4841 | |||
4842 | - all revision numbers that match a keyword:: |
|
4842 | - all revision numbers that match a keyword:: | |
4843 |
|
4843 | |||
4844 | hg log -k bug --template "{rev}\\n" |
|
4844 | hg log -k bug --template "{rev}\\n" | |
4845 |
|
4845 | |||
4846 | - the full hash identifier of the working directory parent:: |
|
4846 | - the full hash identifier of the working directory parent:: | |
4847 |
|
4847 | |||
4848 | hg log -r . --template "{node}\\n" |
|
4848 | hg log -r . --template "{node}\\n" | |
4849 |
|
4849 | |||
4850 | - list available log templates:: |
|
4850 | - list available log templates:: | |
4851 |
|
4851 | |||
4852 | hg log -T list |
|
4852 | hg log -T list | |
4853 |
|
4853 | |||
4854 | - check if a given changeset is included in a tagged release:: |
|
4854 | - check if a given changeset is included in a tagged release:: | |
4855 |
|
4855 | |||
4856 | hg log -r "a21ccf and ancestor(1.9)" |
|
4856 | hg log -r "a21ccf and ancestor(1.9)" | |
4857 |
|
4857 | |||
4858 | - find all changesets by some user in a date range:: |
|
4858 | - find all changesets by some user in a date range:: | |
4859 |
|
4859 | |||
4860 | hg log -k alice -d "may 2008 to jul 2008" |
|
4860 | hg log -k alice -d "may 2008 to jul 2008" | |
4861 |
|
4861 | |||
4862 | - summary of all changesets after the last tag:: |
|
4862 | - summary of all changesets after the last tag:: | |
4863 |
|
4863 | |||
4864 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
4864 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
4865 |
|
4865 | |||
4866 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4866 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4867 |
|
4867 | |||
4868 | See :hg:`help revisions` and :hg:`help revsets` for more about |
|
4868 | See :hg:`help revisions` and :hg:`help revsets` for more about | |
4869 | specifying revisions. |
|
4869 | specifying revisions. | |
4870 |
|
4870 | |||
4871 | See :hg:`help templates` for more about pre-packaged styles and |
|
4871 | See :hg:`help templates` for more about pre-packaged styles and | |
4872 | specifying custom templates. |
|
4872 | specifying custom templates. | |
4873 |
|
4873 | |||
4874 | Returns 0 on success. |
|
4874 | Returns 0 on success. | |
4875 |
|
4875 | |||
4876 | """ |
|
4876 | """ | |
4877 | if opts.get('follow') and opts.get('rev'): |
|
4877 | if opts.get('follow') and opts.get('rev'): | |
4878 | opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))] |
|
4878 | opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))] | |
4879 | del opts['follow'] |
|
4879 | del opts['follow'] | |
4880 |
|
4880 | |||
4881 | if opts.get('graph'): |
|
4881 | if opts.get('graph'): | |
4882 | return cmdutil.graphlog(ui, repo, *pats, **opts) |
|
4882 | return cmdutil.graphlog(ui, repo, *pats, **opts) | |
4883 |
|
4883 | |||
4884 | revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) |
|
4884 | revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) | |
4885 | limit = cmdutil.loglimit(opts) |
|
4885 | limit = cmdutil.loglimit(opts) | |
4886 | count = 0 |
|
4886 | count = 0 | |
4887 |
|
4887 | |||
4888 | getrenamed = None |
|
4888 | getrenamed = None | |
4889 | if opts.get('copies'): |
|
4889 | if opts.get('copies'): | |
4890 | endrev = None |
|
4890 | endrev = None | |
4891 | if opts.get('rev'): |
|
4891 | if opts.get('rev'): | |
4892 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
4892 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
4893 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
4893 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
4894 |
|
4894 | |||
4895 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
4895 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
4896 | for rev in revs: |
|
4896 | for rev in revs: | |
4897 | if count == limit: |
|
4897 | if count == limit: | |
4898 | break |
|
4898 | break | |
4899 | ctx = repo[rev] |
|
4899 | ctx = repo[rev] | |
4900 | copies = None |
|
4900 | copies = None | |
4901 | if getrenamed is not None and rev: |
|
4901 | if getrenamed is not None and rev: | |
4902 | copies = [] |
|
4902 | copies = [] | |
4903 | for fn in ctx.files(): |
|
4903 | for fn in ctx.files(): | |
4904 | rename = getrenamed(fn, rev) |
|
4904 | rename = getrenamed(fn, rev) | |
4905 | if rename: |
|
4905 | if rename: | |
4906 | copies.append((fn, rename[0])) |
|
4906 | copies.append((fn, rename[0])) | |
4907 | if filematcher: |
|
4907 | if filematcher: | |
4908 | revmatchfn = filematcher(ctx.rev()) |
|
4908 | revmatchfn = filematcher(ctx.rev()) | |
4909 | else: |
|
4909 | else: | |
4910 | revmatchfn = None |
|
4910 | revmatchfn = None | |
4911 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
4911 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
4912 | if displayer.flush(ctx): |
|
4912 | if displayer.flush(ctx): | |
4913 | count += 1 |
|
4913 | count += 1 | |
4914 |
|
4914 | |||
4915 | displayer.close() |
|
4915 | displayer.close() | |
4916 |
|
4916 | |||
4917 | @command('manifest', |
|
4917 | @command('manifest', | |
4918 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
4918 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
4919 | ('', 'all', False, _("list files from all revisions"))] |
|
4919 | ('', 'all', False, _("list files from all revisions"))] | |
4920 | + formatteropts, |
|
4920 | + formatteropts, | |
4921 | _('[-r REV]')) |
|
4921 | _('[-r REV]')) | |
4922 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
4922 | def manifest(ui, repo, node=None, rev=None, **opts): | |
4923 | """output the current or given revision of the project manifest |
|
4923 | """output the current or given revision of the project manifest | |
4924 |
|
4924 | |||
4925 | Print a list of version controlled files for the given revision. |
|
4925 | Print a list of version controlled files for the given revision. | |
4926 | If no revision is given, the first parent of the working directory |
|
4926 | If no revision is given, the first parent of the working directory | |
4927 | is used, or the null revision if no revision is checked out. |
|
4927 | is used, or the null revision if no revision is checked out. | |
4928 |
|
4928 | |||
4929 | With -v, print file permissions, symlink and executable bits. |
|
4929 | With -v, print file permissions, symlink and executable bits. | |
4930 | With --debug, print file revision hashes. |
|
4930 | With --debug, print file revision hashes. | |
4931 |
|
4931 | |||
4932 | If option --all is specified, the list of all files from all revisions |
|
4932 | If option --all is specified, the list of all files from all revisions | |
4933 | is printed. This includes deleted and renamed files. |
|
4933 | is printed. This includes deleted and renamed files. | |
4934 |
|
4934 | |||
4935 | Returns 0 on success. |
|
4935 | Returns 0 on success. | |
4936 | """ |
|
4936 | """ | |
4937 |
|
4937 | |||
4938 | fm = ui.formatter('manifest', opts) |
|
4938 | fm = ui.formatter('manifest', opts) | |
4939 |
|
4939 | |||
4940 | if opts.get('all'): |
|
4940 | if opts.get('all'): | |
4941 | if rev or node: |
|
4941 | if rev or node: | |
4942 | raise error.Abort(_("can't specify a revision with --all")) |
|
4942 | raise error.Abort(_("can't specify a revision with --all")) | |
4943 |
|
4943 | |||
4944 | res = [] |
|
4944 | res = [] | |
4945 | prefix = "data/" |
|
4945 | prefix = "data/" | |
4946 | suffix = ".i" |
|
4946 | suffix = ".i" | |
4947 | plen = len(prefix) |
|
4947 | plen = len(prefix) | |
4948 | slen = len(suffix) |
|
4948 | slen = len(suffix) | |
4949 | lock = repo.lock() |
|
4949 | lock = repo.lock() | |
4950 | try: |
|
4950 | try: | |
4951 | for fn, b, size in repo.store.datafiles(): |
|
4951 | for fn, b, size in repo.store.datafiles(): | |
4952 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
4952 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
4953 | res.append(fn[plen:-slen]) |
|
4953 | res.append(fn[plen:-slen]) | |
4954 | finally: |
|
4954 | finally: | |
4955 | lock.release() |
|
4955 | lock.release() | |
4956 | for f in res: |
|
4956 | for f in res: | |
4957 | fm.startitem() |
|
4957 | fm.startitem() | |
4958 | fm.write("path", '%s\n', f) |
|
4958 | fm.write("path", '%s\n', f) | |
4959 | fm.end() |
|
4959 | fm.end() | |
4960 | return |
|
4960 | return | |
4961 |
|
4961 | |||
4962 | if rev and node: |
|
4962 | if rev and node: | |
4963 | raise error.Abort(_("please specify just one revision")) |
|
4963 | raise error.Abort(_("please specify just one revision")) | |
4964 |
|
4964 | |||
4965 | if not node: |
|
4965 | if not node: | |
4966 | node = rev |
|
4966 | node = rev | |
4967 |
|
4967 | |||
4968 | char = {'l': '@', 'x': '*', '': ''} |
|
4968 | char = {'l': '@', 'x': '*', '': ''} | |
4969 | mode = {'l': '644', 'x': '755', '': '644'} |
|
4969 | mode = {'l': '644', 'x': '755', '': '644'} | |
4970 | ctx = scmutil.revsingle(repo, node) |
|
4970 | ctx = scmutil.revsingle(repo, node) | |
4971 | mf = ctx.manifest() |
|
4971 | mf = ctx.manifest() | |
4972 | for f in ctx: |
|
4972 | for f in ctx: | |
4973 | fm.startitem() |
|
4973 | fm.startitem() | |
4974 | fl = ctx[f].flags() |
|
4974 | fl = ctx[f].flags() | |
4975 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
4975 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
4976 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
4976 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
4977 | fm.write('path', '%s\n', f) |
|
4977 | fm.write('path', '%s\n', f) | |
4978 | fm.end() |
|
4978 | fm.end() | |
4979 |
|
4979 | |||
4980 | @command('^merge', |
|
4980 | @command('^merge', | |
4981 | [('f', 'force', None, |
|
4981 | [('f', 'force', None, | |
4982 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
4982 | _('force a merge including outstanding changes (DEPRECATED)')), | |
4983 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
4983 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
4984 | ('P', 'preview', None, |
|
4984 | ('P', 'preview', None, | |
4985 | _('review revisions to merge (no merge is performed)')) |
|
4985 | _('review revisions to merge (no merge is performed)')) | |
4986 | ] + mergetoolopts, |
|
4986 | ] + mergetoolopts, | |
4987 | _('[-P] [-f] [[-r] REV]')) |
|
4987 | _('[-P] [-f] [[-r] REV]')) | |
4988 | def merge(ui, repo, node=None, **opts): |
|
4988 | def merge(ui, repo, node=None, **opts): | |
4989 | """merge another revision into working directory |
|
4989 | """merge another revision into working directory | |
4990 |
|
4990 | |||
4991 | The current working directory is updated with all changes made in |
|
4991 | The current working directory is updated with all changes made in | |
4992 | the requested revision since the last common predecessor revision. |
|
4992 | the requested revision since the last common predecessor revision. | |
4993 |
|
4993 | |||
4994 | Files that changed between either parent are marked as changed for |
|
4994 | Files that changed between either parent are marked as changed for | |
4995 | the next commit and a commit must be performed before any further |
|
4995 | the next commit and a commit must be performed before any further | |
4996 | updates to the repository are allowed. The next commit will have |
|
4996 | updates to the repository are allowed. The next commit will have | |
4997 | two parents. |
|
4997 | two parents. | |
4998 |
|
4998 | |||
4999 | ``--tool`` can be used to specify the merge tool used for file |
|
4999 | ``--tool`` can be used to specify the merge tool used for file | |
5000 | merges. It overrides the HGMERGE environment variable and your |
|
5000 | merges. It overrides the HGMERGE environment variable and your | |
5001 | configuration files. See :hg:`help merge-tools` for options. |
|
5001 | configuration files. See :hg:`help merge-tools` for options. | |
5002 |
|
5002 | |||
5003 | If no revision is specified, the working directory's parent is a |
|
5003 | If no revision is specified, the working directory's parent is a | |
5004 | head revision, and the current branch contains exactly one other |
|
5004 | head revision, and the current branch contains exactly one other | |
5005 | head, the other head is merged with by default. Otherwise, an |
|
5005 | head, the other head is merged with by default. Otherwise, an | |
5006 | explicit revision with which to merge with must be provided. |
|
5006 | explicit revision with which to merge with must be provided. | |
5007 |
|
5007 | |||
5008 | :hg:`resolve` must be used to resolve unresolved files. |
|
5008 | :hg:`resolve` must be used to resolve unresolved files. | |
5009 |
|
5009 | |||
5010 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
5010 | To undo an uncommitted merge, use :hg:`update --clean .` which | |
5011 | will check out a clean copy of the original merge parent, losing |
|
5011 | will check out a clean copy of the original merge parent, losing | |
5012 | all changes. |
|
5012 | all changes. | |
5013 |
|
5013 | |||
5014 | Returns 0 on success, 1 if there are unresolved files. |
|
5014 | Returns 0 on success, 1 if there are unresolved files. | |
5015 | """ |
|
5015 | """ | |
5016 |
|
5016 | |||
5017 | if opts.get('rev') and node: |
|
5017 | if opts.get('rev') and node: | |
5018 | raise error.Abort(_("please specify just one revision")) |
|
5018 | raise error.Abort(_("please specify just one revision")) | |
5019 | if not node: |
|
5019 | if not node: | |
5020 | node = opts.get('rev') |
|
5020 | node = opts.get('rev') | |
5021 |
|
5021 | |||
5022 | if node: |
|
5022 | if node: | |
5023 | node = scmutil.revsingle(repo, node).node() |
|
5023 | node = scmutil.revsingle(repo, node).node() | |
5024 |
|
5024 | |||
5025 | if not node: |
|
5025 | if not node: | |
5026 | node = repo[destutil.destmerge(repo)].node() |
|
5026 | node = repo[destutil.destmerge(repo)].node() | |
5027 |
|
5027 | |||
5028 | if opts.get('preview'): |
|
5028 | if opts.get('preview'): | |
5029 | # find nodes that are ancestors of p2 but not of p1 |
|
5029 | # find nodes that are ancestors of p2 but not of p1 | |
5030 | p1 = repo.lookup('.') |
|
5030 | p1 = repo.lookup('.') | |
5031 | p2 = repo.lookup(node) |
|
5031 | p2 = repo.lookup(node) | |
5032 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
5032 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
5033 |
|
5033 | |||
5034 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5034 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5035 | for node in nodes: |
|
5035 | for node in nodes: | |
5036 | displayer.show(repo[node]) |
|
5036 | displayer.show(repo[node]) | |
5037 | displayer.close() |
|
5037 | displayer.close() | |
5038 | return 0 |
|
5038 | return 0 | |
5039 |
|
5039 | |||
5040 | try: |
|
5040 | try: | |
5041 | # ui.forcemerge is an internal variable, do not document |
|
5041 | # ui.forcemerge is an internal variable, do not document | |
5042 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
|
5042 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') | |
5043 | return hg.merge(repo, node, force=opts.get('force')) |
|
5043 | return hg.merge(repo, node, force=opts.get('force')) | |
5044 | finally: |
|
5044 | finally: | |
5045 | ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
5045 | ui.setconfig('ui', 'forcemerge', '', 'merge') | |
5046 |
|
5046 | |||
5047 | @command('outgoing|out', |
|
5047 | @command('outgoing|out', | |
5048 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
5048 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
5049 | ('r', 'rev', [], |
|
5049 | ('r', 'rev', [], | |
5050 | _('a changeset intended to be included in the destination'), _('REV')), |
|
5050 | _('a changeset intended to be included in the destination'), _('REV')), | |
5051 | ('n', 'newest-first', None, _('show newest record first')), |
|
5051 | ('n', 'newest-first', None, _('show newest record first')), | |
5052 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
5052 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
5053 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
5053 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
5054 | _('BRANCH')), |
|
5054 | _('BRANCH')), | |
5055 | ] + logopts + remoteopts + subrepoopts, |
|
5055 | ] + logopts + remoteopts + subrepoopts, | |
5056 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
5056 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
5057 | def outgoing(ui, repo, dest=None, **opts): |
|
5057 | def outgoing(ui, repo, dest=None, **opts): | |
5058 | """show changesets not found in the destination |
|
5058 | """show changesets not found in the destination | |
5059 |
|
5059 | |||
5060 | Show changesets not found in the specified destination repository |
|
5060 | Show changesets not found in the specified destination repository | |
5061 | or the default push location. These are the changesets that would |
|
5061 | or the default push location. These are the changesets that would | |
5062 | be pushed if a push was requested. |
|
5062 | be pushed if a push was requested. | |
5063 |
|
5063 | |||
5064 | See pull for details of valid destination formats. |
|
5064 | See pull for details of valid destination formats. | |
5065 |
|
5065 | |||
5066 | .. container:: verbose |
|
5066 | .. container:: verbose | |
5067 |
|
5067 | |||
5068 | With -B/--bookmarks, the result of bookmark comparison between |
|
5068 | With -B/--bookmarks, the result of bookmark comparison between | |
5069 | local and remote repositories is displayed. With -v/--verbose, |
|
5069 | local and remote repositories is displayed. With -v/--verbose, | |
5070 | status is also displayed for each bookmark like below:: |
|
5070 | status is also displayed for each bookmark like below:: | |
5071 |
|
5071 | |||
5072 | BM1 01234567890a added |
|
5072 | BM1 01234567890a added | |
5073 | BM2 deleted |
|
5073 | BM2 deleted | |
5074 | BM3 234567890abc advanced |
|
5074 | BM3 234567890abc advanced | |
5075 | BM4 34567890abcd diverged |
|
5075 | BM4 34567890abcd diverged | |
5076 | BM5 4567890abcde changed |
|
5076 | BM5 4567890abcde changed | |
5077 |
|
5077 | |||
5078 | The action taken when pushing depends on the |
|
5078 | The action taken when pushing depends on the | |
5079 | status of each bookmark: |
|
5079 | status of each bookmark: | |
5080 |
|
5080 | |||
5081 | :``added``: push with ``-B`` will create it |
|
5081 | :``added``: push with ``-B`` will create it | |
5082 | :``deleted``: push with ``-B`` will delete it |
|
5082 | :``deleted``: push with ``-B`` will delete it | |
5083 | :``advanced``: push will update it |
|
5083 | :``advanced``: push will update it | |
5084 | :``diverged``: push with ``-B`` will update it |
|
5084 | :``diverged``: push with ``-B`` will update it | |
5085 | :``changed``: push with ``-B`` will update it |
|
5085 | :``changed``: push with ``-B`` will update it | |
5086 |
|
5086 | |||
5087 | From the point of view of pushing behavior, bookmarks |
|
5087 | From the point of view of pushing behavior, bookmarks | |
5088 | existing only in the remote repository are treated as |
|
5088 | existing only in the remote repository are treated as | |
5089 | ``deleted``, even if it is in fact added remotely. |
|
5089 | ``deleted``, even if it is in fact added remotely. | |
5090 |
|
5090 | |||
5091 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
5091 | Returns 0 if there are outgoing changes, 1 otherwise. | |
5092 | """ |
|
5092 | """ | |
5093 | if opts.get('graph'): |
|
5093 | if opts.get('graph'): | |
5094 | cmdutil.checkunsupportedgraphflags([], opts) |
|
5094 | cmdutil.checkunsupportedgraphflags([], opts) | |
5095 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
5095 | o, other = hg._outgoing(ui, repo, dest, opts) | |
5096 | if not o: |
|
5096 | if not o: | |
5097 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
5097 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
5098 | return |
|
5098 | return | |
5099 |
|
5099 | |||
5100 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
5100 | revdag = cmdutil.graphrevs(repo, o, opts) | |
5101 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
5101 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
5102 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
5102 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
5103 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
5103 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
5104 | graphmod.asciiedges) |
|
5104 | graphmod.asciiedges) | |
5105 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
5105 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
5106 | return 0 |
|
5106 | return 0 | |
5107 |
|
5107 | |||
5108 | if opts.get('bookmarks'): |
|
5108 | if opts.get('bookmarks'): | |
5109 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
5109 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
5110 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
5110 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
5111 | other = hg.peer(repo, opts, dest) |
|
5111 | other = hg.peer(repo, opts, dest) | |
5112 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
5112 | if 'bookmarks' not in other.listkeys('namespaces'): | |
5113 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
5113 | ui.warn(_("remote doesn't support bookmarks\n")) | |
5114 | return 0 |
|
5114 | return 0 | |
5115 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
5115 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
5116 | return bookmarks.outgoing(ui, repo, other) |
|
5116 | return bookmarks.outgoing(ui, repo, other) | |
5117 |
|
5117 | |||
5118 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
5118 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
5119 | try: |
|
5119 | try: | |
5120 | return hg.outgoing(ui, repo, dest, opts) |
|
5120 | return hg.outgoing(ui, repo, dest, opts) | |
5121 | finally: |
|
5121 | finally: | |
5122 | del repo._subtoppath |
|
5122 | del repo._subtoppath | |
5123 |
|
5123 | |||
5124 | @command('parents', |
|
5124 | @command('parents', | |
5125 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
5125 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
5126 | ] + templateopts, |
|
5126 | ] + templateopts, | |
5127 | _('[-r REV] [FILE]'), |
|
5127 | _('[-r REV] [FILE]'), | |
5128 | inferrepo=True) |
|
5128 | inferrepo=True) | |
5129 | def parents(ui, repo, file_=None, **opts): |
|
5129 | def parents(ui, repo, file_=None, **opts): | |
5130 | """show the parents of the working directory or revision (DEPRECATED) |
|
5130 | """show the parents of the working directory or revision (DEPRECATED) | |
5131 |
|
5131 | |||
5132 | Print the working directory's parent revisions. If a revision is |
|
5132 | Print the working directory's parent revisions. If a revision is | |
5133 | given via -r/--rev, the parent of that revision will be printed. |
|
5133 | given via -r/--rev, the parent of that revision will be printed. | |
5134 | If a file argument is given, the revision in which the file was |
|
5134 | If a file argument is given, the revision in which the file was | |
5135 | last changed (before the working directory revision or the |
|
5135 | last changed (before the working directory revision or the | |
5136 | argument to --rev if given) is printed. |
|
5136 | argument to --rev if given) is printed. | |
5137 |
|
5137 | |||
5138 | See :hg:`summary` and :hg:`help revsets` for related information. |
|
5138 | See :hg:`summary` and :hg:`help revsets` for related information. | |
5139 |
|
5139 | |||
5140 | Returns 0 on success. |
|
5140 | Returns 0 on success. | |
5141 | """ |
|
5141 | """ | |
5142 |
|
5142 | |||
5143 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
5143 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
5144 |
|
5144 | |||
5145 | if file_: |
|
5145 | if file_: | |
5146 | m = scmutil.match(ctx, (file_,), opts) |
|
5146 | m = scmutil.match(ctx, (file_,), opts) | |
5147 | if m.anypats() or len(m.files()) != 1: |
|
5147 | if m.anypats() or len(m.files()) != 1: | |
5148 | raise error.Abort(_('can only specify an explicit filename')) |
|
5148 | raise error.Abort(_('can only specify an explicit filename')) | |
5149 | file_ = m.files()[0] |
|
5149 | file_ = m.files()[0] | |
5150 | filenodes = [] |
|
5150 | filenodes = [] | |
5151 | for cp in ctx.parents(): |
|
5151 | for cp in ctx.parents(): | |
5152 | if not cp: |
|
5152 | if not cp: | |
5153 | continue |
|
5153 | continue | |
5154 | try: |
|
5154 | try: | |
5155 | filenodes.append(cp.filenode(file_)) |
|
5155 | filenodes.append(cp.filenode(file_)) | |
5156 | except error.LookupError: |
|
5156 | except error.LookupError: | |
5157 | pass |
|
5157 | pass | |
5158 | if not filenodes: |
|
5158 | if not filenodes: | |
5159 | raise error.Abort(_("'%s' not found in manifest!") % file_) |
|
5159 | raise error.Abort(_("'%s' not found in manifest!") % file_) | |
5160 | p = [] |
|
5160 | p = [] | |
5161 | for fn in filenodes: |
|
5161 | for fn in filenodes: | |
5162 | fctx = repo.filectx(file_, fileid=fn) |
|
5162 | fctx = repo.filectx(file_, fileid=fn) | |
5163 | p.append(fctx.node()) |
|
5163 | p.append(fctx.node()) | |
5164 | else: |
|
5164 | else: | |
5165 | p = [cp.node() for cp in ctx.parents()] |
|
5165 | p = [cp.node() for cp in ctx.parents()] | |
5166 |
|
5166 | |||
5167 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5167 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5168 | for n in p: |
|
5168 | for n in p: | |
5169 | if n != nullid: |
|
5169 | if n != nullid: | |
5170 | displayer.show(repo[n]) |
|
5170 | displayer.show(repo[n]) | |
5171 | displayer.close() |
|
5171 | displayer.close() | |
5172 |
|
5172 | |||
5173 | @command('paths', [], _('[NAME]'), optionalrepo=True) |
|
5173 | @command('paths', [], _('[NAME]'), optionalrepo=True) | |
5174 | def paths(ui, repo, search=None): |
|
5174 | def paths(ui, repo, search=None): | |
5175 | """show aliases for remote repositories |
|
5175 | """show aliases for remote repositories | |
5176 |
|
5176 | |||
5177 | Show definition of symbolic path name NAME. If no name is given, |
|
5177 | Show definition of symbolic path name NAME. If no name is given, | |
5178 | show definition of all available names. |
|
5178 | show definition of all available names. | |
5179 |
|
5179 | |||
5180 | Option -q/--quiet suppresses all output when searching for NAME |
|
5180 | Option -q/--quiet suppresses all output when searching for NAME | |
5181 | and shows only the path names when listing all definitions. |
|
5181 | and shows only the path names when listing all definitions. | |
5182 |
|
5182 | |||
5183 | Path names are defined in the [paths] section of your |
|
5183 | Path names are defined in the [paths] section of your | |
5184 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
5184 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
5185 | repository, ``.hg/hgrc`` is used, too. |
|
5185 | repository, ``.hg/hgrc`` is used, too. | |
5186 |
|
5186 | |||
5187 | The path names ``default`` and ``default-push`` have a special |
|
5187 | The path names ``default`` and ``default-push`` have a special | |
5188 | meaning. When performing a push or pull operation, they are used |
|
5188 | meaning. When performing a push or pull operation, they are used | |
5189 | as fallbacks if no location is specified on the command-line. |
|
5189 | as fallbacks if no location is specified on the command-line. | |
5190 | When ``default-push`` is set, it will be used for push and |
|
5190 | When ``default-push`` is set, it will be used for push and | |
5191 | ``default`` will be used for pull; otherwise ``default`` is used |
|
5191 | ``default`` will be used for pull; otherwise ``default`` is used | |
5192 | as the fallback for both. When cloning a repository, the clone |
|
5192 | as the fallback for both. When cloning a repository, the clone | |
5193 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
5193 | source is written as ``default`` in ``.hg/hgrc``. Note that | |
5194 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
5194 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
5195 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
5195 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and | |
5196 | :hg:`bundle`) operations. |
|
5196 | :hg:`bundle`) operations. | |
5197 |
|
5197 | |||
5198 | See :hg:`help urls` for more information. |
|
5198 | See :hg:`help urls` for more information. | |
5199 |
|
5199 | |||
5200 | Returns 0 on success. |
|
5200 | Returns 0 on success. | |
5201 | """ |
|
5201 | """ | |
5202 | if search: |
|
5202 | if search: | |
5203 | for name, path in sorted(ui.paths.iteritems()): |
|
5203 | for name, path in sorted(ui.paths.iteritems()): | |
5204 | if name == search: |
|
5204 | if name == search: | |
5205 | ui.status("%s\n" % util.hidepassword(path.loc)) |
|
5205 | ui.status("%s\n" % util.hidepassword(path.loc)) | |
5206 | return |
|
5206 | return | |
5207 | if not ui.quiet: |
|
5207 | if not ui.quiet: | |
5208 | ui.warn(_("not found!\n")) |
|
5208 | ui.warn(_("not found!\n")) | |
5209 | return 1 |
|
5209 | return 1 | |
5210 | else: |
|
5210 | else: | |
5211 | for name, path in sorted(ui.paths.iteritems()): |
|
5211 | for name, path in sorted(ui.paths.iteritems()): | |
5212 | if ui.quiet: |
|
5212 | if ui.quiet: | |
5213 | ui.write("%s\n" % name) |
|
5213 | ui.write("%s\n" % name) | |
5214 | else: |
|
5214 | else: | |
5215 | ui.write("%s = %s\n" % (name, |
|
5215 | ui.write("%s = %s\n" % (name, | |
5216 | util.hidepassword(path.loc))) |
|
5216 | util.hidepassword(path.loc))) | |
5217 |
|
5217 | |||
5218 | @command('phase', |
|
5218 | @command('phase', | |
5219 | [('p', 'public', False, _('set changeset phase to public')), |
|
5219 | [('p', 'public', False, _('set changeset phase to public')), | |
5220 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
5220 | ('d', 'draft', False, _('set changeset phase to draft')), | |
5221 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
5221 | ('s', 'secret', False, _('set changeset phase to secret')), | |
5222 | ('f', 'force', False, _('allow to move boundary backward')), |
|
5222 | ('f', 'force', False, _('allow to move boundary backward')), | |
5223 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
5223 | ('r', 'rev', [], _('target revision'), _('REV')), | |
5224 | ], |
|
5224 | ], | |
5225 | _('[-p|-d|-s] [-f] [-r] [REV...]')) |
|
5225 | _('[-p|-d|-s] [-f] [-r] [REV...]')) | |
5226 | def phase(ui, repo, *revs, **opts): |
|
5226 | def phase(ui, repo, *revs, **opts): | |
5227 | """set or show the current phase name |
|
5227 | """set or show the current phase name | |
5228 |
|
5228 | |||
5229 | With no argument, show the phase name of the current revision(s). |
|
5229 | With no argument, show the phase name of the current revision(s). | |
5230 |
|
5230 | |||
5231 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
5231 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
5232 | phase value of the specified revisions. |
|
5232 | phase value of the specified revisions. | |
5233 |
|
5233 | |||
5234 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
|
5234 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a | |
5235 | lower phase to an higher phase. Phases are ordered as follows:: |
|
5235 | lower phase to an higher phase. Phases are ordered as follows:: | |
5236 |
|
5236 | |||
5237 | public < draft < secret |
|
5237 | public < draft < secret | |
5238 |
|
5238 | |||
5239 | Returns 0 on success, 1 if some phases could not be changed. |
|
5239 | Returns 0 on success, 1 if some phases could not be changed. | |
5240 |
|
5240 | |||
5241 | (For more information about the phases concept, see :hg:`help phases`.) |
|
5241 | (For more information about the phases concept, see :hg:`help phases`.) | |
5242 | """ |
|
5242 | """ | |
5243 | # search for a unique phase argument |
|
5243 | # search for a unique phase argument | |
5244 | targetphase = None |
|
5244 | targetphase = None | |
5245 | for idx, name in enumerate(phases.phasenames): |
|
5245 | for idx, name in enumerate(phases.phasenames): | |
5246 | if opts[name]: |
|
5246 | if opts[name]: | |
5247 | if targetphase is not None: |
|
5247 | if targetphase is not None: | |
5248 | raise error.Abort(_('only one phase can be specified')) |
|
5248 | raise error.Abort(_('only one phase can be specified')) | |
5249 | targetphase = idx |
|
5249 | targetphase = idx | |
5250 |
|
5250 | |||
5251 | # look for specified revision |
|
5251 | # look for specified revision | |
5252 | revs = list(revs) |
|
5252 | revs = list(revs) | |
5253 | revs.extend(opts['rev']) |
|
5253 | revs.extend(opts['rev']) | |
5254 | if not revs: |
|
5254 | if not revs: | |
5255 | # display both parents as the second parent phase can influence |
|
5255 | # display both parents as the second parent phase can influence | |
5256 | # the phase of a merge commit |
|
5256 | # the phase of a merge commit | |
5257 | revs = [c.rev() for c in repo[None].parents()] |
|
5257 | revs = [c.rev() for c in repo[None].parents()] | |
5258 |
|
5258 | |||
5259 | revs = scmutil.revrange(repo, revs) |
|
5259 | revs = scmutil.revrange(repo, revs) | |
5260 |
|
5260 | |||
5261 | lock = None |
|
5261 | lock = None | |
5262 | ret = 0 |
|
5262 | ret = 0 | |
5263 | if targetphase is None: |
|
5263 | if targetphase is None: | |
5264 | # display |
|
5264 | # display | |
5265 | for r in revs: |
|
5265 | for r in revs: | |
5266 | ctx = repo[r] |
|
5266 | ctx = repo[r] | |
5267 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
5267 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
5268 | else: |
|
5268 | else: | |
5269 | tr = None |
|
5269 | tr = None | |
5270 | lock = repo.lock() |
|
5270 | lock = repo.lock() | |
5271 | try: |
|
5271 | try: | |
5272 | tr = repo.transaction("phase") |
|
5272 | tr = repo.transaction("phase") | |
5273 | # set phase |
|
5273 | # set phase | |
5274 | if not revs: |
|
5274 | if not revs: | |
5275 | raise error.Abort(_('empty revision set')) |
|
5275 | raise error.Abort(_('empty revision set')) | |
5276 | nodes = [repo[r].node() for r in revs] |
|
5276 | nodes = [repo[r].node() for r in revs] | |
5277 | # moving revision from public to draft may hide them |
|
5277 | # moving revision from public to draft may hide them | |
5278 | # We have to check result on an unfiltered repository |
|
5278 | # We have to check result on an unfiltered repository | |
5279 | unfi = repo.unfiltered() |
|
5279 | unfi = repo.unfiltered() | |
5280 | getphase = unfi._phasecache.phase |
|
5280 | getphase = unfi._phasecache.phase | |
5281 | olddata = [getphase(unfi, r) for r in unfi] |
|
5281 | olddata = [getphase(unfi, r) for r in unfi] | |
5282 | phases.advanceboundary(repo, tr, targetphase, nodes) |
|
5282 | phases.advanceboundary(repo, tr, targetphase, nodes) | |
5283 | if opts['force']: |
|
5283 | if opts['force']: | |
5284 | phases.retractboundary(repo, tr, targetphase, nodes) |
|
5284 | phases.retractboundary(repo, tr, targetphase, nodes) | |
5285 | tr.close() |
|
5285 | tr.close() | |
5286 | finally: |
|
5286 | finally: | |
5287 | if tr is not None: |
|
5287 | if tr is not None: | |
5288 | tr.release() |
|
5288 | tr.release() | |
5289 | lock.release() |
|
5289 | lock.release() | |
5290 | getphase = unfi._phasecache.phase |
|
5290 | getphase = unfi._phasecache.phase | |
5291 | newdata = [getphase(unfi, r) for r in unfi] |
|
5291 | newdata = [getphase(unfi, r) for r in unfi] | |
5292 | changes = sum(newdata[r] != olddata[r] for r in unfi) |
|
5292 | changes = sum(newdata[r] != olddata[r] for r in unfi) | |
5293 | cl = unfi.changelog |
|
5293 | cl = unfi.changelog | |
5294 | rejected = [n for n in nodes |
|
5294 | rejected = [n for n in nodes | |
5295 | if newdata[cl.rev(n)] < targetphase] |
|
5295 | if newdata[cl.rev(n)] < targetphase] | |
5296 | if rejected: |
|
5296 | if rejected: | |
5297 | ui.warn(_('cannot move %i changesets to a higher ' |
|
5297 | ui.warn(_('cannot move %i changesets to a higher ' | |
5298 | 'phase, use --force\n') % len(rejected)) |
|
5298 | 'phase, use --force\n') % len(rejected)) | |
5299 | ret = 1 |
|
5299 | ret = 1 | |
5300 | if changes: |
|
5300 | if changes: | |
5301 | msg = _('phase changed for %i changesets\n') % changes |
|
5301 | msg = _('phase changed for %i changesets\n') % changes | |
5302 | if ret: |
|
5302 | if ret: | |
5303 | ui.status(msg) |
|
5303 | ui.status(msg) | |
5304 | else: |
|
5304 | else: | |
5305 | ui.note(msg) |
|
5305 | ui.note(msg) | |
5306 | else: |
|
5306 | else: | |
5307 | ui.warn(_('no phases changed\n')) |
|
5307 | ui.warn(_('no phases changed\n')) | |
5308 | return ret |
|
5308 | return ret | |
5309 |
|
5309 | |||
5310 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
5310 | def postincoming(ui, repo, modheads, optupdate, checkout): | |
5311 | if modheads == 0: |
|
5311 | if modheads == 0: | |
5312 | return |
|
5312 | return | |
5313 | if optupdate: |
|
5313 | if optupdate: | |
5314 | try: |
|
5314 | try: | |
5315 | brev = checkout |
|
5315 | brev = checkout | |
5316 | movemarkfrom = None |
|
5316 | movemarkfrom = None | |
5317 | if not checkout: |
|
5317 | if not checkout: | |
5318 | updata = destutil.destupdate(repo) |
|
5318 | updata = destutil.destupdate(repo) | |
5319 | checkout, movemarkfrom, brev = updata |
|
5319 | checkout, movemarkfrom, brev = updata | |
5320 | ret = hg.update(repo, checkout) |
|
5320 | ret = hg.update(repo, checkout) | |
5321 | except error.UpdateAbort as inst: |
|
5321 | except error.UpdateAbort as inst: | |
5322 | msg = _("not updating: %s") % str(inst) |
|
5322 | msg = _("not updating: %s") % str(inst) | |
5323 | hint = inst.hint |
|
5323 | hint = inst.hint | |
5324 | raise error.UpdateAbort(msg, hint=hint) |
|
5324 | raise error.UpdateAbort(msg, hint=hint) | |
5325 | if not ret and not checkout: |
|
5325 | if not ret and not checkout: | |
5326 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
5326 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
5327 | ui.status(_("updating bookmark %s\n") % repo._activebookmark) |
|
5327 | ui.status(_("updating bookmark %s\n") % repo._activebookmark) | |
5328 | return ret |
|
5328 | return ret | |
5329 | if modheads > 1: |
|
5329 | if modheads > 1: | |
5330 | currentbranchheads = len(repo.branchheads()) |
|
5330 | currentbranchheads = len(repo.branchheads()) | |
5331 | if currentbranchheads == modheads: |
|
5331 | if currentbranchheads == modheads: | |
5332 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
5332 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
5333 | elif currentbranchheads > 1: |
|
5333 | elif currentbranchheads > 1: | |
5334 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
5334 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
5335 | "merge)\n")) |
|
5335 | "merge)\n")) | |
5336 | else: |
|
5336 | else: | |
5337 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
5337 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
5338 | else: |
|
5338 | else: | |
5339 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
5339 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
5340 |
|
5340 | |||
5341 | @command('^pull', |
|
5341 | @command('^pull', | |
5342 | [('u', 'update', None, |
|
5342 | [('u', 'update', None, | |
5343 | _('update to new branch head if changesets were pulled')), |
|
5343 | _('update to new branch head if changesets were pulled')), | |
5344 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
5344 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
5345 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
5345 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
5346 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
5346 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
5347 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
5347 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
5348 | _('BRANCH')), |
|
5348 | _('BRANCH')), | |
5349 | ] + remoteopts, |
|
5349 | ] + remoteopts, | |
5350 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
5350 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
5351 | def pull(ui, repo, source="default", **opts): |
|
5351 | def pull(ui, repo, source="default", **opts): | |
5352 | """pull changes from the specified source |
|
5352 | """pull changes from the specified source | |
5353 |
|
5353 | |||
5354 | Pull changes from a remote repository to a local one. |
|
5354 | Pull changes from a remote repository to a local one. | |
5355 |
|
5355 | |||
5356 | This finds all changes from the repository at the specified path |
|
5356 | This finds all changes from the repository at the specified path | |
5357 | or URL and adds them to a local repository (the current one unless |
|
5357 | or URL and adds them to a local repository (the current one unless | |
5358 | -R is specified). By default, this does not update the copy of the |
|
5358 | -R is specified). By default, this does not update the copy of the | |
5359 | project in the working directory. |
|
5359 | project in the working directory. | |
5360 |
|
5360 | |||
5361 | Use :hg:`incoming` if you want to see what would have been added |
|
5361 | Use :hg:`incoming` if you want to see what would have been added | |
5362 | by a pull at the time you issued this command. If you then decide |
|
5362 | by a pull at the time you issued this command. If you then decide | |
5363 | to add those changes to the repository, you should use :hg:`pull |
|
5363 | to add those changes to the repository, you should use :hg:`pull | |
5364 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
5364 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
5365 |
|
5365 | |||
5366 | If SOURCE is omitted, the 'default' path will be used. |
|
5366 | If SOURCE is omitted, the 'default' path will be used. | |
5367 | See :hg:`help urls` for more information. |
|
5367 | See :hg:`help urls` for more information. | |
5368 |
|
5368 | |||
5369 | Returns 0 on success, 1 if an update had unresolved files. |
|
5369 | Returns 0 on success, 1 if an update had unresolved files. | |
5370 | """ |
|
5370 | """ | |
5371 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
5371 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
5372 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
5372 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
5373 | other = hg.peer(repo, opts, source) |
|
5373 | other = hg.peer(repo, opts, source) | |
5374 | try: |
|
5374 | try: | |
5375 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
5375 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
5376 | opts.get('rev')) |
|
5376 | opts.get('rev')) | |
5377 |
|
5377 | |||
5378 |
|
5378 | |||
5379 | pullopargs = {} |
|
5379 | pullopargs = {} | |
5380 | if opts.get('bookmark'): |
|
5380 | if opts.get('bookmark'): | |
5381 | if not revs: |
|
5381 | if not revs: | |
5382 | revs = [] |
|
5382 | revs = [] | |
5383 | # The list of bookmark used here is not the one used to actually |
|
5383 | # The list of bookmark used here is not the one used to actually | |
5384 | # update the bookmark name. This can result in the revision pulled |
|
5384 | # update the bookmark name. This can result in the revision pulled | |
5385 | # not ending up with the name of the bookmark because of a race |
|
5385 | # not ending up with the name of the bookmark because of a race | |
5386 | # condition on the server. (See issue 4689 for details) |
|
5386 | # condition on the server. (See issue 4689 for details) | |
5387 | remotebookmarks = other.listkeys('bookmarks') |
|
5387 | remotebookmarks = other.listkeys('bookmarks') | |
5388 | pullopargs['remotebookmarks'] = remotebookmarks |
|
5388 | pullopargs['remotebookmarks'] = remotebookmarks | |
5389 | for b in opts['bookmark']: |
|
5389 | for b in opts['bookmark']: | |
5390 | if b not in remotebookmarks: |
|
5390 | if b not in remotebookmarks: | |
5391 | raise error.Abort(_('remote bookmark %s not found!') % b) |
|
5391 | raise error.Abort(_('remote bookmark %s not found!') % b) | |
5392 | revs.append(remotebookmarks[b]) |
|
5392 | revs.append(remotebookmarks[b]) | |
5393 |
|
5393 | |||
5394 | if revs: |
|
5394 | if revs: | |
5395 | try: |
|
5395 | try: | |
5396 | # When 'rev' is a bookmark name, we cannot guarantee that it |
|
5396 | # When 'rev' is a bookmark name, we cannot guarantee that it | |
5397 | # will be updated with that name because of a race condition |
|
5397 | # will be updated with that name because of a race condition | |
5398 | # server side. (See issue 4689 for details) |
|
5398 | # server side. (See issue 4689 for details) | |
5399 | oldrevs = revs |
|
5399 | oldrevs = revs | |
5400 | revs = [] # actually, nodes |
|
5400 | revs = [] # actually, nodes | |
5401 | for r in oldrevs: |
|
5401 | for r in oldrevs: | |
5402 | node = other.lookup(r) |
|
5402 | node = other.lookup(r) | |
5403 | revs.append(node) |
|
5403 | revs.append(node) | |
5404 | if r == checkout: |
|
5404 | if r == checkout: | |
5405 | checkout = node |
|
5405 | checkout = node | |
5406 | except error.CapabilityError: |
|
5406 | except error.CapabilityError: | |
5407 | err = _("other repository doesn't support revision lookup, " |
|
5407 | err = _("other repository doesn't support revision lookup, " | |
5408 | "so a rev cannot be specified.") |
|
5408 | "so a rev cannot be specified.") | |
5409 | raise error.Abort(err) |
|
5409 | raise error.Abort(err) | |
5410 |
|
5410 | |||
5411 | pullopargs.update(opts.get('opargs', {})) |
|
5411 | pullopargs.update(opts.get('opargs', {})) | |
5412 | modheads = exchange.pull(repo, other, heads=revs, |
|
5412 | modheads = exchange.pull(repo, other, heads=revs, | |
5413 | force=opts.get('force'), |
|
5413 | force=opts.get('force'), | |
5414 | bookmarks=opts.get('bookmark', ()), |
|
5414 | bookmarks=opts.get('bookmark', ()), | |
5415 | opargs=pullopargs).cgresult |
|
5415 | opargs=pullopargs).cgresult | |
5416 | if checkout: |
|
5416 | if checkout: | |
5417 | checkout = str(repo.changelog.rev(checkout)) |
|
5417 | checkout = str(repo.changelog.rev(checkout)) | |
5418 | repo._subtoppath = source |
|
5418 | repo._subtoppath = source | |
5419 | try: |
|
5419 | try: | |
5420 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
5420 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) | |
5421 |
|
5421 | |||
5422 | finally: |
|
5422 | finally: | |
5423 | del repo._subtoppath |
|
5423 | del repo._subtoppath | |
5424 |
|
5424 | |||
5425 | finally: |
|
5425 | finally: | |
5426 | other.close() |
|
5426 | other.close() | |
5427 | return ret |
|
5427 | return ret | |
5428 |
|
5428 | |||
5429 | @command('^push', |
|
5429 | @command('^push', | |
5430 | [('f', 'force', None, _('force push')), |
|
5430 | [('f', 'force', None, _('force push')), | |
5431 | ('r', 'rev', [], |
|
5431 | ('r', 'rev', [], | |
5432 | _('a changeset intended to be included in the destination'), |
|
5432 | _('a changeset intended to be included in the destination'), | |
5433 | _('REV')), |
|
5433 | _('REV')), | |
5434 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
5434 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
5435 | ('b', 'branch', [], |
|
5435 | ('b', 'branch', [], | |
5436 | _('a specific branch you would like to push'), _('BRANCH')), |
|
5436 | _('a specific branch you would like to push'), _('BRANCH')), | |
5437 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
5437 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
5438 | ] + remoteopts, |
|
5438 | ] + remoteopts, | |
5439 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
5439 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
5440 | def push(ui, repo, dest=None, **opts): |
|
5440 | def push(ui, repo, dest=None, **opts): | |
5441 | """push changes to the specified destination |
|
5441 | """push changes to the specified destination | |
5442 |
|
5442 | |||
5443 | Push changesets from the local repository to the specified |
|
5443 | Push changesets from the local repository to the specified | |
5444 | destination. |
|
5444 | destination. | |
5445 |
|
5445 | |||
5446 | This operation is symmetrical to pull: it is identical to a pull |
|
5446 | This operation is symmetrical to pull: it is identical to a pull | |
5447 | in the destination repository from the current one. |
|
5447 | in the destination repository from the current one. | |
5448 |
|
5448 | |||
5449 | By default, push will not allow creation of new heads at the |
|
5449 | By default, push will not allow creation of new heads at the | |
5450 | destination, since multiple heads would make it unclear which head |
|
5450 | destination, since multiple heads would make it unclear which head | |
5451 | to use. In this situation, it is recommended to pull and merge |
|
5451 | to use. In this situation, it is recommended to pull and merge | |
5452 | before pushing. |
|
5452 | before pushing. | |
5453 |
|
5453 | |||
5454 | Use --new-branch if you want to allow push to create a new named |
|
5454 | Use --new-branch if you want to allow push to create a new named | |
5455 | branch that is not present at the destination. This allows you to |
|
5455 | branch that is not present at the destination. This allows you to | |
5456 | only create a new branch without forcing other changes. |
|
5456 | only create a new branch without forcing other changes. | |
5457 |
|
5457 | |||
5458 | .. note:: |
|
5458 | .. note:: | |
5459 |
|
5459 | |||
5460 | Extra care should be taken with the -f/--force option, |
|
5460 | Extra care should be taken with the -f/--force option, | |
5461 | which will push all new heads on all branches, an action which will |
|
5461 | which will push all new heads on all branches, an action which will | |
5462 | almost always cause confusion for collaborators. |
|
5462 | almost always cause confusion for collaborators. | |
5463 |
|
5463 | |||
5464 | If -r/--rev is used, the specified revision and all its ancestors |
|
5464 | If -r/--rev is used, the specified revision and all its ancestors | |
5465 | will be pushed to the remote repository. |
|
5465 | will be pushed to the remote repository. | |
5466 |
|
5466 | |||
5467 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
5467 | If -B/--bookmark is used, the specified bookmarked revision, its | |
5468 | ancestors, and the bookmark will be pushed to the remote |
|
5468 | ancestors, and the bookmark will be pushed to the remote | |
5469 | repository. |
|
5469 | repository. | |
5470 |
|
5470 | |||
5471 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
5471 | Please see :hg:`help urls` for important details about ``ssh://`` | |
5472 | URLs. If DESTINATION is omitted, a default path will be used. |
|
5472 | URLs. If DESTINATION is omitted, a default path will be used. | |
5473 |
|
5473 | |||
5474 | Returns 0 if push was successful, 1 if nothing to push. |
|
5474 | Returns 0 if push was successful, 1 if nothing to push. | |
5475 | """ |
|
5475 | """ | |
5476 |
|
5476 | |||
5477 | if opts.get('bookmark'): |
|
5477 | if opts.get('bookmark'): | |
5478 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') |
|
5478 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') | |
5479 | for b in opts['bookmark']: |
|
5479 | for b in opts['bookmark']: | |
5480 | # translate -B options to -r so changesets get pushed |
|
5480 | # translate -B options to -r so changesets get pushed | |
5481 | if b in repo._bookmarks: |
|
5481 | if b in repo._bookmarks: | |
5482 | opts.setdefault('rev', []).append(b) |
|
5482 | opts.setdefault('rev', []).append(b) | |
5483 | else: |
|
5483 | else: | |
5484 | # if we try to push a deleted bookmark, translate it to null |
|
5484 | # if we try to push a deleted bookmark, translate it to null | |
5485 | # this lets simultaneous -r, -b options continue working |
|
5485 | # this lets simultaneous -r, -b options continue working | |
5486 | opts.setdefault('rev', []).append("null") |
|
5486 | opts.setdefault('rev', []).append("null") | |
5487 |
|
5487 | |||
5488 | path = ui.paths.getpath(dest, default='default') |
|
5488 | path = ui.paths.getpath(dest, default='default') | |
5489 | if not path: |
|
5489 | if not path: | |
5490 | raise error.Abort(_('default repository not configured!'), |
|
5490 | raise error.Abort(_('default repository not configured!'), | |
5491 | hint=_('see the "path" section in "hg help config"')) |
|
5491 | hint=_('see the "path" section in "hg help config"')) | |
5492 | dest, branches = path.pushloc, (path.branch, opts.get('branch') or []) |
|
5492 | dest, branches = path.pushloc, (path.branch, opts.get('branch') or []) | |
5493 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
5493 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
5494 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
5494 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
5495 | other = hg.peer(repo, opts, dest) |
|
5495 | other = hg.peer(repo, opts, dest) | |
5496 |
|
5496 | |||
5497 | if revs: |
|
5497 | if revs: | |
5498 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
5498 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
5499 | if not revs: |
|
5499 | if not revs: | |
5500 | raise error.Abort(_("specified revisions evaluate to an empty set"), |
|
5500 | raise error.Abort(_("specified revisions evaluate to an empty set"), | |
5501 | hint=_("use different revision arguments")) |
|
5501 | hint=_("use different revision arguments")) | |
5502 |
|
5502 | |||
5503 | repo._subtoppath = dest |
|
5503 | repo._subtoppath = dest | |
5504 | try: |
|
5504 | try: | |
5505 | # push subrepos depth-first for coherent ordering |
|
5505 | # push subrepos depth-first for coherent ordering | |
5506 | c = repo[''] |
|
5506 | c = repo[''] | |
5507 | subs = c.substate # only repos that are committed |
|
5507 | subs = c.substate # only repos that are committed | |
5508 | for s in sorted(subs): |
|
5508 | for s in sorted(subs): | |
5509 | result = c.sub(s).push(opts) |
|
5509 | result = c.sub(s).push(opts) | |
5510 | if result == 0: |
|
5510 | if result == 0: | |
5511 | return not result |
|
5511 | return not result | |
5512 | finally: |
|
5512 | finally: | |
5513 | del repo._subtoppath |
|
5513 | del repo._subtoppath | |
5514 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, |
|
5514 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, | |
5515 | newbranch=opts.get('new_branch'), |
|
5515 | newbranch=opts.get('new_branch'), | |
5516 | bookmarks=opts.get('bookmark', ()), |
|
5516 | bookmarks=opts.get('bookmark', ()), | |
5517 | opargs=opts.get('opargs')) |
|
5517 | opargs=opts.get('opargs')) | |
5518 |
|
5518 | |||
5519 | result = not pushop.cgresult |
|
5519 | result = not pushop.cgresult | |
5520 |
|
5520 | |||
5521 | if pushop.bkresult is not None: |
|
5521 | if pushop.bkresult is not None: | |
5522 | if pushop.bkresult == 2: |
|
5522 | if pushop.bkresult == 2: | |
5523 | result = 2 |
|
5523 | result = 2 | |
5524 | elif not result and pushop.bkresult: |
|
5524 | elif not result and pushop.bkresult: | |
5525 | result = 2 |
|
5525 | result = 2 | |
5526 |
|
5526 | |||
5527 | return result |
|
5527 | return result | |
5528 |
|
5528 | |||
5529 | @command('recover', []) |
|
5529 | @command('recover', []) | |
5530 | def recover(ui, repo): |
|
5530 | def recover(ui, repo): | |
5531 | """roll back an interrupted transaction |
|
5531 | """roll back an interrupted transaction | |
5532 |
|
5532 | |||
5533 | Recover from an interrupted commit or pull. |
|
5533 | Recover from an interrupted commit or pull. | |
5534 |
|
5534 | |||
5535 | This command tries to fix the repository status after an |
|
5535 | This command tries to fix the repository status after an | |
5536 | interrupted operation. It should only be necessary when Mercurial |
|
5536 | interrupted operation. It should only be necessary when Mercurial | |
5537 | suggests it. |
|
5537 | suggests it. | |
5538 |
|
5538 | |||
5539 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
5539 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
5540 | """ |
|
5540 | """ | |
5541 | if repo.recover(): |
|
5541 | if repo.recover(): | |
5542 | return hg.verify(repo) |
|
5542 | return hg.verify(repo) | |
5543 | return 1 |
|
5543 | return 1 | |
5544 |
|
5544 | |||
5545 | @command('^remove|rm', |
|
5545 | @command('^remove|rm', | |
5546 | [('A', 'after', None, _('record delete for missing files')), |
|
5546 | [('A', 'after', None, _('record delete for missing files')), | |
5547 | ('f', 'force', None, |
|
5547 | ('f', 'force', None, | |
5548 | _('remove (and delete) file even if added or modified')), |
|
5548 | _('remove (and delete) file even if added or modified')), | |
5549 | ] + subrepoopts + walkopts, |
|
5549 | ] + subrepoopts + walkopts, | |
5550 | _('[OPTION]... FILE...'), |
|
5550 | _('[OPTION]... FILE...'), | |
5551 | inferrepo=True) |
|
5551 | inferrepo=True) | |
5552 | def remove(ui, repo, *pats, **opts): |
|
5552 | def remove(ui, repo, *pats, **opts): | |
5553 | """remove the specified files on the next commit |
|
5553 | """remove the specified files on the next commit | |
5554 |
|
5554 | |||
5555 | Schedule the indicated files for removal from the current branch. |
|
5555 | Schedule the indicated files for removal from the current branch. | |
5556 |
|
5556 | |||
5557 | This command schedules the files to be removed at the next commit. |
|
5557 | This command schedules the files to be removed at the next commit. | |
5558 | To undo a remove before that, see :hg:`revert`. To undo added |
|
5558 | To undo a remove before that, see :hg:`revert`. To undo added | |
5559 | files, see :hg:`forget`. |
|
5559 | files, see :hg:`forget`. | |
5560 |
|
5560 | |||
5561 | .. container:: verbose |
|
5561 | .. container:: verbose | |
5562 |
|
5562 | |||
5563 | -A/--after can be used to remove only files that have already |
|
5563 | -A/--after can be used to remove only files that have already | |
5564 | been deleted, -f/--force can be used to force deletion, and -Af |
|
5564 | been deleted, -f/--force can be used to force deletion, and -Af | |
5565 | can be used to remove files from the next revision without |
|
5565 | can be used to remove files from the next revision without | |
5566 | deleting them from the working directory. |
|
5566 | deleting them from the working directory. | |
5567 |
|
5567 | |||
5568 | The following table details the behavior of remove for different |
|
5568 | The following table details the behavior of remove for different | |
5569 | file states (columns) and option combinations (rows). The file |
|
5569 | file states (columns) and option combinations (rows). The file | |
5570 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
5570 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
5571 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
5571 | (as reported by :hg:`status`). The actions are Warn, Remove | |
5572 | (from branch) and Delete (from disk): |
|
5572 | (from branch) and Delete (from disk): | |
5573 |
|
5573 | |||
5574 | ========= == == == == |
|
5574 | ========= == == == == | |
5575 | opt/state A C M ! |
|
5575 | opt/state A C M ! | |
5576 | ========= == == == == |
|
5576 | ========= == == == == | |
5577 | none W RD W R |
|
5577 | none W RD W R | |
5578 | -f R RD RD R |
|
5578 | -f R RD RD R | |
5579 | -A W W W R |
|
5579 | -A W W W R | |
5580 | -Af R R R R |
|
5580 | -Af R R R R | |
5581 | ========= == == == == |
|
5581 | ========= == == == == | |
5582 |
|
5582 | |||
5583 | Note that remove never deletes files in Added [A] state from the |
|
5583 | Note that remove never deletes files in Added [A] state from the | |
5584 | working directory, not even if option --force is specified. |
|
5584 | working directory, not even if option --force is specified. | |
5585 |
|
5585 | |||
5586 | Returns 0 on success, 1 if any warnings encountered. |
|
5586 | Returns 0 on success, 1 if any warnings encountered. | |
5587 | """ |
|
5587 | """ | |
5588 |
|
5588 | |||
5589 | after, force = opts.get('after'), opts.get('force') |
|
5589 | after, force = opts.get('after'), opts.get('force') | |
5590 | if not pats and not after: |
|
5590 | if not pats and not after: | |
5591 | raise error.Abort(_('no files specified')) |
|
5591 | raise error.Abort(_('no files specified')) | |
5592 |
|
5592 | |||
5593 | m = scmutil.match(repo[None], pats, opts) |
|
5593 | m = scmutil.match(repo[None], pats, opts) | |
5594 | subrepos = opts.get('subrepos') |
|
5594 | subrepos = opts.get('subrepos') | |
5595 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) |
|
5595 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) | |
5596 |
|
5596 | |||
5597 | @command('rename|move|mv', |
|
5597 | @command('rename|move|mv', | |
5598 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
5598 | [('A', 'after', None, _('record a rename that has already occurred')), | |
5599 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
5599 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
5600 | ] + walkopts + dryrunopts, |
|
5600 | ] + walkopts + dryrunopts, | |
5601 | _('[OPTION]... SOURCE... DEST')) |
|
5601 | _('[OPTION]... SOURCE... DEST')) | |
5602 | def rename(ui, repo, *pats, **opts): |
|
5602 | def rename(ui, repo, *pats, **opts): | |
5603 | """rename files; equivalent of copy + remove |
|
5603 | """rename files; equivalent of copy + remove | |
5604 |
|
5604 | |||
5605 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
5605 | Mark dest as copies of sources; mark sources for deletion. If dest | |
5606 | is a directory, copies are put in that directory. If dest is a |
|
5606 | is a directory, copies are put in that directory. If dest is a | |
5607 | file, there can only be one source. |
|
5607 | file, there can only be one source. | |
5608 |
|
5608 | |||
5609 | By default, this command copies the contents of files as they |
|
5609 | By default, this command copies the contents of files as they | |
5610 | exist in the working directory. If invoked with -A/--after, the |
|
5610 | exist in the working directory. If invoked with -A/--after, the | |
5611 | operation is recorded, but no copying is performed. |
|
5611 | operation is recorded, but no copying is performed. | |
5612 |
|
5612 | |||
5613 | This command takes effect at the next commit. To undo a rename |
|
5613 | This command takes effect at the next commit. To undo a rename | |
5614 | before that, see :hg:`revert`. |
|
5614 | before that, see :hg:`revert`. | |
5615 |
|
5615 | |||
5616 | Returns 0 on success, 1 if errors are encountered. |
|
5616 | Returns 0 on success, 1 if errors are encountered. | |
5617 | """ |
|
5617 | """ | |
5618 | wlock = repo.wlock(False) |
|
5618 | wlock = repo.wlock(False) | |
5619 | try: |
|
5619 | try: | |
5620 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
5620 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
5621 | finally: |
|
5621 | finally: | |
5622 | wlock.release() |
|
5622 | wlock.release() | |
5623 |
|
5623 | |||
5624 | @command('resolve', |
|
5624 | @command('resolve', | |
5625 | [('a', 'all', None, _('select all unresolved files')), |
|
5625 | [('a', 'all', None, _('select all unresolved files')), | |
5626 | ('l', 'list', None, _('list state of files needing merge')), |
|
5626 | ('l', 'list', None, _('list state of files needing merge')), | |
5627 | ('m', 'mark', None, _('mark files as resolved')), |
|
5627 | ('m', 'mark', None, _('mark files as resolved')), | |
5628 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
5628 | ('u', 'unmark', None, _('mark files as unresolved')), | |
5629 | ('n', 'no-status', None, _('hide status prefix'))] |
|
5629 | ('n', 'no-status', None, _('hide status prefix'))] | |
5630 | + mergetoolopts + walkopts + formatteropts, |
|
5630 | + mergetoolopts + walkopts + formatteropts, | |
5631 | _('[OPTION]... [FILE]...'), |
|
5631 | _('[OPTION]... [FILE]...'), | |
5632 | inferrepo=True) |
|
5632 | inferrepo=True) | |
5633 | def resolve(ui, repo, *pats, **opts): |
|
5633 | def resolve(ui, repo, *pats, **opts): | |
5634 | """redo merges or set/view the merge status of files |
|
5634 | """redo merges or set/view the merge status of files | |
5635 |
|
5635 | |||
5636 | Merges with unresolved conflicts are often the result of |
|
5636 | Merges with unresolved conflicts are often the result of | |
5637 | non-interactive merging using the ``internal:merge`` configuration |
|
5637 | non-interactive merging using the ``internal:merge`` configuration | |
5638 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
5638 | setting, or a command-line merge tool like ``diff3``. The resolve | |
5639 | command is used to manage the files involved in a merge, after |
|
5639 | command is used to manage the files involved in a merge, after | |
5640 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
5640 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
5641 | working directory must have two parents). See :hg:`help |
|
5641 | working directory must have two parents). See :hg:`help | |
5642 | merge-tools` for information on configuring merge tools. |
|
5642 | merge-tools` for information on configuring merge tools. | |
5643 |
|
5643 | |||
5644 | The resolve command can be used in the following ways: |
|
5644 | The resolve command can be used in the following ways: | |
5645 |
|
5645 | |||
5646 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
5646 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
5647 | files, discarding any previous merge attempts. Re-merging is not |
|
5647 | files, discarding any previous merge attempts. Re-merging is not | |
5648 | performed for files already marked as resolved. Use ``--all/-a`` |
|
5648 | performed for files already marked as resolved. Use ``--all/-a`` | |
5649 | to select all unresolved files. ``--tool`` can be used to specify |
|
5649 | to select all unresolved files. ``--tool`` can be used to specify | |
5650 | the merge tool used for the given files. It overrides the HGMERGE |
|
5650 | the merge tool used for the given files. It overrides the HGMERGE | |
5651 | environment variable and your configuration files. Previous file |
|
5651 | environment variable and your configuration files. Previous file | |
5652 | contents are saved with a ``.orig`` suffix. |
|
5652 | contents are saved with a ``.orig`` suffix. | |
5653 |
|
5653 | |||
5654 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
5654 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
5655 | (e.g. after having manually fixed-up the files). The default is |
|
5655 | (e.g. after having manually fixed-up the files). The default is | |
5656 | to mark all unresolved files. |
|
5656 | to mark all unresolved files. | |
5657 |
|
5657 | |||
5658 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
5658 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
5659 | default is to mark all resolved files. |
|
5659 | default is to mark all resolved files. | |
5660 |
|
5660 | |||
5661 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
5661 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
5662 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
5662 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
5663 |
|
5663 | |||
5664 | Note that Mercurial will not let you commit files with unresolved |
|
5664 | Note that Mercurial will not let you commit files with unresolved | |
5665 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
5665 | merge conflicts. You must use :hg:`resolve -m ...` before you can | |
5666 | commit after a conflicting merge. |
|
5666 | commit after a conflicting merge. | |
5667 |
|
5667 | |||
5668 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
5668 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
5669 | """ |
|
5669 | """ | |
5670 |
|
5670 | |||
5671 | all, mark, unmark, show, nostatus = \ |
|
5671 | all, mark, unmark, show, nostatus = \ | |
5672 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
5672 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] | |
5673 |
|
5673 | |||
5674 | if (show and (mark or unmark)) or (mark and unmark): |
|
5674 | if (show and (mark or unmark)) or (mark and unmark): | |
5675 | raise error.Abort(_("too many options specified")) |
|
5675 | raise error.Abort(_("too many options specified")) | |
5676 | if pats and all: |
|
5676 | if pats and all: | |
5677 | raise error.Abort(_("can't specify --all and patterns")) |
|
5677 | raise error.Abort(_("can't specify --all and patterns")) | |
5678 | if not (all or pats or show or mark or unmark): |
|
5678 | if not (all or pats or show or mark or unmark): | |
5679 | raise error.Abort(_('no files or directories specified'), |
|
5679 | raise error.Abort(_('no files or directories specified'), | |
5680 | hint=('use --all to re-merge all unresolved files')) |
|
5680 | hint=('use --all to re-merge all unresolved files')) | |
5681 |
|
5681 | |||
5682 | if show: |
|
5682 | if show: | |
5683 | fm = ui.formatter('resolve', opts) |
|
5683 | fm = ui.formatter('resolve', opts) | |
5684 | ms = mergemod.mergestate.read(repo) |
|
5684 | ms = mergemod.mergestate.read(repo) | |
5685 | m = scmutil.match(repo[None], pats, opts) |
|
5685 | m = scmutil.match(repo[None], pats, opts) | |
5686 | for f in ms: |
|
5686 | for f in ms: | |
5687 | if not m(f): |
|
5687 | if not m(f): | |
5688 | continue |
|
5688 | continue | |
5689 | l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', |
|
5689 | l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', | |
5690 | 'd': 'driverresolved'}[ms[f]] |
|
5690 | 'd': 'driverresolved'}[ms[f]] | |
5691 | fm.startitem() |
|
5691 | fm.startitem() | |
5692 | fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) |
|
5692 | fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) | |
5693 | fm.write('path', '%s\n', f, label=l) |
|
5693 | fm.write('path', '%s\n', f, label=l) | |
5694 | fm.end() |
|
5694 | fm.end() | |
5695 | return 0 |
|
5695 | return 0 | |
5696 |
|
5696 | |||
5697 | wlock = repo.wlock() |
|
5697 | wlock = repo.wlock() | |
5698 | try: |
|
5698 | try: | |
5699 | ms = mergemod.mergestate.read(repo) |
|
5699 | ms = mergemod.mergestate.read(repo) | |
5700 |
|
5700 | |||
5701 | if not (ms.active() or repo.dirstate.p2() != nullid): |
|
5701 | if not (ms.active() or repo.dirstate.p2() != nullid): | |
5702 | raise error.Abort( |
|
5702 | raise error.Abort( | |
5703 | _('resolve command not applicable when not merging')) |
|
5703 | _('resolve command not applicable when not merging')) | |
5704 |
|
5704 | |||
5705 | wctx = repo[None] |
|
5705 | wctx = repo[None] | |
5706 |
|
5706 | |||
5707 | if ms.mergedriver and ms.mdstate() == 'u': |
|
5707 | if ms.mergedriver and ms.mdstate() == 'u': | |
5708 | proceed = mergemod.driverpreprocess(repo, ms, wctx) |
|
5708 | proceed = mergemod.driverpreprocess(repo, ms, wctx) | |
5709 | ms.commit() |
|
5709 | ms.commit() | |
5710 | # allow mark and unmark to go through |
|
5710 | # allow mark and unmark to go through | |
5711 | if not mark and not unmark and not proceed: |
|
5711 | if not mark and not unmark and not proceed: | |
5712 | return 1 |
|
5712 | return 1 | |
5713 |
|
5713 | |||
5714 | m = scmutil.match(wctx, pats, opts) |
|
5714 | m = scmutil.match(wctx, pats, opts) | |
5715 | ret = 0 |
|
5715 | ret = 0 | |
5716 | didwork = False |
|
5716 | didwork = False | |
5717 | runconclude = False |
|
5717 | runconclude = False | |
5718 |
|
5718 | |||
5719 | tocomplete = [] |
|
5719 | tocomplete = [] | |
5720 | for f in ms: |
|
5720 | for f in ms: | |
5721 | if not m(f): |
|
5721 | if not m(f): | |
5722 | continue |
|
5722 | continue | |
5723 |
|
5723 | |||
5724 | didwork = True |
|
5724 | didwork = True | |
5725 |
|
5725 | |||
5726 | # don't let driver-resolved files be marked, and run the conclude |
|
5726 | # don't let driver-resolved files be marked, and run the conclude | |
5727 | # step if asked to resolve |
|
5727 | # step if asked to resolve | |
5728 | if ms[f] == "d": |
|
5728 | if ms[f] == "d": | |
5729 | exact = m.exact(f) |
|
5729 | exact = m.exact(f) | |
5730 | if mark: |
|
5730 | if mark: | |
5731 | if exact: |
|
5731 | if exact: | |
5732 | ui.warn(_('not marking %s as it is driver-resolved\n') |
|
5732 | ui.warn(_('not marking %s as it is driver-resolved\n') | |
5733 | % f) |
|
5733 | % f) | |
5734 | elif unmark: |
|
5734 | elif unmark: | |
5735 | if exact: |
|
5735 | if exact: | |
5736 | ui.warn(_('not unmarking %s as it is driver-resolved\n') |
|
5736 | ui.warn(_('not unmarking %s as it is driver-resolved\n') | |
5737 | % f) |
|
5737 | % f) | |
5738 | else: |
|
5738 | else: | |
5739 | runconclude = True |
|
5739 | runconclude = True | |
5740 | continue |
|
5740 | continue | |
5741 |
|
5741 | |||
5742 | if mark: |
|
5742 | if mark: | |
5743 | ms.mark(f, "r") |
|
5743 | ms.mark(f, "r") | |
5744 | elif unmark: |
|
5744 | elif unmark: | |
5745 | ms.mark(f, "u") |
|
5745 | ms.mark(f, "u") | |
5746 | else: |
|
5746 | else: | |
5747 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
5747 | # backup pre-resolve (merge uses .orig for its own purposes) | |
5748 | a = repo.wjoin(f) |
|
5748 | a = repo.wjoin(f) | |
5749 | try: |
|
5749 | try: | |
5750 | util.copyfile(a, a + ".resolve") |
|
5750 | util.copyfile(a, a + ".resolve") | |
5751 | except (IOError, OSError) as inst: |
|
5751 | except (IOError, OSError) as inst: | |
5752 | if inst.errno != errno.ENOENT: |
|
5752 | if inst.errno != errno.ENOENT: | |
5753 | raise |
|
5753 | raise | |
5754 |
|
5754 | |||
5755 | try: |
|
5755 | try: | |
5756 | # preresolve file |
|
5756 | # preresolve file | |
5757 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
5757 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
5758 | 'resolve') |
|
5758 | 'resolve') | |
5759 | complete, r = ms.preresolve(f, wctx) |
|
5759 | complete, r = ms.preresolve(f, wctx) | |
5760 | if not complete: |
|
5760 | if not complete: | |
5761 | tocomplete.append(f) |
|
5761 | tocomplete.append(f) | |
5762 | elif r: |
|
5762 | elif r: | |
5763 | ret = 1 |
|
5763 | ret = 1 | |
5764 | finally: |
|
5764 | finally: | |
5765 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
5765 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
5766 | ms.commit() |
|
5766 | ms.commit() | |
5767 |
|
5767 | |||
5768 | # replace filemerge's .orig file with our resolve file, but only |
|
5768 | # replace filemerge's .orig file with our resolve file, but only | |
5769 | # for merges that are complete |
|
5769 | # for merges that are complete | |
5770 | if complete: |
|
5770 | if complete: | |
5771 | try: |
|
5771 | try: | |
5772 | util.rename(a + ".resolve", |
|
5772 | util.rename(a + ".resolve", | |
5773 | cmdutil.origpath(ui, repo, a)) |
|
5773 | cmdutil.origpath(ui, repo, a)) | |
5774 | except OSError as inst: |
|
5774 | except OSError as inst: | |
5775 | if inst.errno != errno.ENOENT: |
|
5775 | if inst.errno != errno.ENOENT: | |
5776 | raise |
|
5776 | raise | |
5777 |
|
5777 | |||
5778 | for f in tocomplete: |
|
5778 | for f in tocomplete: | |
5779 | try: |
|
5779 | try: | |
5780 | # resolve file |
|
5780 | # resolve file | |
5781 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
5781 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
5782 | 'resolve') |
|
5782 | 'resolve') | |
5783 | r = ms.resolve(f, wctx) |
|
5783 | r = ms.resolve(f, wctx) | |
5784 | if r: |
|
5784 | if r: | |
5785 | ret = 1 |
|
5785 | ret = 1 | |
5786 | finally: |
|
5786 | finally: | |
5787 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
5787 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
5788 | ms.commit() |
|
5788 | ms.commit() | |
5789 |
|
5789 | |||
5790 | # replace filemerge's .orig file with our resolve file |
|
5790 | # replace filemerge's .orig file with our resolve file | |
5791 | a = repo.wjoin(f) |
|
5791 | a = repo.wjoin(f) | |
5792 | try: |
|
5792 | try: | |
5793 | util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) |
|
5793 | util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) | |
5794 | except OSError as inst: |
|
5794 | except OSError as inst: | |
5795 | if inst.errno != errno.ENOENT: |
|
5795 | if inst.errno != errno.ENOENT: | |
5796 | raise |
|
5796 | raise | |
5797 |
|
5797 | |||
5798 | ms.commit() |
|
5798 | ms.commit() | |
5799 | ms.recordactions() |
|
5799 | ms.recordactions() | |
5800 |
|
5800 | |||
5801 | if not didwork and pats: |
|
5801 | if not didwork and pats: | |
5802 | ui.warn(_("arguments do not match paths that need resolving\n")) |
|
5802 | ui.warn(_("arguments do not match paths that need resolving\n")) | |
5803 | elif ms.mergedriver and ms.mdstate() != 's': |
|
5803 | elif ms.mergedriver and ms.mdstate() != 's': | |
5804 | # run conclude step when either a driver-resolved file is requested |
|
5804 | # run conclude step when either a driver-resolved file is requested | |
5805 | # or there are no driver-resolved files |
|
5805 | # or there are no driver-resolved files | |
5806 | # we can't use 'ret' to determine whether any files are unresolved |
|
5806 | # we can't use 'ret' to determine whether any files are unresolved | |
5807 | # because we might not have tried to resolve some |
|
5807 | # because we might not have tried to resolve some | |
5808 | if ((runconclude or not list(ms.driverresolved())) |
|
5808 | if ((runconclude or not list(ms.driverresolved())) | |
5809 | and not list(ms.unresolved())): |
|
5809 | and not list(ms.unresolved())): | |
5810 | proceed = mergemod.driverconclude(repo, ms, wctx) |
|
5810 | proceed = mergemod.driverconclude(repo, ms, wctx) | |
5811 | ms.commit() |
|
5811 | ms.commit() | |
5812 | if not proceed: |
|
5812 | if not proceed: | |
5813 | return 1 |
|
5813 | return 1 | |
5814 |
|
5814 | |||
5815 | finally: |
|
5815 | finally: | |
5816 | wlock.release() |
|
5816 | wlock.release() | |
5817 |
|
5817 | |||
5818 | # Nudge users into finishing an unfinished operation |
|
5818 | # Nudge users into finishing an unfinished operation | |
5819 | unresolvedf = list(ms.unresolved()) |
|
5819 | unresolvedf = list(ms.unresolved()) | |
5820 | driverresolvedf = list(ms.driverresolved()) |
|
5820 | driverresolvedf = list(ms.driverresolved()) | |
5821 | if not unresolvedf and not driverresolvedf: |
|
5821 | if not unresolvedf and not driverresolvedf: | |
5822 | ui.status(_('(no more unresolved files)\n')) |
|
5822 | ui.status(_('(no more unresolved files)\n')) | |
5823 | elif not unresolvedf: |
|
5823 | elif not unresolvedf: | |
5824 | ui.status(_('(no more unresolved files -- ' |
|
5824 | ui.status(_('(no more unresolved files -- ' | |
5825 | 'run "hg resolve --all" to conclude)\n')) |
|
5825 | 'run "hg resolve --all" to conclude)\n')) | |
5826 |
|
5826 | |||
5827 | return ret |
|
5827 | return ret | |
5828 |
|
5828 | |||
5829 | @command('revert', |
|
5829 | @command('revert', | |
5830 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
5830 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
5831 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5831 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5832 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
5832 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
5833 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
5833 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
5834 | ('i', 'interactive', None, |
|
5834 | ('i', 'interactive', None, | |
5835 | _('interactively select the changes (EXPERIMENTAL)')), |
|
5835 | _('interactively select the changes (EXPERIMENTAL)')), | |
5836 | ] + walkopts + dryrunopts, |
|
5836 | ] + walkopts + dryrunopts, | |
5837 | _('[OPTION]... [-r REV] [NAME]...')) |
|
5837 | _('[OPTION]... [-r REV] [NAME]...')) | |
5838 | def revert(ui, repo, *pats, **opts): |
|
5838 | def revert(ui, repo, *pats, **opts): | |
5839 | """restore files to their checkout state |
|
5839 | """restore files to their checkout state | |
5840 |
|
5840 | |||
5841 | .. note:: |
|
5841 | .. note:: | |
5842 |
|
5842 | |||
5843 | To check out earlier revisions, you should use :hg:`update REV`. |
|
5843 | To check out earlier revisions, you should use :hg:`update REV`. | |
5844 | To cancel an uncommitted merge (and lose your changes), |
|
5844 | To cancel an uncommitted merge (and lose your changes), | |
5845 | use :hg:`update --clean .`. |
|
5845 | use :hg:`update --clean .`. | |
5846 |
|
5846 | |||
5847 | With no revision specified, revert the specified files or directories |
|
5847 | With no revision specified, revert the specified files or directories | |
5848 | to the contents they had in the parent of the working directory. |
|
5848 | to the contents they had in the parent of the working directory. | |
5849 | This restores the contents of files to an unmodified |
|
5849 | This restores the contents of files to an unmodified | |
5850 | state and unschedules adds, removes, copies, and renames. If the |
|
5850 | state and unschedules adds, removes, copies, and renames. If the | |
5851 | working directory has two parents, you must explicitly specify a |
|
5851 | working directory has two parents, you must explicitly specify a | |
5852 | revision. |
|
5852 | revision. | |
5853 |
|
5853 | |||
5854 | Using the -r/--rev or -d/--date options, revert the given files or |
|
5854 | Using the -r/--rev or -d/--date options, revert the given files or | |
5855 | directories to their states as of a specific revision. Because |
|
5855 | directories to their states as of a specific revision. Because | |
5856 | revert does not change the working directory parents, this will |
|
5856 | revert does not change the working directory parents, this will | |
5857 | cause these files to appear modified. This can be helpful to "back |
|
5857 | cause these files to appear modified. This can be helpful to "back | |
5858 | out" some or all of an earlier change. See :hg:`backout` for a |
|
5858 | out" some or all of an earlier change. See :hg:`backout` for a | |
5859 | related method. |
|
5859 | related method. | |
5860 |
|
5860 | |||
5861 | Modified files are saved with a .orig suffix before reverting. |
|
5861 | Modified files are saved with a .orig suffix before reverting. | |
5862 | To disable these backups, use --no-backup. |
|
5862 | To disable these backups, use --no-backup. | |
5863 |
|
5863 | |||
5864 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5864 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5865 |
|
5865 | |||
5866 | See :hg:`help backout` for a way to reverse the effect of an |
|
5866 | See :hg:`help backout` for a way to reverse the effect of an | |
5867 | earlier changeset. |
|
5867 | earlier changeset. | |
5868 |
|
5868 | |||
5869 | Returns 0 on success. |
|
5869 | Returns 0 on success. | |
5870 | """ |
|
5870 | """ | |
5871 |
|
5871 | |||
5872 | if opts.get("date"): |
|
5872 | if opts.get("date"): | |
5873 | if opts.get("rev"): |
|
5873 | if opts.get("rev"): | |
5874 | raise error.Abort(_("you can't specify a revision and a date")) |
|
5874 | raise error.Abort(_("you can't specify a revision and a date")) | |
5875 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
5875 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
5876 |
|
5876 | |||
5877 | parent, p2 = repo.dirstate.parents() |
|
5877 | parent, p2 = repo.dirstate.parents() | |
5878 | if not opts.get('rev') and p2 != nullid: |
|
5878 | if not opts.get('rev') and p2 != nullid: | |
5879 | # revert after merge is a trap for new users (issue2915) |
|
5879 | # revert after merge is a trap for new users (issue2915) | |
5880 | raise error.Abort(_('uncommitted merge with no revision specified'), |
|
5880 | raise error.Abort(_('uncommitted merge with no revision specified'), | |
5881 | hint=_('use "hg update" or see "hg help revert"')) |
|
5881 | hint=_('use "hg update" or see "hg help revert"')) | |
5882 |
|
5882 | |||
5883 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5883 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
5884 |
|
5884 | |||
5885 | if (not (pats or opts.get('include') or opts.get('exclude') or |
|
5885 | if (not (pats or opts.get('include') or opts.get('exclude') or | |
5886 | opts.get('all') or opts.get('interactive'))): |
|
5886 | opts.get('all') or opts.get('interactive'))): | |
5887 | msg = _("no files or directories specified") |
|
5887 | msg = _("no files or directories specified") | |
5888 | if p2 != nullid: |
|
5888 | if p2 != nullid: | |
5889 | hint = _("uncommitted merge, use --all to discard all changes," |
|
5889 | hint = _("uncommitted merge, use --all to discard all changes," | |
5890 | " or 'hg update -C .' to abort the merge") |
|
5890 | " or 'hg update -C .' to abort the merge") | |
5891 | raise error.Abort(msg, hint=hint) |
|
5891 | raise error.Abort(msg, hint=hint) | |
5892 | dirty = any(repo.status()) |
|
5892 | dirty = any(repo.status()) | |
5893 | node = ctx.node() |
|
5893 | node = ctx.node() | |
5894 | if node != parent: |
|
5894 | if node != parent: | |
5895 | if dirty: |
|
5895 | if dirty: | |
5896 | hint = _("uncommitted changes, use --all to discard all" |
|
5896 | hint = _("uncommitted changes, use --all to discard all" | |
5897 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
5897 | " changes, or 'hg update %s' to update") % ctx.rev() | |
5898 | else: |
|
5898 | else: | |
5899 | hint = _("use --all to revert all files," |
|
5899 | hint = _("use --all to revert all files," | |
5900 | " or 'hg update %s' to update") % ctx.rev() |
|
5900 | " or 'hg update %s' to update") % ctx.rev() | |
5901 | elif dirty: |
|
5901 | elif dirty: | |
5902 | hint = _("uncommitted changes, use --all to discard all changes") |
|
5902 | hint = _("uncommitted changes, use --all to discard all changes") | |
5903 | else: |
|
5903 | else: | |
5904 | hint = _("use --all to revert all files") |
|
5904 | hint = _("use --all to revert all files") | |
5905 | raise error.Abort(msg, hint=hint) |
|
5905 | raise error.Abort(msg, hint=hint) | |
5906 |
|
5906 | |||
5907 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
5907 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) | |
5908 |
|
5908 | |||
5909 | @command('rollback', dryrunopts + |
|
5909 | @command('rollback', dryrunopts + | |
5910 | [('f', 'force', False, _('ignore safety measures'))]) |
|
5910 | [('f', 'force', False, _('ignore safety measures'))]) | |
5911 | def rollback(ui, repo, **opts): |
|
5911 | def rollback(ui, repo, **opts): | |
5912 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
5912 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
5913 |
|
5913 | |||
5914 | Please use :hg:`commit --amend` instead of rollback to correct |
|
5914 | Please use :hg:`commit --amend` instead of rollback to correct | |
5915 | mistakes in the last commit. |
|
5915 | mistakes in the last commit. | |
5916 |
|
5916 | |||
5917 | This command should be used with care. There is only one level of |
|
5917 | This command should be used with care. There is only one level of | |
5918 | rollback, and there is no way to undo a rollback. It will also |
|
5918 | rollback, and there is no way to undo a rollback. It will also | |
5919 | restore the dirstate at the time of the last transaction, losing |
|
5919 | restore the dirstate at the time of the last transaction, losing | |
5920 | any dirstate changes since that time. This command does not alter |
|
5920 | any dirstate changes since that time. This command does not alter | |
5921 | the working directory. |
|
5921 | the working directory. | |
5922 |
|
5922 | |||
5923 | Transactions are used to encapsulate the effects of all commands |
|
5923 | Transactions are used to encapsulate the effects of all commands | |
5924 | that create new changesets or propagate existing changesets into a |
|
5924 | that create new changesets or propagate existing changesets into a | |
5925 | repository. |
|
5925 | repository. | |
5926 |
|
5926 | |||
5927 | .. container:: verbose |
|
5927 | .. container:: verbose | |
5928 |
|
5928 | |||
5929 | For example, the following commands are transactional, and their |
|
5929 | For example, the following commands are transactional, and their | |
5930 | effects can be rolled back: |
|
5930 | effects can be rolled back: | |
5931 |
|
5931 | |||
5932 | - commit |
|
5932 | - commit | |
5933 | - import |
|
5933 | - import | |
5934 | - pull |
|
5934 | - pull | |
5935 | - push (with this repository as the destination) |
|
5935 | - push (with this repository as the destination) | |
5936 | - unbundle |
|
5936 | - unbundle | |
5937 |
|
5937 | |||
5938 | To avoid permanent data loss, rollback will refuse to rollback a |
|
5938 | To avoid permanent data loss, rollback will refuse to rollback a | |
5939 | commit transaction if it isn't checked out. Use --force to |
|
5939 | commit transaction if it isn't checked out. Use --force to | |
5940 | override this protection. |
|
5940 | override this protection. | |
5941 |
|
5941 | |||
5942 | This command is not intended for use on public repositories. Once |
|
5942 | This command is not intended for use on public repositories. Once | |
5943 | changes are visible for pull by other users, rolling a transaction |
|
5943 | changes are visible for pull by other users, rolling a transaction | |
5944 | back locally is ineffective (someone else may already have pulled |
|
5944 | back locally is ineffective (someone else may already have pulled | |
5945 | the changes). Furthermore, a race is possible with readers of the |
|
5945 | the changes). Furthermore, a race is possible with readers of the | |
5946 | repository; for example an in-progress pull from the repository |
|
5946 | repository; for example an in-progress pull from the repository | |
5947 | may fail if a rollback is performed. |
|
5947 | may fail if a rollback is performed. | |
5948 |
|
5948 | |||
5949 | Returns 0 on success, 1 if no rollback data is available. |
|
5949 | Returns 0 on success, 1 if no rollback data is available. | |
5950 | """ |
|
5950 | """ | |
5951 | return repo.rollback(dryrun=opts.get('dry_run'), |
|
5951 | return repo.rollback(dryrun=opts.get('dry_run'), | |
5952 | force=opts.get('force')) |
|
5952 | force=opts.get('force')) | |
5953 |
|
5953 | |||
5954 | @command('root', []) |
|
5954 | @command('root', []) | |
5955 | def root(ui, repo): |
|
5955 | def root(ui, repo): | |
5956 | """print the root (top) of the current working directory |
|
5956 | """print the root (top) of the current working directory | |
5957 |
|
5957 | |||
5958 | Print the root directory of the current repository. |
|
5958 | Print the root directory of the current repository. | |
5959 |
|
5959 | |||
5960 | Returns 0 on success. |
|
5960 | Returns 0 on success. | |
5961 | """ |
|
5961 | """ | |
5962 | ui.write(repo.root + "\n") |
|
5962 | ui.write(repo.root + "\n") | |
5963 |
|
5963 | |||
5964 | @command('^serve', |
|
5964 | @command('^serve', | |
5965 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
5965 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
5966 | _('FILE')), |
|
5966 | _('FILE')), | |
5967 | ('d', 'daemon', None, _('run server in background')), |
|
5967 | ('d', 'daemon', None, _('run server in background')), | |
5968 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')), |
|
5968 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')), | |
5969 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
5969 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
5970 | # use string type, then we can check if something was passed |
|
5970 | # use string type, then we can check if something was passed | |
5971 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
5971 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
5972 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
5972 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
5973 | _('ADDR')), |
|
5973 | _('ADDR')), | |
5974 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
5974 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
5975 | _('PREFIX')), |
|
5975 | _('PREFIX')), | |
5976 | ('n', 'name', '', |
|
5976 | ('n', 'name', '', | |
5977 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
5977 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
5978 | ('', 'web-conf', '', |
|
5978 | ('', 'web-conf', '', | |
5979 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), |
|
5979 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), | |
5980 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
5980 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
5981 | _('FILE')), |
|
5981 | _('FILE')), | |
5982 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
5982 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
5983 | ('', 'stdio', None, _('for remote clients')), |
|
5983 | ('', 'stdio', None, _('for remote clients')), | |
5984 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), |
|
5984 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), | |
5985 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
5985 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
5986 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
5986 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
5987 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
5987 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
5988 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], |
|
5988 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], | |
5989 | _('[OPTION]...'), |
|
5989 | _('[OPTION]...'), | |
5990 | optionalrepo=True) |
|
5990 | optionalrepo=True) | |
5991 | def serve(ui, repo, **opts): |
|
5991 | def serve(ui, repo, **opts): | |
5992 | """start stand-alone webserver |
|
5992 | """start stand-alone webserver | |
5993 |
|
5993 | |||
5994 | Start a local HTTP repository browser and pull server. You can use |
|
5994 | Start a local HTTP repository browser and pull server. You can use | |
5995 | this for ad-hoc sharing and browsing of repositories. It is |
|
5995 | this for ad-hoc sharing and browsing of repositories. It is | |
5996 | recommended to use a real web server to serve a repository for |
|
5996 | recommended to use a real web server to serve a repository for | |
5997 | longer periods of time. |
|
5997 | longer periods of time. | |
5998 |
|
5998 | |||
5999 | Please note that the server does not implement access control. |
|
5999 | Please note that the server does not implement access control. | |
6000 | This means that, by default, anybody can read from the server and |
|
6000 | This means that, by default, anybody can read from the server and | |
6001 | nobody can write to it by default. Set the ``web.allow_push`` |
|
6001 | nobody can write to it by default. Set the ``web.allow_push`` | |
6002 | option to ``*`` to allow everybody to push to the server. You |
|
6002 | option to ``*`` to allow everybody to push to the server. You | |
6003 | should use a real web server if you need to authenticate users. |
|
6003 | should use a real web server if you need to authenticate users. | |
6004 |
|
6004 | |||
6005 | By default, the server logs accesses to stdout and errors to |
|
6005 | By default, the server logs accesses to stdout and errors to | |
6006 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
6006 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
6007 | files. |
|
6007 | files. | |
6008 |
|
6008 | |||
6009 | To have the server choose a free port number to listen on, specify |
|
6009 | To have the server choose a free port number to listen on, specify | |
6010 | a port number of 0; in this case, the server will print the port |
|
6010 | a port number of 0; in this case, the server will print the port | |
6011 | number it uses. |
|
6011 | number it uses. | |
6012 |
|
6012 | |||
6013 | Returns 0 on success. |
|
6013 | Returns 0 on success. | |
6014 | """ |
|
6014 | """ | |
6015 |
|
6015 | |||
6016 | if opts["stdio"] and opts["cmdserver"]: |
|
6016 | if opts["stdio"] and opts["cmdserver"]: | |
6017 | raise error.Abort(_("cannot use --stdio with --cmdserver")) |
|
6017 | raise error.Abort(_("cannot use --stdio with --cmdserver")) | |
6018 |
|
6018 | |||
6019 | if opts["stdio"]: |
|
6019 | if opts["stdio"]: | |
6020 | if repo is None: |
|
6020 | if repo is None: | |
6021 | raise error.RepoError(_("there is no Mercurial repository here" |
|
6021 | raise error.RepoError(_("there is no Mercurial repository here" | |
6022 | " (.hg not found)")) |
|
6022 | " (.hg not found)")) | |
6023 | s = sshserver.sshserver(ui, repo) |
|
6023 | s = sshserver.sshserver(ui, repo) | |
6024 | s.serve_forever() |
|
6024 | s.serve_forever() | |
6025 |
|
6025 | |||
6026 | if opts["cmdserver"]: |
|
6026 | if opts["cmdserver"]: | |
6027 | import commandserver |
|
6027 | import commandserver | |
6028 | service = commandserver.createservice(ui, repo, opts) |
|
6028 | service = commandserver.createservice(ui, repo, opts) | |
6029 | else: |
|
6029 | else: | |
6030 | service = hgweb.createservice(ui, repo, opts) |
|
6030 | service = hgweb.createservice(ui, repo, opts) | |
6031 | return cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
6031 | return cmdutil.service(opts, initfn=service.init, runfn=service.run) | |
6032 |
|
6032 | |||
6033 | @command('^status|st', |
|
6033 | @command('^status|st', | |
6034 | [('A', 'all', None, _('show status of all files')), |
|
6034 | [('A', 'all', None, _('show status of all files')), | |
6035 | ('m', 'modified', None, _('show only modified files')), |
|
6035 | ('m', 'modified', None, _('show only modified files')), | |
6036 | ('a', 'added', None, _('show only added files')), |
|
6036 | ('a', 'added', None, _('show only added files')), | |
6037 | ('r', 'removed', None, _('show only removed files')), |
|
6037 | ('r', 'removed', None, _('show only removed files')), | |
6038 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
6038 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
6039 | ('c', 'clean', None, _('show only files without changes')), |
|
6039 | ('c', 'clean', None, _('show only files without changes')), | |
6040 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
6040 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
6041 | ('i', 'ignored', None, _('show only ignored files')), |
|
6041 | ('i', 'ignored', None, _('show only ignored files')), | |
6042 | ('n', 'no-status', None, _('hide status prefix')), |
|
6042 | ('n', 'no-status', None, _('hide status prefix')), | |
6043 | ('C', 'copies', None, _('show source of copied files')), |
|
6043 | ('C', 'copies', None, _('show source of copied files')), | |
6044 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
6044 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
6045 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
6045 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
6046 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
6046 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
6047 | ] + walkopts + subrepoopts + formatteropts, |
|
6047 | ] + walkopts + subrepoopts + formatteropts, | |
6048 | _('[OPTION]... [FILE]...'), |
|
6048 | _('[OPTION]... [FILE]...'), | |
6049 | inferrepo=True) |
|
6049 | inferrepo=True) | |
6050 | def status(ui, repo, *pats, **opts): |
|
6050 | def status(ui, repo, *pats, **opts): | |
6051 | """show changed files in the working directory |
|
6051 | """show changed files in the working directory | |
6052 |
|
6052 | |||
6053 | Show status of files in the repository. If names are given, only |
|
6053 | Show status of files in the repository. If names are given, only | |
6054 | files that match are shown. Files that are clean or ignored or |
|
6054 | files that match are shown. Files that are clean or ignored or | |
6055 | the source of a copy/move operation, are not listed unless |
|
6055 | the source of a copy/move operation, are not listed unless | |
6056 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
6056 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
6057 | Unless options described with "show only ..." are given, the |
|
6057 | Unless options described with "show only ..." are given, the | |
6058 | options -mardu are used. |
|
6058 | options -mardu are used. | |
6059 |
|
6059 | |||
6060 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
6060 | Option -q/--quiet hides untracked (unknown and ignored) files | |
6061 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
6061 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
6062 |
|
6062 | |||
6063 | .. note:: |
|
6063 | .. note:: | |
6064 |
|
6064 | |||
6065 | status may appear to disagree with diff if permissions have |
|
6065 | status may appear to disagree with diff if permissions have | |
6066 | changed or a merge has occurred. The standard diff format does |
|
6066 | changed or a merge has occurred. The standard diff format does | |
6067 | not report permission changes and diff only reports changes |
|
6067 | not report permission changes and diff only reports changes | |
6068 | relative to one merge parent. |
|
6068 | relative to one merge parent. | |
6069 |
|
6069 | |||
6070 | If one revision is given, it is used as the base revision. |
|
6070 | If one revision is given, it is used as the base revision. | |
6071 | If two revisions are given, the differences between them are |
|
6071 | If two revisions are given, the differences between them are | |
6072 | shown. The --change option can also be used as a shortcut to list |
|
6072 | shown. The --change option can also be used as a shortcut to list | |
6073 | the changed files of a revision from its first parent. |
|
6073 | the changed files of a revision from its first parent. | |
6074 |
|
6074 | |||
6075 | The codes used to show the status of files are:: |
|
6075 | The codes used to show the status of files are:: | |
6076 |
|
6076 | |||
6077 | M = modified |
|
6077 | M = modified | |
6078 | A = added |
|
6078 | A = added | |
6079 | R = removed |
|
6079 | R = removed | |
6080 | C = clean |
|
6080 | C = clean | |
6081 | ! = missing (deleted by non-hg command, but still tracked) |
|
6081 | ! = missing (deleted by non-hg command, but still tracked) | |
6082 | ? = not tracked |
|
6082 | ? = not tracked | |
6083 | I = ignored |
|
6083 | I = ignored | |
6084 | = origin of the previous file (with --copies) |
|
6084 | = origin of the previous file (with --copies) | |
6085 |
|
6085 | |||
6086 | .. container:: verbose |
|
6086 | .. container:: verbose | |
6087 |
|
6087 | |||
6088 | Examples: |
|
6088 | Examples: | |
6089 |
|
6089 | |||
6090 | - show changes in the working directory relative to a |
|
6090 | - show changes in the working directory relative to a | |
6091 | changeset:: |
|
6091 | changeset:: | |
6092 |
|
6092 | |||
6093 | hg status --rev 9353 |
|
6093 | hg status --rev 9353 | |
6094 |
|
6094 | |||
6095 | - show changes in the working directory relative to the |
|
6095 | - show changes in the working directory relative to the | |
6096 | current directory (see :hg:`help patterns` for more information):: |
|
6096 | current directory (see :hg:`help patterns` for more information):: | |
6097 |
|
6097 | |||
6098 | hg status re: |
|
6098 | hg status re: | |
6099 |
|
6099 | |||
6100 | - show all changes including copies in an existing changeset:: |
|
6100 | - show all changes including copies in an existing changeset:: | |
6101 |
|
6101 | |||
6102 | hg status --copies --change 9353 |
|
6102 | hg status --copies --change 9353 | |
6103 |
|
6103 | |||
6104 | - get a NUL separated list of added files, suitable for xargs:: |
|
6104 | - get a NUL separated list of added files, suitable for xargs:: | |
6105 |
|
6105 | |||
6106 | hg status -an0 |
|
6106 | hg status -an0 | |
6107 |
|
6107 | |||
6108 | Returns 0 on success. |
|
6108 | Returns 0 on success. | |
6109 | """ |
|
6109 | """ | |
6110 |
|
6110 | |||
6111 | revs = opts.get('rev') |
|
6111 | revs = opts.get('rev') | |
6112 | change = opts.get('change') |
|
6112 | change = opts.get('change') | |
6113 |
|
6113 | |||
6114 | if revs and change: |
|
6114 | if revs and change: | |
6115 | msg = _('cannot specify --rev and --change at the same time') |
|
6115 | msg = _('cannot specify --rev and --change at the same time') | |
6116 | raise error.Abort(msg) |
|
6116 | raise error.Abort(msg) | |
6117 | elif change: |
|
6117 | elif change: | |
6118 | node2 = scmutil.revsingle(repo, change, None).node() |
|
6118 | node2 = scmutil.revsingle(repo, change, None).node() | |
6119 | node1 = repo[node2].p1().node() |
|
6119 | node1 = repo[node2].p1().node() | |
6120 | else: |
|
6120 | else: | |
6121 | node1, node2 = scmutil.revpair(repo, revs) |
|
6121 | node1, node2 = scmutil.revpair(repo, revs) | |
6122 |
|
6122 | |||
6123 | if pats: |
|
6123 | if pats: | |
6124 | cwd = repo.getcwd() |
|
6124 | cwd = repo.getcwd() | |
6125 | else: |
|
6125 | else: | |
6126 | cwd = '' |
|
6126 | cwd = '' | |
6127 |
|
6127 | |||
6128 | if opts.get('print0'): |
|
6128 | if opts.get('print0'): | |
6129 | end = '\0' |
|
6129 | end = '\0' | |
6130 | else: |
|
6130 | else: | |
6131 | end = '\n' |
|
6131 | end = '\n' | |
6132 | copy = {} |
|
6132 | copy = {} | |
6133 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
6133 | states = 'modified added removed deleted unknown ignored clean'.split() | |
6134 | show = [k for k in states if opts.get(k)] |
|
6134 | show = [k for k in states if opts.get(k)] | |
6135 | if opts.get('all'): |
|
6135 | if opts.get('all'): | |
6136 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
6136 | show += ui.quiet and (states[:4] + ['clean']) or states | |
6137 | if not show: |
|
6137 | if not show: | |
6138 | if ui.quiet: |
|
6138 | if ui.quiet: | |
6139 | show = states[:4] |
|
6139 | show = states[:4] | |
6140 | else: |
|
6140 | else: | |
6141 | show = states[:5] |
|
6141 | show = states[:5] | |
6142 |
|
6142 | |||
6143 | m = scmutil.match(repo[node2], pats, opts) |
|
6143 | m = scmutil.match(repo[node2], pats, opts) | |
6144 | stat = repo.status(node1, node2, m, |
|
6144 | stat = repo.status(node1, node2, m, | |
6145 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
6145 | 'ignored' in show, 'clean' in show, 'unknown' in show, | |
6146 | opts.get('subrepos')) |
|
6146 | opts.get('subrepos')) | |
6147 | changestates = zip(states, 'MAR!?IC', stat) |
|
6147 | changestates = zip(states, 'MAR!?IC', stat) | |
6148 |
|
6148 | |||
6149 | if (opts.get('all') or opts.get('copies') |
|
6149 | if (opts.get('all') or opts.get('copies') | |
6150 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
|
6150 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): | |
6151 | copy = copies.pathcopies(repo[node1], repo[node2], m) |
|
6151 | copy = copies.pathcopies(repo[node1], repo[node2], m) | |
6152 |
|
6152 | |||
6153 | fm = ui.formatter('status', opts) |
|
6153 | fm = ui.formatter('status', opts) | |
6154 | fmt = '%s' + end |
|
6154 | fmt = '%s' + end | |
6155 | showchar = not opts.get('no_status') |
|
6155 | showchar = not opts.get('no_status') | |
6156 |
|
6156 | |||
6157 | for state, char, files in changestates: |
|
6157 | for state, char, files in changestates: | |
6158 | if state in show: |
|
6158 | if state in show: | |
6159 | label = 'status.' + state |
|
6159 | label = 'status.' + state | |
6160 | for f in files: |
|
6160 | for f in files: | |
6161 | fm.startitem() |
|
6161 | fm.startitem() | |
6162 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
6162 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
6163 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
6163 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
6164 | if f in copy: |
|
6164 | if f in copy: | |
6165 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
6165 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
6166 | label='status.copied') |
|
6166 | label='status.copied') | |
6167 | fm.end() |
|
6167 | fm.end() | |
6168 |
|
6168 | |||
6169 | @command('^summary|sum', |
|
6169 | @command('^summary|sum', | |
6170 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
6170 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') | |
6171 | def summary(ui, repo, **opts): |
|
6171 | def summary(ui, repo, **opts): | |
6172 | """summarize working directory state |
|
6172 | """summarize working directory state | |
6173 |
|
6173 | |||
6174 | This generates a brief summary of the working directory state, |
|
6174 | This generates a brief summary of the working directory state, | |
6175 | including parents, branch, commit status, phase and available updates. |
|
6175 | including parents, branch, commit status, phase and available updates. | |
6176 |
|
6176 | |||
6177 | With the --remote option, this will check the default paths for |
|
6177 | With the --remote option, this will check the default paths for | |
6178 | incoming and outgoing changes. This can be time-consuming. |
|
6178 | incoming and outgoing changes. This can be time-consuming. | |
6179 |
|
6179 | |||
6180 | Returns 0 on success. |
|
6180 | Returns 0 on success. | |
6181 | """ |
|
6181 | """ | |
6182 |
|
6182 | |||
6183 | ctx = repo[None] |
|
6183 | ctx = repo[None] | |
6184 | parents = ctx.parents() |
|
6184 | parents = ctx.parents() | |
6185 | pnode = parents[0].node() |
|
6185 | pnode = parents[0].node() | |
6186 | marks = [] |
|
6186 | marks = [] | |
6187 |
|
6187 | |||
6188 | for p in parents: |
|
6188 | for p in parents: | |
6189 | # label with log.changeset (instead of log.parent) since this |
|
6189 | # label with log.changeset (instead of log.parent) since this | |
6190 | # shows a working directory parent *changeset*: |
|
6190 | # shows a working directory parent *changeset*: | |
6191 | # i18n: column positioning for "hg summary" |
|
6191 | # i18n: column positioning for "hg summary" | |
6192 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
6192 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), | |
6193 | label='log.changeset changeset.%s' % p.phasestr()) |
|
6193 | label='log.changeset changeset.%s' % p.phasestr()) | |
6194 | ui.write(' '.join(p.tags()), label='log.tag') |
|
6194 | ui.write(' '.join(p.tags()), label='log.tag') | |
6195 | if p.bookmarks(): |
|
6195 | if p.bookmarks(): | |
6196 | marks.extend(p.bookmarks()) |
|
6196 | marks.extend(p.bookmarks()) | |
6197 | if p.rev() == -1: |
|
6197 | if p.rev() == -1: | |
6198 | if not len(repo): |
|
6198 | if not len(repo): | |
6199 | ui.write(_(' (empty repository)')) |
|
6199 | ui.write(_(' (empty repository)')) | |
6200 | else: |
|
6200 | else: | |
6201 | ui.write(_(' (no revision checked out)')) |
|
6201 | ui.write(_(' (no revision checked out)')) | |
6202 | ui.write('\n') |
|
6202 | ui.write('\n') | |
6203 | if p.description(): |
|
6203 | if p.description(): | |
6204 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
6204 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
6205 | label='log.summary') |
|
6205 | label='log.summary') | |
6206 |
|
6206 | |||
6207 | branch = ctx.branch() |
|
6207 | branch = ctx.branch() | |
6208 | bheads = repo.branchheads(branch) |
|
6208 | bheads = repo.branchheads(branch) | |
6209 | # i18n: column positioning for "hg summary" |
|
6209 | # i18n: column positioning for "hg summary" | |
6210 | m = _('branch: %s\n') % branch |
|
6210 | m = _('branch: %s\n') % branch | |
6211 | if branch != 'default': |
|
6211 | if branch != 'default': | |
6212 | ui.write(m, label='log.branch') |
|
6212 | ui.write(m, label='log.branch') | |
6213 | else: |
|
6213 | else: | |
6214 | ui.status(m, label='log.branch') |
|
6214 | ui.status(m, label='log.branch') | |
6215 |
|
6215 | |||
6216 | if marks: |
|
6216 | if marks: | |
6217 | active = repo._activebookmark |
|
6217 | active = repo._activebookmark | |
6218 | # i18n: column positioning for "hg summary" |
|
6218 | # i18n: column positioning for "hg summary" | |
6219 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
6219 | ui.write(_('bookmarks:'), label='log.bookmark') | |
6220 | if active is not None: |
|
6220 | if active is not None: | |
6221 | if active in marks: |
|
6221 | if active in marks: | |
6222 | ui.write(' *' + active, label=activebookmarklabel) |
|
6222 | ui.write(' *' + active, label=activebookmarklabel) | |
6223 | marks.remove(active) |
|
6223 | marks.remove(active) | |
6224 | else: |
|
6224 | else: | |
6225 | ui.write(' [%s]' % active, label=activebookmarklabel) |
|
6225 | ui.write(' [%s]' % active, label=activebookmarklabel) | |
6226 | for m in marks: |
|
6226 | for m in marks: | |
6227 | ui.write(' ' + m, label='log.bookmark') |
|
6227 | ui.write(' ' + m, label='log.bookmark') | |
6228 | ui.write('\n', label='log.bookmark') |
|
6228 | ui.write('\n', label='log.bookmark') | |
6229 |
|
6229 | |||
6230 | status = repo.status(unknown=True) |
|
6230 | status = repo.status(unknown=True) | |
6231 |
|
6231 | |||
6232 | c = repo.dirstate.copies() |
|
6232 | c = repo.dirstate.copies() | |
6233 | copied, renamed = [], [] |
|
6233 | copied, renamed = [], [] | |
6234 | for d, s in c.iteritems(): |
|
6234 | for d, s in c.iteritems(): | |
6235 | if s in status.removed: |
|
6235 | if s in status.removed: | |
6236 | status.removed.remove(s) |
|
6236 | status.removed.remove(s) | |
6237 | renamed.append(d) |
|
6237 | renamed.append(d) | |
6238 | else: |
|
6238 | else: | |
6239 | copied.append(d) |
|
6239 | copied.append(d) | |
6240 | if d in status.added: |
|
6240 | if d in status.added: | |
6241 | status.added.remove(d) |
|
6241 | status.added.remove(d) | |
6242 |
|
6242 | |||
6243 | try: |
|
6243 | try: | |
6244 | ms = mergemod.mergestate.read(repo) |
|
6244 | ms = mergemod.mergestate.read(repo) | |
6245 | except error.UnsupportedMergeRecords as e: |
|
6245 | except error.UnsupportedMergeRecords as e: | |
6246 | s = ' '.join(e.recordtypes) |
|
6246 | s = ' '.join(e.recordtypes) | |
6247 | ui.warn( |
|
6247 | ui.warn( | |
6248 | _('warning: merge state has unsupported record types: %s\n') % s) |
|
6248 | _('warning: merge state has unsupported record types: %s\n') % s) | |
6249 | unresolved = 0 |
|
6249 | unresolved = 0 | |
6250 | else: |
|
6250 | else: | |
6251 | unresolved = [f for f in ms if ms[f] == 'u'] |
|
6251 | unresolved = [f for f in ms if ms[f] == 'u'] | |
6252 |
|
6252 | |||
6253 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
6253 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
6254 |
|
6254 | |||
6255 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), |
|
6255 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), | |
6256 | (ui.label(_('%d added'), 'status.added'), status.added), |
|
6256 | (ui.label(_('%d added'), 'status.added'), status.added), | |
6257 | (ui.label(_('%d removed'), 'status.removed'), status.removed), |
|
6257 | (ui.label(_('%d removed'), 'status.removed'), status.removed), | |
6258 | (ui.label(_('%d renamed'), 'status.copied'), renamed), |
|
6258 | (ui.label(_('%d renamed'), 'status.copied'), renamed), | |
6259 | (ui.label(_('%d copied'), 'status.copied'), copied), |
|
6259 | (ui.label(_('%d copied'), 'status.copied'), copied), | |
6260 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), |
|
6260 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), | |
6261 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), |
|
6261 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), | |
6262 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), |
|
6262 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), | |
6263 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] |
|
6263 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] | |
6264 | t = [] |
|
6264 | t = [] | |
6265 | for l, s in labels: |
|
6265 | for l, s in labels: | |
6266 | if s: |
|
6266 | if s: | |
6267 | t.append(l % len(s)) |
|
6267 | t.append(l % len(s)) | |
6268 |
|
6268 | |||
6269 | t = ', '.join(t) |
|
6269 | t = ', '.join(t) | |
6270 | cleanworkdir = False |
|
6270 | cleanworkdir = False | |
6271 |
|
6271 | |||
6272 | if repo.vfs.exists('updatestate'): |
|
6272 | if repo.vfs.exists('updatestate'): | |
6273 | t += _(' (interrupted update)') |
|
6273 | t += _(' (interrupted update)') | |
6274 | elif len(parents) > 1: |
|
6274 | elif len(parents) > 1: | |
6275 | t += _(' (merge)') |
|
6275 | t += _(' (merge)') | |
6276 | elif branch != parents[0].branch(): |
|
6276 | elif branch != parents[0].branch(): | |
6277 | t += _(' (new branch)') |
|
6277 | t += _(' (new branch)') | |
6278 | elif (parents[0].closesbranch() and |
|
6278 | elif (parents[0].closesbranch() and | |
6279 | pnode in repo.branchheads(branch, closed=True)): |
|
6279 | pnode in repo.branchheads(branch, closed=True)): | |
6280 | t += _(' (head closed)') |
|
6280 | t += _(' (head closed)') | |
6281 | elif not (status.modified or status.added or status.removed or renamed or |
|
6281 | elif not (status.modified or status.added or status.removed or renamed or | |
6282 | copied or subs): |
|
6282 | copied or subs): | |
6283 | t += _(' (clean)') |
|
6283 | t += _(' (clean)') | |
6284 | cleanworkdir = True |
|
6284 | cleanworkdir = True | |
6285 | elif pnode not in bheads: |
|
6285 | elif pnode not in bheads: | |
6286 | t += _(' (new branch head)') |
|
6286 | t += _(' (new branch head)') | |
6287 |
|
6287 | |||
6288 | if parents: |
|
6288 | if parents: | |
6289 | pendingphase = max(p.phase() for p in parents) |
|
6289 | pendingphase = max(p.phase() for p in parents) | |
6290 | else: |
|
6290 | else: | |
6291 | pendingphase = phases.public |
|
6291 | pendingphase = phases.public | |
6292 |
|
6292 | |||
6293 | if pendingphase > phases.newcommitphase(ui): |
|
6293 | if pendingphase > phases.newcommitphase(ui): | |
6294 | t += ' (%s)' % phases.phasenames[pendingphase] |
|
6294 | t += ' (%s)' % phases.phasenames[pendingphase] | |
6295 |
|
6295 | |||
6296 | if cleanworkdir: |
|
6296 | if cleanworkdir: | |
6297 | # i18n: column positioning for "hg summary" |
|
6297 | # i18n: column positioning for "hg summary" | |
6298 | ui.status(_('commit: %s\n') % t.strip()) |
|
6298 | ui.status(_('commit: %s\n') % t.strip()) | |
6299 | else: |
|
6299 | else: | |
6300 | # i18n: column positioning for "hg summary" |
|
6300 | # i18n: column positioning for "hg summary" | |
6301 | ui.write(_('commit: %s\n') % t.strip()) |
|
6301 | ui.write(_('commit: %s\n') % t.strip()) | |
6302 |
|
6302 | |||
6303 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
6303 | # all ancestors of branch heads - all ancestors of parent = new csets | |
6304 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], |
|
6304 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], | |
6305 | bheads)) |
|
6305 | bheads)) | |
6306 |
|
6306 | |||
6307 | if new == 0: |
|
6307 | if new == 0: | |
6308 | # i18n: column positioning for "hg summary" |
|
6308 | # i18n: column positioning for "hg summary" | |
6309 | ui.status(_('update: (current)\n')) |
|
6309 | ui.status(_('update: (current)\n')) | |
6310 | elif pnode not in bheads: |
|
6310 | elif pnode not in bheads: | |
6311 | # i18n: column positioning for "hg summary" |
|
6311 | # i18n: column positioning for "hg summary" | |
6312 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
6312 | ui.write(_('update: %d new changesets (update)\n') % new) | |
6313 | else: |
|
6313 | else: | |
6314 | # i18n: column positioning for "hg summary" |
|
6314 | # i18n: column positioning for "hg summary" | |
6315 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
6315 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
6316 | (new, len(bheads))) |
|
6316 | (new, len(bheads))) | |
6317 |
|
6317 | |||
6318 | t = [] |
|
6318 | t = [] | |
6319 | draft = len(repo.revs('draft()')) |
|
6319 | draft = len(repo.revs('draft()')) | |
6320 | if draft: |
|
6320 | if draft: | |
6321 | t.append(_('%d draft') % draft) |
|
6321 | t.append(_('%d draft') % draft) | |
6322 | secret = len(repo.revs('secret()')) |
|
6322 | secret = len(repo.revs('secret()')) | |
6323 | if secret: |
|
6323 | if secret: | |
6324 | t.append(_('%d secret') % secret) |
|
6324 | t.append(_('%d secret') % secret) | |
6325 |
|
6325 | |||
6326 | if draft or secret: |
|
6326 | if draft or secret: | |
6327 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
6327 | ui.status(_('phases: %s\n') % ', '.join(t)) | |
6328 |
|
6328 | |||
6329 | cmdutil.summaryhooks(ui, repo) |
|
6329 | cmdutil.summaryhooks(ui, repo) | |
6330 |
|
6330 | |||
6331 | if opts.get('remote'): |
|
6331 | if opts.get('remote'): | |
6332 | needsincoming, needsoutgoing = True, True |
|
6332 | needsincoming, needsoutgoing = True, True | |
6333 | else: |
|
6333 | else: | |
6334 | needsincoming, needsoutgoing = False, False |
|
6334 | needsincoming, needsoutgoing = False, False | |
6335 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
6335 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): | |
6336 | if i: |
|
6336 | if i: | |
6337 | needsincoming = True |
|
6337 | needsincoming = True | |
6338 | if o: |
|
6338 | if o: | |
6339 | needsoutgoing = True |
|
6339 | needsoutgoing = True | |
6340 | if not needsincoming and not needsoutgoing: |
|
6340 | if not needsincoming and not needsoutgoing: | |
6341 | return |
|
6341 | return | |
6342 |
|
6342 | |||
6343 | def getincoming(): |
|
6343 | def getincoming(): | |
6344 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
6344 | source, branches = hg.parseurl(ui.expandpath('default')) | |
6345 | sbranch = branches[0] |
|
6345 | sbranch = branches[0] | |
6346 | try: |
|
6346 | try: | |
6347 | other = hg.peer(repo, {}, source) |
|
6347 | other = hg.peer(repo, {}, source) | |
6348 | except error.RepoError: |
|
6348 | except error.RepoError: | |
6349 | if opts.get('remote'): |
|
6349 | if opts.get('remote'): | |
6350 | raise |
|
6350 | raise | |
6351 | return source, sbranch, None, None, None |
|
6351 | return source, sbranch, None, None, None | |
6352 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
6352 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
6353 | if revs: |
|
6353 | if revs: | |
6354 | revs = [other.lookup(rev) for rev in revs] |
|
6354 | revs = [other.lookup(rev) for rev in revs] | |
6355 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
6355 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
6356 | repo.ui.pushbuffer() |
|
6356 | repo.ui.pushbuffer() | |
6357 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
6357 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
6358 | repo.ui.popbuffer() |
|
6358 | repo.ui.popbuffer() | |
6359 | return source, sbranch, other, commoninc, commoninc[1] |
|
6359 | return source, sbranch, other, commoninc, commoninc[1] | |
6360 |
|
6360 | |||
6361 | if needsincoming: |
|
6361 | if needsincoming: | |
6362 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
6362 | source, sbranch, sother, commoninc, incoming = getincoming() | |
6363 | else: |
|
6363 | else: | |
6364 | source = sbranch = sother = commoninc = incoming = None |
|
6364 | source = sbranch = sother = commoninc = incoming = None | |
6365 |
|
6365 | |||
6366 | def getoutgoing(): |
|
6366 | def getoutgoing(): | |
6367 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
6367 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
6368 | dbranch = branches[0] |
|
6368 | dbranch = branches[0] | |
6369 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
6369 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
6370 | if source != dest: |
|
6370 | if source != dest: | |
6371 | try: |
|
6371 | try: | |
6372 | dother = hg.peer(repo, {}, dest) |
|
6372 | dother = hg.peer(repo, {}, dest) | |
6373 | except error.RepoError: |
|
6373 | except error.RepoError: | |
6374 | if opts.get('remote'): |
|
6374 | if opts.get('remote'): | |
6375 | raise |
|
6375 | raise | |
6376 | return dest, dbranch, None, None |
|
6376 | return dest, dbranch, None, None | |
6377 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
6377 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
6378 | elif sother is None: |
|
6378 | elif sother is None: | |
6379 | # there is no explicit destination peer, but source one is invalid |
|
6379 | # there is no explicit destination peer, but source one is invalid | |
6380 | return dest, dbranch, None, None |
|
6380 | return dest, dbranch, None, None | |
6381 | else: |
|
6381 | else: | |
6382 | dother = sother |
|
6382 | dother = sother | |
6383 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
6383 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
6384 | common = None |
|
6384 | common = None | |
6385 | else: |
|
6385 | else: | |
6386 | common = commoninc |
|
6386 | common = commoninc | |
6387 | if revs: |
|
6387 | if revs: | |
6388 | revs = [repo.lookup(rev) for rev in revs] |
|
6388 | revs = [repo.lookup(rev) for rev in revs] | |
6389 | repo.ui.pushbuffer() |
|
6389 | repo.ui.pushbuffer() | |
6390 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, |
|
6390 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, | |
6391 | commoninc=common) |
|
6391 | commoninc=common) | |
6392 | repo.ui.popbuffer() |
|
6392 | repo.ui.popbuffer() | |
6393 | return dest, dbranch, dother, outgoing |
|
6393 | return dest, dbranch, dother, outgoing | |
6394 |
|
6394 | |||
6395 | if needsoutgoing: |
|
6395 | if needsoutgoing: | |
6396 | dest, dbranch, dother, outgoing = getoutgoing() |
|
6396 | dest, dbranch, dother, outgoing = getoutgoing() | |
6397 | else: |
|
6397 | else: | |
6398 | dest = dbranch = dother = outgoing = None |
|
6398 | dest = dbranch = dother = outgoing = None | |
6399 |
|
6399 | |||
6400 | if opts.get('remote'): |
|
6400 | if opts.get('remote'): | |
6401 | t = [] |
|
6401 | t = [] | |
6402 | if incoming: |
|
6402 | if incoming: | |
6403 | t.append(_('1 or more incoming')) |
|
6403 | t.append(_('1 or more incoming')) | |
6404 | o = outgoing.missing |
|
6404 | o = outgoing.missing | |
6405 | if o: |
|
6405 | if o: | |
6406 | t.append(_('%d outgoing') % len(o)) |
|
6406 | t.append(_('%d outgoing') % len(o)) | |
6407 | other = dother or sother |
|
6407 | other = dother or sother | |
6408 | if 'bookmarks' in other.listkeys('namespaces'): |
|
6408 | if 'bookmarks' in other.listkeys('namespaces'): | |
6409 | counts = bookmarks.summary(repo, other) |
|
6409 | counts = bookmarks.summary(repo, other) | |
6410 | if counts[0] > 0: |
|
6410 | if counts[0] > 0: | |
6411 | t.append(_('%d incoming bookmarks') % counts[0]) |
|
6411 | t.append(_('%d incoming bookmarks') % counts[0]) | |
6412 | if counts[1] > 0: |
|
6412 | if counts[1] > 0: | |
6413 | t.append(_('%d outgoing bookmarks') % counts[1]) |
|
6413 | t.append(_('%d outgoing bookmarks') % counts[1]) | |
6414 |
|
6414 | |||
6415 | if t: |
|
6415 | if t: | |
6416 | # i18n: column positioning for "hg summary" |
|
6416 | # i18n: column positioning for "hg summary" | |
6417 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
6417 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
6418 | else: |
|
6418 | else: | |
6419 | # i18n: column positioning for "hg summary" |
|
6419 | # i18n: column positioning for "hg summary" | |
6420 | ui.status(_('remote: (synced)\n')) |
|
6420 | ui.status(_('remote: (synced)\n')) | |
6421 |
|
6421 | |||
6422 | cmdutil.summaryremotehooks(ui, repo, opts, |
|
6422 | cmdutil.summaryremotehooks(ui, repo, opts, | |
6423 | ((source, sbranch, sother, commoninc), |
|
6423 | ((source, sbranch, sother, commoninc), | |
6424 | (dest, dbranch, dother, outgoing))) |
|
6424 | (dest, dbranch, dother, outgoing))) | |
6425 |
|
6425 | |||
6426 | @command('tag', |
|
6426 | @command('tag', | |
6427 | [('f', 'force', None, _('force tag')), |
|
6427 | [('f', 'force', None, _('force tag')), | |
6428 | ('l', 'local', None, _('make the tag local')), |
|
6428 | ('l', 'local', None, _('make the tag local')), | |
6429 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
6429 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
6430 | ('', 'remove', None, _('remove a tag')), |
|
6430 | ('', 'remove', None, _('remove a tag')), | |
6431 | # -l/--local is already there, commitopts cannot be used |
|
6431 | # -l/--local is already there, commitopts cannot be used | |
6432 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
6432 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
6433 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), |
|
6433 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), | |
6434 | ] + commitopts2, |
|
6434 | ] + commitopts2, | |
6435 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
6435 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
6436 | def tag(ui, repo, name1, *names, **opts): |
|
6436 | def tag(ui, repo, name1, *names, **opts): | |
6437 | """add one or more tags for the current or given revision |
|
6437 | """add one or more tags for the current or given revision | |
6438 |
|
6438 | |||
6439 | Name a particular revision using <name>. |
|
6439 | Name a particular revision using <name>. | |
6440 |
|
6440 | |||
6441 | Tags are used to name particular revisions of the repository and are |
|
6441 | Tags are used to name particular revisions of the repository and are | |
6442 | very useful to compare different revisions, to go back to significant |
|
6442 | very useful to compare different revisions, to go back to significant | |
6443 | earlier versions or to mark branch points as releases, etc. Changing |
|
6443 | earlier versions or to mark branch points as releases, etc. Changing | |
6444 | an existing tag is normally disallowed; use -f/--force to override. |
|
6444 | an existing tag is normally disallowed; use -f/--force to override. | |
6445 |
|
6445 | |||
6446 | If no revision is given, the parent of the working directory is |
|
6446 | If no revision is given, the parent of the working directory is | |
6447 | used. |
|
6447 | used. | |
6448 |
|
6448 | |||
6449 | To facilitate version control, distribution, and merging of tags, |
|
6449 | To facilitate version control, distribution, and merging of tags, | |
6450 | they are stored as a file named ".hgtags" which is managed similarly |
|
6450 | they are stored as a file named ".hgtags" which is managed similarly | |
6451 | to other project files and can be hand-edited if necessary. This |
|
6451 | to other project files and can be hand-edited if necessary. This | |
6452 | also means that tagging creates a new commit. The file |
|
6452 | also means that tagging creates a new commit. The file | |
6453 | ".hg/localtags" is used for local tags (not shared among |
|
6453 | ".hg/localtags" is used for local tags (not shared among | |
6454 | repositories). |
|
6454 | repositories). | |
6455 |
|
6455 | |||
6456 | Tag commits are usually made at the head of a branch. If the parent |
|
6456 | Tag commits are usually made at the head of a branch. If the parent | |
6457 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
6457 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
6458 | -f/--force to force the tag commit to be based on a non-head |
|
6458 | -f/--force to force the tag commit to be based on a non-head | |
6459 | changeset. |
|
6459 | changeset. | |
6460 |
|
6460 | |||
6461 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
6461 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
6462 |
|
6462 | |||
6463 | Since tag names have priority over branch names during revision |
|
6463 | Since tag names have priority over branch names during revision | |
6464 | lookup, using an existing branch name as a tag name is discouraged. |
|
6464 | lookup, using an existing branch name as a tag name is discouraged. | |
6465 |
|
6465 | |||
6466 | Returns 0 on success. |
|
6466 | Returns 0 on success. | |
6467 | """ |
|
6467 | """ | |
6468 | wlock = lock = None |
|
6468 | wlock = lock = None | |
6469 | try: |
|
6469 | try: | |
6470 | wlock = repo.wlock() |
|
6470 | wlock = repo.wlock() | |
6471 | lock = repo.lock() |
|
6471 | lock = repo.lock() | |
6472 | rev_ = "." |
|
6472 | rev_ = "." | |
6473 | names = [t.strip() for t in (name1,) + names] |
|
6473 | names = [t.strip() for t in (name1,) + names] | |
6474 | if len(names) != len(set(names)): |
|
6474 | if len(names) != len(set(names)): | |
6475 | raise error.Abort(_('tag names must be unique')) |
|
6475 | raise error.Abort(_('tag names must be unique')) | |
6476 | for n in names: |
|
6476 | for n in names: | |
6477 | scmutil.checknewlabel(repo, n, 'tag') |
|
6477 | scmutil.checknewlabel(repo, n, 'tag') | |
6478 | if not n: |
|
6478 | if not n: | |
6479 | raise error.Abort(_('tag names cannot consist entirely of ' |
|
6479 | raise error.Abort(_('tag names cannot consist entirely of ' | |
6480 | 'whitespace')) |
|
6480 | 'whitespace')) | |
6481 | if opts.get('rev') and opts.get('remove'): |
|
6481 | if opts.get('rev') and opts.get('remove'): | |
6482 | raise error.Abort(_("--rev and --remove are incompatible")) |
|
6482 | raise error.Abort(_("--rev and --remove are incompatible")) | |
6483 | if opts.get('rev'): |
|
6483 | if opts.get('rev'): | |
6484 | rev_ = opts['rev'] |
|
6484 | rev_ = opts['rev'] | |
6485 | message = opts.get('message') |
|
6485 | message = opts.get('message') | |
6486 | if opts.get('remove'): |
|
6486 | if opts.get('remove'): | |
6487 | if opts.get('local'): |
|
6487 | if opts.get('local'): | |
6488 | expectedtype = 'local' |
|
6488 | expectedtype = 'local' | |
6489 | else: |
|
6489 | else: | |
6490 | expectedtype = 'global' |
|
6490 | expectedtype = 'global' | |
6491 |
|
6491 | |||
6492 | for n in names: |
|
6492 | for n in names: | |
6493 | if not repo.tagtype(n): |
|
6493 | if not repo.tagtype(n): | |
6494 | raise error.Abort(_("tag '%s' does not exist") % n) |
|
6494 | raise error.Abort(_("tag '%s' does not exist") % n) | |
6495 | if repo.tagtype(n) != expectedtype: |
|
6495 | if repo.tagtype(n) != expectedtype: | |
6496 | if expectedtype == 'global': |
|
6496 | if expectedtype == 'global': | |
6497 | raise error.Abort(_("tag '%s' is not a global tag") % n) |
|
6497 | raise error.Abort(_("tag '%s' is not a global tag") % n) | |
6498 | else: |
|
6498 | else: | |
6499 | raise error.Abort(_("tag '%s' is not a local tag") % n) |
|
6499 | raise error.Abort(_("tag '%s' is not a local tag") % n) | |
6500 | rev_ = 'null' |
|
6500 | rev_ = 'null' | |
6501 | if not message: |
|
6501 | if not message: | |
6502 | # we don't translate commit messages |
|
6502 | # we don't translate commit messages | |
6503 | message = 'Removed tag %s' % ', '.join(names) |
|
6503 | message = 'Removed tag %s' % ', '.join(names) | |
6504 | elif not opts.get('force'): |
|
6504 | elif not opts.get('force'): | |
6505 | for n in names: |
|
6505 | for n in names: | |
6506 | if n in repo.tags(): |
|
6506 | if n in repo.tags(): | |
6507 | raise error.Abort(_("tag '%s' already exists " |
|
6507 | raise error.Abort(_("tag '%s' already exists " | |
6508 | "(use -f to force)") % n) |
|
6508 | "(use -f to force)") % n) | |
6509 | if not opts.get('local'): |
|
6509 | if not opts.get('local'): | |
6510 | p1, p2 = repo.dirstate.parents() |
|
6510 | p1, p2 = repo.dirstate.parents() | |
6511 | if p2 != nullid: |
|
6511 | if p2 != nullid: | |
6512 | raise error.Abort(_('uncommitted merge')) |
|
6512 | raise error.Abort(_('uncommitted merge')) | |
6513 | bheads = repo.branchheads() |
|
6513 | bheads = repo.branchheads() | |
6514 | if not opts.get('force') and bheads and p1 not in bheads: |
|
6514 | if not opts.get('force') and bheads and p1 not in bheads: | |
6515 | raise error.Abort(_('not at a branch head (use -f to force)')) |
|
6515 | raise error.Abort(_('not at a branch head (use -f to force)')) | |
6516 | r = scmutil.revsingle(repo, rev_).node() |
|
6516 | r = scmutil.revsingle(repo, rev_).node() | |
6517 |
|
6517 | |||
6518 | if not message: |
|
6518 | if not message: | |
6519 | # we don't translate commit messages |
|
6519 | # we don't translate commit messages | |
6520 | message = ('Added tag %s for changeset %s' % |
|
6520 | message = ('Added tag %s for changeset %s' % | |
6521 | (', '.join(names), short(r))) |
|
6521 | (', '.join(names), short(r))) | |
6522 |
|
6522 | |||
6523 | date = opts.get('date') |
|
6523 | date = opts.get('date') | |
6524 | if date: |
|
6524 | if date: | |
6525 | date = util.parsedate(date) |
|
6525 | date = util.parsedate(date) | |
6526 |
|
6526 | |||
6527 | if opts.get('remove'): |
|
6527 | if opts.get('remove'): | |
6528 | editform = 'tag.remove' |
|
6528 | editform = 'tag.remove' | |
6529 | else: |
|
6529 | else: | |
6530 | editform = 'tag.add' |
|
6530 | editform = 'tag.add' | |
6531 | editor = cmdutil.getcommiteditor(editform=editform, **opts) |
|
6531 | editor = cmdutil.getcommiteditor(editform=editform, **opts) | |
6532 |
|
6532 | |||
6533 | # don't allow tagging the null rev |
|
6533 | # don't allow tagging the null rev | |
6534 | if (not opts.get('remove') and |
|
6534 | if (not opts.get('remove') and | |
6535 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
6535 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
6536 | raise error.Abort(_("cannot tag null revision")) |
|
6536 | raise error.Abort(_("cannot tag null revision")) | |
6537 |
|
6537 | |||
6538 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date, |
|
6538 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date, | |
6539 | editor=editor) |
|
6539 | editor=editor) | |
6540 | finally: |
|
6540 | finally: | |
6541 | release(lock, wlock) |
|
6541 | release(lock, wlock) | |
6542 |
|
6542 | |||
6543 | @command('tags', formatteropts, '') |
|
6543 | @command('tags', formatteropts, '') | |
6544 | def tags(ui, repo, **opts): |
|
6544 | def tags(ui, repo, **opts): | |
6545 | """list repository tags |
|
6545 | """list repository tags | |
6546 |
|
6546 | |||
6547 | This lists both regular and local tags. When the -v/--verbose |
|
6547 | This lists both regular and local tags. When the -v/--verbose | |
6548 | switch is used, a third column "local" is printed for local tags. |
|
6548 | switch is used, a third column "local" is printed for local tags. | |
6549 |
|
6549 | |||
6550 | Returns 0 on success. |
|
6550 | Returns 0 on success. | |
6551 | """ |
|
6551 | """ | |
6552 |
|
6552 | |||
6553 | fm = ui.formatter('tags', opts) |
|
6553 | fm = ui.formatter('tags', opts) | |
6554 | hexfunc = fm.hexfunc |
|
6554 | hexfunc = fm.hexfunc | |
6555 | tagtype = "" |
|
6555 | tagtype = "" | |
6556 |
|
6556 | |||
6557 | for t, n in reversed(repo.tagslist()): |
|
6557 | for t, n in reversed(repo.tagslist()): | |
6558 | hn = hexfunc(n) |
|
6558 | hn = hexfunc(n) | |
6559 | label = 'tags.normal' |
|
6559 | label = 'tags.normal' | |
6560 | tagtype = '' |
|
6560 | tagtype = '' | |
6561 | if repo.tagtype(t) == 'local': |
|
6561 | if repo.tagtype(t) == 'local': | |
6562 | label = 'tags.local' |
|
6562 | label = 'tags.local' | |
6563 | tagtype = 'local' |
|
6563 | tagtype = 'local' | |
6564 |
|
6564 | |||
6565 | fm.startitem() |
|
6565 | fm.startitem() | |
6566 | fm.write('tag', '%s', t, label=label) |
|
6566 | fm.write('tag', '%s', t, label=label) | |
6567 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
6567 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
6568 | fm.condwrite(not ui.quiet, 'rev node', fmt, |
|
6568 | fm.condwrite(not ui.quiet, 'rev node', fmt, | |
6569 | repo.changelog.rev(n), hn, label=label) |
|
6569 | repo.changelog.rev(n), hn, label=label) | |
6570 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
6570 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
6571 | tagtype, label=label) |
|
6571 | tagtype, label=label) | |
6572 | fm.plain('\n') |
|
6572 | fm.plain('\n') | |
6573 | fm.end() |
|
6573 | fm.end() | |
6574 |
|
6574 | |||
6575 | @command('tip', |
|
6575 | @command('tip', | |
6576 | [('p', 'patch', None, _('show patch')), |
|
6576 | [('p', 'patch', None, _('show patch')), | |
6577 | ('g', 'git', None, _('use git extended diff format')), |
|
6577 | ('g', 'git', None, _('use git extended diff format')), | |
6578 | ] + templateopts, |
|
6578 | ] + templateopts, | |
6579 | _('[-p] [-g]')) |
|
6579 | _('[-p] [-g]')) | |
6580 | def tip(ui, repo, **opts): |
|
6580 | def tip(ui, repo, **opts): | |
6581 | """show the tip revision (DEPRECATED) |
|
6581 | """show the tip revision (DEPRECATED) | |
6582 |
|
6582 | |||
6583 | The tip revision (usually just called the tip) is the changeset |
|
6583 | The tip revision (usually just called the tip) is the changeset | |
6584 | most recently added to the repository (and therefore the most |
|
6584 | most recently added to the repository (and therefore the most | |
6585 | recently changed head). |
|
6585 | recently changed head). | |
6586 |
|
6586 | |||
6587 | If you have just made a commit, that commit will be the tip. If |
|
6587 | If you have just made a commit, that commit will be the tip. If | |
6588 | you have just pulled changes from another repository, the tip of |
|
6588 | you have just pulled changes from another repository, the tip of | |
6589 | that repository becomes the current tip. The "tip" tag is special |
|
6589 | that repository becomes the current tip. The "tip" tag is special | |
6590 | and cannot be renamed or assigned to a different changeset. |
|
6590 | and cannot be renamed or assigned to a different changeset. | |
6591 |
|
6591 | |||
6592 | This command is deprecated, please use :hg:`heads` instead. |
|
6592 | This command is deprecated, please use :hg:`heads` instead. | |
6593 |
|
6593 | |||
6594 | Returns 0 on success. |
|
6594 | Returns 0 on success. | |
6595 | """ |
|
6595 | """ | |
6596 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
6596 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
6597 | displayer.show(repo['tip']) |
|
6597 | displayer.show(repo['tip']) | |
6598 | displayer.close() |
|
6598 | displayer.close() | |
6599 |
|
6599 | |||
6600 | @command('unbundle', |
|
6600 | @command('unbundle', | |
6601 | [('u', 'update', None, |
|
6601 | [('u', 'update', None, | |
6602 | _('update to new branch head if changesets were unbundled'))], |
|
6602 | _('update to new branch head if changesets were unbundled'))], | |
6603 | _('[-u] FILE...')) |
|
6603 | _('[-u] FILE...')) | |
6604 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
6604 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
6605 | """apply one or more changegroup files |
|
6605 | """apply one or more changegroup files | |
6606 |
|
6606 | |||
6607 | Apply one or more compressed changegroup files generated by the |
|
6607 | Apply one or more compressed changegroup files generated by the | |
6608 | bundle command. |
|
6608 | bundle command. | |
6609 |
|
6609 | |||
6610 | Returns 0 on success, 1 if an update has unresolved files. |
|
6610 | Returns 0 on success, 1 if an update has unresolved files. | |
6611 | """ |
|
6611 | """ | |
6612 | fnames = (fname1,) + fnames |
|
6612 | fnames = (fname1,) + fnames | |
6613 |
|
6613 | |||
6614 | lock = repo.lock() |
|
6614 | lock = repo.lock() | |
6615 | try: |
|
6615 | try: | |
6616 | for fname in fnames: |
|
6616 | for fname in fnames: | |
6617 | f = hg.openpath(ui, fname) |
|
6617 | f = hg.openpath(ui, fname) | |
6618 | gen = exchange.readbundle(ui, f, fname) |
|
6618 | gen = exchange.readbundle(ui, f, fname) | |
6619 | if isinstance(gen, bundle2.unbundle20): |
|
6619 | if isinstance(gen, bundle2.unbundle20): | |
6620 | tr = repo.transaction('unbundle') |
|
6620 | tr = repo.transaction('unbundle') | |
6621 | try: |
|
6621 | try: | |
6622 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', |
|
6622 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', | |
6623 | url='bundle:' + fname) |
|
6623 | url='bundle:' + fname) | |
6624 | tr.close() |
|
6624 | tr.close() | |
6625 | except error.BundleUnknownFeatureError as exc: |
|
6625 | except error.BundleUnknownFeatureError as exc: | |
6626 | raise error.Abort(_('%s: unknown bundle feature, %s') |
|
6626 | raise error.Abort(_('%s: unknown bundle feature, %s') | |
6627 | % (fname, exc), |
|
6627 | % (fname, exc), | |
6628 | hint=_("see https://mercurial-scm.org/" |
|
6628 | hint=_("see https://mercurial-scm.org/" | |
6629 | "wiki/BundleFeature for more " |
|
6629 | "wiki/BundleFeature for more " | |
6630 | "information")) |
|
6630 | "information")) | |
6631 | finally: |
|
6631 | finally: | |
6632 | if tr: |
|
6632 | if tr: | |
6633 | tr.release() |
|
6633 | tr.release() | |
6634 | changes = [r.get('return', 0) |
|
6634 | changes = [r.get('return', 0) | |
6635 | for r in op.records['changegroup']] |
|
6635 | for r in op.records['changegroup']] | |
6636 | modheads = changegroup.combineresults(changes) |
|
6636 | modheads = changegroup.combineresults(changes) | |
6637 | elif isinstance(gen, streamclone.streamcloneapplier): |
|
6637 | elif isinstance(gen, streamclone.streamcloneapplier): | |
6638 | raise error.Abort( |
|
6638 | raise error.Abort( | |
6639 | _('packed bundles cannot be applied with ' |
|
6639 | _('packed bundles cannot be applied with ' | |
6640 | '"hg unbundle"'), |
|
6640 | '"hg unbundle"'), | |
6641 | hint=_('use "hg debugapplystreamclonebundle"')) |
|
6641 | hint=_('use "hg debugapplystreamclonebundle"')) | |
6642 | else: |
|
6642 | else: | |
6643 | modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname) |
|
6643 | modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname) | |
6644 | finally: |
|
6644 | finally: | |
6645 | lock.release() |
|
6645 | lock.release() | |
6646 |
|
6646 | |||
6647 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
6647 | return postincoming(ui, repo, modheads, opts.get('update'), None) | |
6648 |
|
6648 | |||
6649 | @command('^update|up|checkout|co', |
|
6649 | @command('^update|up|checkout|co', | |
6650 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
6650 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
6651 | ('c', 'check', None, |
|
6651 | ('c', 'check', None, | |
6652 | _('update across branches if no uncommitted changes')), |
|
6652 | _('update across branches if no uncommitted changes')), | |
6653 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
6653 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
6654 | ('r', 'rev', '', _('revision'), _('REV')) |
|
6654 | ('r', 'rev', '', _('revision'), _('REV')) | |
6655 | ] + mergetoolopts, |
|
6655 | ] + mergetoolopts, | |
6656 | _('[-c] [-C] [-d DATE] [[-r] REV]')) |
|
6656 | _('[-c] [-C] [-d DATE] [[-r] REV]')) | |
6657 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, |
|
6657 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, | |
6658 | tool=None): |
|
6658 | tool=None): | |
6659 | """update working directory (or switch revisions) |
|
6659 | """update working directory (or switch revisions) | |
6660 |
|
6660 | |||
6661 | Update the repository's working directory to the specified |
|
6661 | Update the repository's working directory to the specified | |
6662 | changeset. If no changeset is specified, update to the tip of the |
|
6662 | changeset. If no changeset is specified, update to the tip of the | |
6663 | current named branch and move the active bookmark (see :hg:`help |
|
6663 | current named branch and move the active bookmark (see :hg:`help | |
6664 | bookmarks`). |
|
6664 | bookmarks`). | |
6665 |
|
6665 | |||
6666 | Update sets the working directory's parent revision to the specified |
|
6666 | Update sets the working directory's parent revision to the specified | |
6667 | changeset (see :hg:`help parents`). |
|
6667 | changeset (see :hg:`help parents`). | |
6668 |
|
6668 | |||
6669 | If the changeset is not a descendant or ancestor of the working |
|
6669 | If the changeset is not a descendant or ancestor of the working | |
6670 | directory's parent, the update is aborted. With the -c/--check |
|
6670 | directory's parent, the update is aborted. With the -c/--check | |
6671 | option, the working directory is checked for uncommitted changes; if |
|
6671 | option, the working directory is checked for uncommitted changes; if | |
6672 | none are found, the working directory is updated to the specified |
|
6672 | none are found, the working directory is updated to the specified | |
6673 | changeset. |
|
6673 | changeset. | |
6674 |
|
6674 | |||
6675 | .. container:: verbose |
|
6675 | .. container:: verbose | |
6676 |
|
6676 | |||
6677 | The following rules apply when the working directory contains |
|
6677 | The following rules apply when the working directory contains | |
6678 | uncommitted changes: |
|
6678 | uncommitted changes: | |
6679 |
|
6679 | |||
6680 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
6680 | 1. If neither -c/--check nor -C/--clean is specified, and if | |
6681 | the requested changeset is an ancestor or descendant of |
|
6681 | the requested changeset is an ancestor or descendant of | |
6682 | the working directory's parent, the uncommitted changes |
|
6682 | the working directory's parent, the uncommitted changes | |
6683 | are merged into the requested changeset and the merged |
|
6683 | are merged into the requested changeset and the merged | |
6684 | result is left uncommitted. If the requested changeset is |
|
6684 | result is left uncommitted. If the requested changeset is | |
6685 | not an ancestor or descendant (that is, it is on another |
|
6685 | not an ancestor or descendant (that is, it is on another | |
6686 | branch), the update is aborted and the uncommitted changes |
|
6686 | branch), the update is aborted and the uncommitted changes | |
6687 | are preserved. |
|
6687 | are preserved. | |
6688 |
|
6688 | |||
6689 | 2. With the -c/--check option, the update is aborted and the |
|
6689 | 2. With the -c/--check option, the update is aborted and the | |
6690 | uncommitted changes are preserved. |
|
6690 | uncommitted changes are preserved. | |
6691 |
|
6691 | |||
6692 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
6692 | 3. With the -C/--clean option, uncommitted changes are discarded and | |
6693 | the working directory is updated to the requested changeset. |
|
6693 | the working directory is updated to the requested changeset. | |
6694 |
|
6694 | |||
6695 | To cancel an uncommitted merge (and lose your changes), use |
|
6695 | To cancel an uncommitted merge (and lose your changes), use | |
6696 | :hg:`update --clean .`. |
|
6696 | :hg:`update --clean .`. | |
6697 |
|
6697 | |||
6698 | Use null as the changeset to remove the working directory (like |
|
6698 | Use null as the changeset to remove the working directory (like | |
6699 | :hg:`clone -U`). |
|
6699 | :hg:`clone -U`). | |
6700 |
|
6700 | |||
6701 | If you want to revert just one file to an older revision, use |
|
6701 | If you want to revert just one file to an older revision, use | |
6702 | :hg:`revert [-r REV] NAME`. |
|
6702 | :hg:`revert [-r REV] NAME`. | |
6703 |
|
6703 | |||
6704 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
6704 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
6705 |
|
6705 | |||
6706 | Returns 0 on success, 1 if there are unresolved files. |
|
6706 | Returns 0 on success, 1 if there are unresolved files. | |
6707 | """ |
|
6707 | """ | |
6708 | movemarkfrom = None |
|
6708 | movemarkfrom = None | |
6709 | if rev and node: |
|
6709 | if rev and node: | |
6710 | raise error.Abort(_("please specify just one revision")) |
|
6710 | raise error.Abort(_("please specify just one revision")) | |
6711 |
|
6711 | |||
6712 | if rev is None or rev == '': |
|
6712 | if rev is None or rev == '': | |
6713 | rev = node |
|
6713 | rev = node | |
6714 |
|
6714 | |||
6715 | wlock = repo.wlock() |
|
6715 | wlock = repo.wlock() | |
6716 | try: |
|
6716 | try: | |
6717 | cmdutil.clearunfinished(repo) |
|
6717 | cmdutil.clearunfinished(repo) | |
6718 |
|
6718 | |||
6719 | if date: |
|
6719 | if date: | |
6720 | if rev is not None: |
|
6720 | if rev is not None: | |
6721 | raise error.Abort(_("you can't specify a revision and a date")) |
|
6721 | raise error.Abort(_("you can't specify a revision and a date")) | |
6722 | rev = cmdutil.finddate(ui, repo, date) |
|
6722 | rev = cmdutil.finddate(ui, repo, date) | |
6723 |
|
6723 | |||
6724 | # if we defined a bookmark, we have to remember the original name |
|
6724 | # if we defined a bookmark, we have to remember the original name | |
6725 | brev = rev |
|
6725 | brev = rev | |
6726 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
6726 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
6727 |
|
6727 | |||
6728 | if check and clean: |
|
6728 | if check and clean: | |
6729 | raise error.Abort(_("cannot specify both -c/--check and -C/--clean") |
|
6729 | raise error.Abort(_("cannot specify both -c/--check and -C/--clean") | |
6730 | ) |
|
6730 | ) | |
6731 |
|
6731 | |||
6732 | if check: |
|
6732 | if check: | |
6733 | cmdutil.bailifchanged(repo, merge=False) |
|
6733 | cmdutil.bailifchanged(repo, merge=False) | |
6734 | if rev is None: |
|
6734 | if rev is None: | |
6735 | updata = destutil.destupdate(repo, clean=clean, check=check) |
|
6735 | updata = destutil.destupdate(repo, clean=clean, check=check) | |
6736 | rev, movemarkfrom, brev = updata |
|
6736 | rev, movemarkfrom, brev = updata | |
6737 |
|
6737 | |||
6738 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
|
6738 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') | |
6739 |
|
6739 | |||
6740 | if clean: |
|
6740 | if clean: | |
6741 | ret = hg.clean(repo, rev) |
|
6741 | ret = hg.clean(repo, rev) | |
6742 | else: |
|
6742 | else: | |
6743 | ret = hg.update(repo, rev) |
|
6743 | ret = hg.update(repo, rev) | |
6744 |
|
6744 | |||
6745 | if not ret and movemarkfrom: |
|
6745 | if not ret and movemarkfrom: | |
6746 | if movemarkfrom == repo['.'].node(): |
|
6746 | if movemarkfrom == repo['.'].node(): | |
6747 | pass # no-op update |
|
6747 | pass # no-op update | |
6748 | elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
6748 | elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
6749 | ui.status(_("updating bookmark %s\n") % repo._activebookmark) |
|
6749 | ui.status(_("updating bookmark %s\n") % repo._activebookmark) | |
6750 | else: |
|
6750 | else: | |
6751 | # this can happen with a non-linear update |
|
6751 | # this can happen with a non-linear update | |
6752 | ui.status(_("(leaving bookmark %s)\n") % |
|
6752 | ui.status(_("(leaving bookmark %s)\n") % | |
6753 | repo._activebookmark) |
|
6753 | repo._activebookmark) | |
6754 | bookmarks.deactivate(repo) |
|
6754 | bookmarks.deactivate(repo) | |
6755 | elif brev in repo._bookmarks: |
|
6755 | elif brev in repo._bookmarks: | |
6756 | bookmarks.activate(repo, brev) |
|
6756 | bookmarks.activate(repo, brev) | |
6757 | ui.status(_("(activating bookmark %s)\n") % brev) |
|
6757 | ui.status(_("(activating bookmark %s)\n") % brev) | |
6758 | elif brev: |
|
6758 | elif brev: | |
6759 | if repo._activebookmark: |
|
6759 | if repo._activebookmark: | |
6760 | ui.status(_("(leaving bookmark %s)\n") % |
|
6760 | ui.status(_("(leaving bookmark %s)\n") % | |
6761 | repo._activebookmark) |
|
6761 | repo._activebookmark) | |
6762 | bookmarks.deactivate(repo) |
|
6762 | bookmarks.deactivate(repo) | |
6763 | finally: |
|
6763 | finally: | |
6764 | wlock.release() |
|
6764 | wlock.release() | |
6765 |
|
6765 | |||
6766 | return ret |
|
6766 | return ret | |
6767 |
|
6767 | |||
6768 | @command('verify', []) |
|
6768 | @command('verify', []) | |
6769 | def verify(ui, repo): |
|
6769 | def verify(ui, repo): | |
6770 | """verify the integrity of the repository |
|
6770 | """verify the integrity of the repository | |
6771 |
|
6771 | |||
6772 | Verify the integrity of the current repository. |
|
6772 | Verify the integrity of the current repository. | |
6773 |
|
6773 | |||
6774 | This will perform an extensive check of the repository's |
|
6774 | This will perform an extensive check of the repository's | |
6775 | integrity, validating the hashes and checksums of each entry in |
|
6775 | integrity, validating the hashes and checksums of each entry in | |
6776 | the changelog, manifest, and tracked files, as well as the |
|
6776 | the changelog, manifest, and tracked files, as well as the | |
6777 | integrity of their crosslinks and indices. |
|
6777 | integrity of their crosslinks and indices. | |
6778 |
|
6778 | |||
6779 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption |
|
6779 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption | |
6780 | for more information about recovery from corruption of the |
|
6780 | for more information about recovery from corruption of the | |
6781 | repository. |
|
6781 | repository. | |
6782 |
|
6782 | |||
6783 | Returns 0 on success, 1 if errors are encountered. |
|
6783 | Returns 0 on success, 1 if errors are encountered. | |
6784 | """ |
|
6784 | """ | |
6785 | return hg.verify(repo) |
|
6785 | return hg.verify(repo) | |
6786 |
|
6786 | |||
6787 | @command('version', [], norepo=True) |
|
6787 | @command('version', [], norepo=True) | |
6788 | def version_(ui): |
|
6788 | def version_(ui): | |
6789 | """output version and copyright information""" |
|
6789 | """output version and copyright information""" | |
6790 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
6790 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | |
6791 | % util.version()) |
|
6791 | % util.version()) | |
6792 | ui.status(_( |
|
6792 | ui.status(_( | |
6793 | "(see https://mercurial-scm.org for more information)\n" |
|
6793 | "(see https://mercurial-scm.org for more information)\n" | |
6794 | "\nCopyright (C) 2005-2015 Matt Mackall and others\n" |
|
6794 | "\nCopyright (C) 2005-2015 Matt Mackall and others\n" | |
6795 | "This is free software; see the source for copying conditions. " |
|
6795 | "This is free software; see the source for copying conditions. " | |
6796 | "There is NO\nwarranty; " |
|
6796 | "There is NO\nwarranty; " | |
6797 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
6797 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
6798 | )) |
|
6798 | )) | |
6799 |
|
6799 | |||
6800 | ui.note(_("\nEnabled extensions:\n\n")) |
|
6800 | ui.note(_("\nEnabled extensions:\n\n")) | |
6801 | if ui.verbose: |
|
6801 | if ui.verbose: | |
6802 | # format names and versions into columns |
|
6802 | # format names and versions into columns | |
6803 | names = [] |
|
6803 | names = [] | |
6804 | vers = [] |
|
6804 | vers = [] | |
6805 | for name, module in extensions.extensions(): |
|
6805 | for name, module in extensions.extensions(): | |
6806 | names.append(name) |
|
6806 | names.append(name) | |
6807 | vers.append(extensions.moduleversion(module)) |
|
6807 | vers.append(extensions.moduleversion(module)) | |
6808 | if names: |
|
6808 | if names: | |
6809 | maxnamelen = max(len(n) for n in names) |
|
6809 | maxnamelen = max(len(n) for n in names) | |
6810 | for i, name in enumerate(names): |
|
6810 | for i, name in enumerate(names): | |
6811 | ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i])) |
|
6811 | ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i])) |
@@ -1,687 +1,687 b'' | |||||
1 | ========================== |
|
1 | ========================== | |
2 | Test rebase with obsolete |
|
2 | Test rebase with obsolete | |
3 | ========================== |
|
3 | ========================== | |
4 |
|
4 | |||
5 | Enable obsolete |
|
5 | Enable obsolete | |
6 |
|
6 | |||
7 | $ cat >> $HGRCPATH << EOF |
|
7 | $ cat >> $HGRCPATH << EOF | |
8 | > [ui] |
|
8 | > [ui] | |
9 | > logtemplate= {rev}:{node|short} {desc|firstline} |
|
9 | > logtemplate= {rev}:{node|short} {desc|firstline} | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 | > evolution=createmarkers,allowunstable |
|
11 | > evolution=createmarkers,allowunstable | |
12 | > [phases] |
|
12 | > [phases] | |
13 | > publish=False |
|
13 | > publish=False | |
14 | > [extensions] |
|
14 | > [extensions] | |
15 | > rebase= |
|
15 | > rebase= | |
16 | > EOF |
|
16 | > EOF | |
17 |
|
17 | |||
18 | Setup rebase canonical repo |
|
18 | Setup rebase canonical repo | |
19 |
|
19 | |||
20 | $ hg init base |
|
20 | $ hg init base | |
21 | $ cd base |
|
21 | $ cd base | |
22 | $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
|
22 | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | |
23 | adding changesets |
|
23 | adding changesets | |
24 | adding manifests |
|
24 | adding manifests | |
25 | adding file changes |
|
25 | adding file changes | |
26 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
26 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
27 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
27 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
28 | $ hg up tip |
|
28 | $ hg up tip | |
29 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 | $ hg log -G |
|
30 | $ hg log -G | |
31 | @ 7:02de42196ebe H |
|
31 | @ 7:02de42196ebe H | |
32 | | |
|
32 | | | |
33 | | o 6:eea13746799a G |
|
33 | | o 6:eea13746799a G | |
34 | |/| |
|
34 | |/| | |
35 | o | 5:24b6387c8c8c F |
|
35 | o | 5:24b6387c8c8c F | |
36 | | | |
|
36 | | | | |
37 | | o 4:9520eea781bc E |
|
37 | | o 4:9520eea781bc E | |
38 | |/ |
|
38 | |/ | |
39 | | o 3:32af7686d403 D |
|
39 | | o 3:32af7686d403 D | |
40 | | | |
|
40 | | | | |
41 | | o 2:5fddd98957c8 C |
|
41 | | o 2:5fddd98957c8 C | |
42 | | | |
|
42 | | | | |
43 | | o 1:42ccdea3bb16 B |
|
43 | | o 1:42ccdea3bb16 B | |
44 | |/ |
|
44 | |/ | |
45 | o 0:cd010b8cd998 A |
|
45 | o 0:cd010b8cd998 A | |
46 |
|
46 | |||
47 | $ cd .. |
|
47 | $ cd .. | |
48 |
|
48 | |||
49 | simple rebase |
|
49 | simple rebase | |
50 | --------------------------------- |
|
50 | --------------------------------- | |
51 |
|
51 | |||
52 | $ hg clone base simple |
|
52 | $ hg clone base simple | |
53 | updating to branch default |
|
53 | updating to branch default | |
54 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
54 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
55 | $ cd simple |
|
55 | $ cd simple | |
56 | $ hg up 32af7686d403 |
|
56 | $ hg up 32af7686d403 | |
57 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
57 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
58 | $ hg rebase -d eea13746799a |
|
58 | $ hg rebase -d eea13746799a | |
59 | rebasing 1:42ccdea3bb16 "B" |
|
59 | rebasing 1:42ccdea3bb16 "B" | |
60 | rebasing 2:5fddd98957c8 "C" |
|
60 | rebasing 2:5fddd98957c8 "C" | |
61 | rebasing 3:32af7686d403 "D" |
|
61 | rebasing 3:32af7686d403 "D" | |
62 | $ hg log -G |
|
62 | $ hg log -G | |
63 | @ 10:8eeb3c33ad33 D |
|
63 | @ 10:8eeb3c33ad33 D | |
64 | | |
|
64 | | | |
65 | o 9:2327fea05063 C |
|
65 | o 9:2327fea05063 C | |
66 | | |
|
66 | | | |
67 | o 8:e4e5be0395b2 B |
|
67 | o 8:e4e5be0395b2 B | |
68 | | |
|
68 | | | |
69 | | o 7:02de42196ebe H |
|
69 | | o 7:02de42196ebe H | |
70 | | | |
|
70 | | | | |
71 | o | 6:eea13746799a G |
|
71 | o | 6:eea13746799a G | |
72 | |\| |
|
72 | |\| | |
73 | | o 5:24b6387c8c8c F |
|
73 | | o 5:24b6387c8c8c F | |
74 | | | |
|
74 | | | | |
75 | o | 4:9520eea781bc E |
|
75 | o | 4:9520eea781bc E | |
76 | |/ |
|
76 | |/ | |
77 | o 0:cd010b8cd998 A |
|
77 | o 0:cd010b8cd998 A | |
78 |
|
78 | |||
79 | $ hg log --hidden -G |
|
79 | $ hg log --hidden -G | |
80 | @ 10:8eeb3c33ad33 D |
|
80 | @ 10:8eeb3c33ad33 D | |
81 | | |
|
81 | | | |
82 | o 9:2327fea05063 C |
|
82 | o 9:2327fea05063 C | |
83 | | |
|
83 | | | |
84 | o 8:e4e5be0395b2 B |
|
84 | o 8:e4e5be0395b2 B | |
85 | | |
|
85 | | | |
86 | | o 7:02de42196ebe H |
|
86 | | o 7:02de42196ebe H | |
87 | | | |
|
87 | | | | |
88 | o | 6:eea13746799a G |
|
88 | o | 6:eea13746799a G | |
89 | |\| |
|
89 | |\| | |
90 | | o 5:24b6387c8c8c F |
|
90 | | o 5:24b6387c8c8c F | |
91 | | | |
|
91 | | | | |
92 | o | 4:9520eea781bc E |
|
92 | o | 4:9520eea781bc E | |
93 | |/ |
|
93 | |/ | |
94 | | x 3:32af7686d403 D |
|
94 | | x 3:32af7686d403 D | |
95 | | | |
|
95 | | | | |
96 | | x 2:5fddd98957c8 C |
|
96 | | x 2:5fddd98957c8 C | |
97 | | | |
|
97 | | | | |
98 | | x 1:42ccdea3bb16 B |
|
98 | | x 1:42ccdea3bb16 B | |
99 | |/ |
|
99 | |/ | |
100 | o 0:cd010b8cd998 A |
|
100 | o 0:cd010b8cd998 A | |
101 |
|
101 | |||
102 | $ hg debugobsolete |
|
102 | $ hg debugobsolete | |
103 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (*) {'user': 'test'} (glob) |
|
103 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 e4e5be0395b2cbd471ed22a26b1b6a1a0658a794 0 (*) {'user': 'test'} (glob) | |
104 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 2327fea05063f39961b14cb69435a9898dc9a245 0 (*) {'user': 'test'} (glob) |
|
104 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 2327fea05063f39961b14cb69435a9898dc9a245 0 (*) {'user': 'test'} (glob) | |
105 | 32af7686d403cf45b5d95f2d70cebea587ac806a 8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (*) {'user': 'test'} (glob) |
|
105 | 32af7686d403cf45b5d95f2d70cebea587ac806a 8eeb3c33ad33d452c89e5dcf611c347f978fb42b 0 (*) {'user': 'test'} (glob) | |
106 |
|
106 | |||
107 |
|
107 | |||
108 | $ cd .. |
|
108 | $ cd .. | |
109 |
|
109 | |||
110 | empty changeset |
|
110 | empty changeset | |
111 | --------------------------------- |
|
111 | --------------------------------- | |
112 |
|
112 | |||
113 | $ hg clone base empty |
|
113 | $ hg clone base empty | |
114 | updating to branch default |
|
114 | updating to branch default | |
115 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
115 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
116 | $ cd empty |
|
116 | $ cd empty | |
117 | $ hg up eea13746799a |
|
117 | $ hg up eea13746799a | |
118 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
118 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
119 |
|
119 | |||
120 | We make a copy of both the first changeset in the rebased and some other in the |
|
120 | We make a copy of both the first changeset in the rebased and some other in the | |
121 | set. |
|
121 | set. | |
122 |
|
122 | |||
123 | $ hg graft 42ccdea3bb16 32af7686d403 |
|
123 | $ hg graft 42ccdea3bb16 32af7686d403 | |
124 | grafting 1:42ccdea3bb16 "B" |
|
124 | grafting 1:42ccdea3bb16 "B" | |
125 | grafting 3:32af7686d403 "D" |
|
125 | grafting 3:32af7686d403 "D" | |
126 | $ hg rebase -s 42ccdea3bb16 -d . |
|
126 | $ hg rebase -s 42ccdea3bb16 -d . | |
127 | rebasing 1:42ccdea3bb16 "B" |
|
127 | rebasing 1:42ccdea3bb16 "B" | |
128 | note: rebase of 1:42ccdea3bb16 created no changes to commit |
|
128 | note: rebase of 1:42ccdea3bb16 created no changes to commit | |
129 | rebasing 2:5fddd98957c8 "C" |
|
129 | rebasing 2:5fddd98957c8 "C" | |
130 | rebasing 3:32af7686d403 "D" |
|
130 | rebasing 3:32af7686d403 "D" | |
131 | note: rebase of 3:32af7686d403 created no changes to commit |
|
131 | note: rebase of 3:32af7686d403 created no changes to commit | |
132 | $ hg log -G |
|
132 | $ hg log -G | |
133 | o 10:5ae4c968c6ac C |
|
133 | o 10:5ae4c968c6ac C | |
134 | | |
|
134 | | | |
135 | @ 9:08483444fef9 D |
|
135 | @ 9:08483444fef9 D | |
136 | | |
|
136 | | | |
137 | o 8:8877864f1edb B |
|
137 | o 8:8877864f1edb B | |
138 | | |
|
138 | | | |
139 | | o 7:02de42196ebe H |
|
139 | | o 7:02de42196ebe H | |
140 | | | |
|
140 | | | | |
141 | o | 6:eea13746799a G |
|
141 | o | 6:eea13746799a G | |
142 | |\| |
|
142 | |\| | |
143 | | o 5:24b6387c8c8c F |
|
143 | | o 5:24b6387c8c8c F | |
144 | | | |
|
144 | | | | |
145 | o | 4:9520eea781bc E |
|
145 | o | 4:9520eea781bc E | |
146 | |/ |
|
146 | |/ | |
147 | o 0:cd010b8cd998 A |
|
147 | o 0:cd010b8cd998 A | |
148 |
|
148 | |||
149 | $ hg log --hidden -G |
|
149 | $ hg log --hidden -G | |
150 | o 10:5ae4c968c6ac C |
|
150 | o 10:5ae4c968c6ac C | |
151 | | |
|
151 | | | |
152 | @ 9:08483444fef9 D |
|
152 | @ 9:08483444fef9 D | |
153 | | |
|
153 | | | |
154 | o 8:8877864f1edb B |
|
154 | o 8:8877864f1edb B | |
155 | | |
|
155 | | | |
156 | | o 7:02de42196ebe H |
|
156 | | o 7:02de42196ebe H | |
157 | | | |
|
157 | | | | |
158 | o | 6:eea13746799a G |
|
158 | o | 6:eea13746799a G | |
159 | |\| |
|
159 | |\| | |
160 | | o 5:24b6387c8c8c F |
|
160 | | o 5:24b6387c8c8c F | |
161 | | | |
|
161 | | | | |
162 | o | 4:9520eea781bc E |
|
162 | o | 4:9520eea781bc E | |
163 | |/ |
|
163 | |/ | |
164 | | x 3:32af7686d403 D |
|
164 | | x 3:32af7686d403 D | |
165 | | | |
|
165 | | | | |
166 | | x 2:5fddd98957c8 C |
|
166 | | x 2:5fddd98957c8 C | |
167 | | | |
|
167 | | | | |
168 | | x 1:42ccdea3bb16 B |
|
168 | | x 1:42ccdea3bb16 B | |
169 | |/ |
|
169 | |/ | |
170 | o 0:cd010b8cd998 A |
|
170 | o 0:cd010b8cd998 A | |
171 |
|
171 | |||
172 | $ hg debugobsolete |
|
172 | $ hg debugobsolete | |
173 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
|
173 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
174 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
174 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
175 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) |
|
175 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | |
176 |
|
176 | |||
177 |
|
177 | |||
178 | More complex case were part of the rebase set were already rebased |
|
178 | More complex case were part of the rebase set were already rebased | |
179 |
|
179 | |||
180 | $ hg rebase --rev 'desc(D)' --dest 'desc(H)' |
|
180 | $ hg rebase --rev 'desc(D)' --dest 'desc(H)' | |
181 | rebasing 9:08483444fef9 "D" |
|
181 | rebasing 9:08483444fef9 "D" | |
182 | $ hg debugobsolete |
|
182 | $ hg debugobsolete | |
183 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
|
183 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
184 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
184 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
185 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) |
|
185 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | |
186 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) |
|
186 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | |
187 | $ hg log -G |
|
187 | $ hg log -G | |
188 | @ 11:4596109a6a43 D |
|
188 | @ 11:4596109a6a43 D | |
189 | | |
|
189 | | | |
190 | | o 10:5ae4c968c6ac C |
|
190 | | o 10:5ae4c968c6ac C | |
191 | | | |
|
191 | | | | |
192 | | x 9:08483444fef9 D |
|
192 | | x 9:08483444fef9 D | |
193 | | | |
|
193 | | | | |
194 | | o 8:8877864f1edb B |
|
194 | | o 8:8877864f1edb B | |
195 | | | |
|
195 | | | | |
196 | o | 7:02de42196ebe H |
|
196 | o | 7:02de42196ebe H | |
197 | | | |
|
197 | | | | |
198 | | o 6:eea13746799a G |
|
198 | | o 6:eea13746799a G | |
199 | |/| |
|
199 | |/| | |
200 | o | 5:24b6387c8c8c F |
|
200 | o | 5:24b6387c8c8c F | |
201 | | | |
|
201 | | | | |
202 | | o 4:9520eea781bc E |
|
202 | | o 4:9520eea781bc E | |
203 | |/ |
|
203 | |/ | |
204 | o 0:cd010b8cd998 A |
|
204 | o 0:cd010b8cd998 A | |
205 |
|
205 | |||
206 | $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True |
|
206 | $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True | |
207 | rebasing 8:8877864f1edb "B" |
|
207 | rebasing 8:8877864f1edb "B" | |
208 | note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" |
|
208 | note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" | |
209 | rebasing 10:5ae4c968c6ac "C" |
|
209 | rebasing 10:5ae4c968c6ac "C" | |
210 | $ hg debugobsolete |
|
210 | $ hg debugobsolete | |
211 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) |
|
211 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
212 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
212 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
213 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) |
|
213 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | |
214 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) |
|
214 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | |
215 | 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) |
|
215 | 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) | |
216 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) |
|
216 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) | |
217 | $ hg log --rev 'divergent()' |
|
217 | $ hg log --rev 'divergent()' | |
218 | $ hg log -G |
|
218 | $ hg log -G | |
219 | o 13:98f6af4ee953 C |
|
219 | o 13:98f6af4ee953 C | |
220 | | |
|
220 | | | |
221 | o 12:462a34d07e59 B |
|
221 | o 12:462a34d07e59 B | |
222 | | |
|
222 | | | |
223 | @ 11:4596109a6a43 D |
|
223 | @ 11:4596109a6a43 D | |
224 | | |
|
224 | | | |
225 | o 7:02de42196ebe H |
|
225 | o 7:02de42196ebe H | |
226 | | |
|
226 | | | |
227 | | o 6:eea13746799a G |
|
227 | | o 6:eea13746799a G | |
228 | |/| |
|
228 | |/| | |
229 | o | 5:24b6387c8c8c F |
|
229 | o | 5:24b6387c8c8c F | |
230 | | | |
|
230 | | | | |
231 | | o 4:9520eea781bc E |
|
231 | | o 4:9520eea781bc E | |
232 | |/ |
|
232 | |/ | |
233 | o 0:cd010b8cd998 A |
|
233 | o 0:cd010b8cd998 A | |
234 |
|
234 | |||
235 | $ hg log --style default --debug -r 4596109a6a4328c398bde3a4a3b6737cfade3003 |
|
235 | $ hg log --style default --debug -r 4596109a6a4328c398bde3a4a3b6737cfade3003 | |
236 | changeset: 11:4596109a6a4328c398bde3a4a3b6737cfade3003 |
|
236 | changeset: 11:4596109a6a4328c398bde3a4a3b6737cfade3003 | |
237 | phase: draft |
|
237 | phase: draft | |
238 | parent: 7:02de42196ebee42ef284b6780a87cdc96e8eaab6 |
|
238 | parent: 7:02de42196ebee42ef284b6780a87cdc96e8eaab6 | |
239 | parent: -1:0000000000000000000000000000000000000000 |
|
239 | parent: -1:0000000000000000000000000000000000000000 | |
240 | manifest: 11:a91006e3a02f1edf631f7018e6e5684cf27dd905 |
|
240 | manifest: 11:a91006e3a02f1edf631f7018e6e5684cf27dd905 | |
241 | user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
|
241 | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | |
242 | date: Sat Apr 30 15:24:48 2011 +0200 |
|
242 | date: Sat Apr 30 15:24:48 2011 +0200 | |
243 | files+: D |
|
243 | files+: D | |
244 | extra: branch=default |
|
244 | extra: branch=default | |
245 | extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c |
|
245 | extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c | |
246 | extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
|
246 | extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | |
247 | description: |
|
247 | description: | |
248 | D |
|
248 | D | |
249 |
|
249 | |||
250 |
|
250 | |||
251 | $ hg up -qr 'desc(G)' |
|
251 | $ hg up -qr 'desc(G)' | |
252 | $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 |
|
252 | $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 | |
253 | grafting 11:4596109a6a43 "D" |
|
253 | grafting 11:4596109a6a43 "D" | |
254 | $ hg up -qr 'desc(E)' |
|
254 | $ hg up -qr 'desc(E)' | |
255 | $ hg rebase -s tip -d . |
|
255 | $ hg rebase -s tip -d . | |
256 |
rebasing 14: |
|
256 | rebasing 14:0f4c66d0b70f "D" (tip) | |
257 | $ hg log --style default --debug -r tip |
|
257 | $ hg log --style default --debug -r tip | |
258 | changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab |
|
258 | changeset: 15:884f358981b4d32069bb539e0e95d49a35eb81d0 | |
259 | tag: tip |
|
259 | tag: tip | |
260 | phase: draft |
|
260 | phase: draft | |
261 | parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba |
|
261 | parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba | |
262 | parent: -1:0000000000000000000000000000000000000000 |
|
262 | parent: -1:0000000000000000000000000000000000000000 | |
263 | manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 |
|
263 | manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 | |
264 | user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
|
264 | user: Nicolas Dumazet <nicdumz.commits@gmail.com> | |
265 | date: Sat Apr 30 15:24:48 2011 +0200 |
|
265 | date: Sat Apr 30 15:24:48 2011 +0200 | |
266 | files+: D |
|
266 | files+: D | |
267 | extra: branch=default |
|
267 | extra: branch=default | |
268 | extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 |
|
268 | extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 | |
269 | extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f |
|
269 | extra: rebase_source=0f4c66d0b70f8e1ce4aec01f8e95cf24ee923afa | |
270 | extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
|
270 | extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | |
271 | description: |
|
271 | description: | |
272 | D |
|
272 | D | |
273 |
|
273 | |||
274 |
|
274 | |||
275 | $ cd .. |
|
275 | $ cd .. | |
276 |
|
276 | |||
277 | collapse rebase |
|
277 | collapse rebase | |
278 | --------------------------------- |
|
278 | --------------------------------- | |
279 |
|
279 | |||
280 | $ hg clone base collapse |
|
280 | $ hg clone base collapse | |
281 | updating to branch default |
|
281 | updating to branch default | |
282 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
282 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
283 | $ cd collapse |
|
283 | $ cd collapse | |
284 | $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse |
|
284 | $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse | |
285 | rebasing 1:42ccdea3bb16 "B" |
|
285 | rebasing 1:42ccdea3bb16 "B" | |
286 | rebasing 2:5fddd98957c8 "C" |
|
286 | rebasing 2:5fddd98957c8 "C" | |
287 | rebasing 3:32af7686d403 "D" |
|
287 | rebasing 3:32af7686d403 "D" | |
288 | $ hg log -G |
|
288 | $ hg log -G | |
289 | o 8:4dc2197e807b Collapsed revision |
|
289 | o 8:4dc2197e807b Collapsed revision | |
290 | | |
|
290 | | | |
291 | | @ 7:02de42196ebe H |
|
291 | | @ 7:02de42196ebe H | |
292 | | | |
|
292 | | | | |
293 | o | 6:eea13746799a G |
|
293 | o | 6:eea13746799a G | |
294 | |\| |
|
294 | |\| | |
295 | | o 5:24b6387c8c8c F |
|
295 | | o 5:24b6387c8c8c F | |
296 | | | |
|
296 | | | | |
297 | o | 4:9520eea781bc E |
|
297 | o | 4:9520eea781bc E | |
298 | |/ |
|
298 | |/ | |
299 | o 0:cd010b8cd998 A |
|
299 | o 0:cd010b8cd998 A | |
300 |
|
300 | |||
301 | $ hg log --hidden -G |
|
301 | $ hg log --hidden -G | |
302 | o 8:4dc2197e807b Collapsed revision |
|
302 | o 8:4dc2197e807b Collapsed revision | |
303 | | |
|
303 | | | |
304 | | @ 7:02de42196ebe H |
|
304 | | @ 7:02de42196ebe H | |
305 | | | |
|
305 | | | | |
306 | o | 6:eea13746799a G |
|
306 | o | 6:eea13746799a G | |
307 | |\| |
|
307 | |\| | |
308 | | o 5:24b6387c8c8c F |
|
308 | | o 5:24b6387c8c8c F | |
309 | | | |
|
309 | | | | |
310 | o | 4:9520eea781bc E |
|
310 | o | 4:9520eea781bc E | |
311 | |/ |
|
311 | |/ | |
312 | | x 3:32af7686d403 D |
|
312 | | x 3:32af7686d403 D | |
313 | | | |
|
313 | | | | |
314 | | x 2:5fddd98957c8 C |
|
314 | | x 2:5fddd98957c8 C | |
315 | | | |
|
315 | | | | |
316 | | x 1:42ccdea3bb16 B |
|
316 | | x 1:42ccdea3bb16 B | |
317 | |/ |
|
317 | |/ | |
318 | o 0:cd010b8cd998 A |
|
318 | o 0:cd010b8cd998 A | |
319 |
|
319 | |||
320 | $ hg id --debug -r tip |
|
320 | $ hg id --debug -r tip | |
321 | 4dc2197e807bae9817f09905b50ab288be2dbbcf tip |
|
321 | 4dc2197e807bae9817f09905b50ab288be2dbbcf tip | |
322 | $ hg debugobsolete |
|
322 | $ hg debugobsolete | |
323 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) |
|
323 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) | |
324 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) |
|
324 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) | |
325 | 32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) |
|
325 | 32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 (*) {'user': 'test'} (glob) | |
326 |
|
326 | |||
327 | $ cd .. |
|
327 | $ cd .. | |
328 |
|
328 | |||
329 | Rebase set has hidden descendants |
|
329 | Rebase set has hidden descendants | |
330 | --------------------------------- |
|
330 | --------------------------------- | |
331 |
|
331 | |||
332 | We rebase a changeset which has a hidden changeset. The hidden changeset must |
|
332 | We rebase a changeset which has a hidden changeset. The hidden changeset must | |
333 | not be rebased. |
|
333 | not be rebased. | |
334 |
|
334 | |||
335 | $ hg clone base hidden |
|
335 | $ hg clone base hidden | |
336 | updating to branch default |
|
336 | updating to branch default | |
337 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
337 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
338 | $ cd hidden |
|
338 | $ cd hidden | |
339 | $ hg rebase -s 5fddd98957c8 -d eea13746799a |
|
339 | $ hg rebase -s 5fddd98957c8 -d eea13746799a | |
340 | rebasing 2:5fddd98957c8 "C" |
|
340 | rebasing 2:5fddd98957c8 "C" | |
341 | rebasing 3:32af7686d403 "D" |
|
341 | rebasing 3:32af7686d403 "D" | |
342 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe |
|
342 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe | |
343 | rebasing 1:42ccdea3bb16 "B" |
|
343 | rebasing 1:42ccdea3bb16 "B" | |
344 | $ hg log -G |
|
344 | $ hg log -G | |
345 | o 10:7c6027df6a99 B |
|
345 | o 10:7c6027df6a99 B | |
346 | | |
|
346 | | | |
347 | | o 9:cf44d2f5a9f4 D |
|
347 | | o 9:cf44d2f5a9f4 D | |
348 | | | |
|
348 | | | | |
349 | | o 8:e273c5e7d2d2 C |
|
349 | | o 8:e273c5e7d2d2 C | |
350 | | | |
|
350 | | | | |
351 | @ | 7:02de42196ebe H |
|
351 | @ | 7:02de42196ebe H | |
352 | | | |
|
352 | | | | |
353 | | o 6:eea13746799a G |
|
353 | | o 6:eea13746799a G | |
354 | |/| |
|
354 | |/| | |
355 | o | 5:24b6387c8c8c F |
|
355 | o | 5:24b6387c8c8c F | |
356 | | | |
|
356 | | | | |
357 | | o 4:9520eea781bc E |
|
357 | | o 4:9520eea781bc E | |
358 | |/ |
|
358 | |/ | |
359 | o 0:cd010b8cd998 A |
|
359 | o 0:cd010b8cd998 A | |
360 |
|
360 | |||
361 | $ hg log --hidden -G |
|
361 | $ hg log --hidden -G | |
362 | o 10:7c6027df6a99 B |
|
362 | o 10:7c6027df6a99 B | |
363 | | |
|
363 | | | |
364 | | o 9:cf44d2f5a9f4 D |
|
364 | | o 9:cf44d2f5a9f4 D | |
365 | | | |
|
365 | | | | |
366 | | o 8:e273c5e7d2d2 C |
|
366 | | o 8:e273c5e7d2d2 C | |
367 | | | |
|
367 | | | | |
368 | @ | 7:02de42196ebe H |
|
368 | @ | 7:02de42196ebe H | |
369 | | | |
|
369 | | | | |
370 | | o 6:eea13746799a G |
|
370 | | o 6:eea13746799a G | |
371 | |/| |
|
371 | |/| | |
372 | o | 5:24b6387c8c8c F |
|
372 | o | 5:24b6387c8c8c F | |
373 | | | |
|
373 | | | | |
374 | | o 4:9520eea781bc E |
|
374 | | o 4:9520eea781bc E | |
375 | |/ |
|
375 | |/ | |
376 | | x 3:32af7686d403 D |
|
376 | | x 3:32af7686d403 D | |
377 | | | |
|
377 | | | | |
378 | | x 2:5fddd98957c8 C |
|
378 | | x 2:5fddd98957c8 C | |
379 | | | |
|
379 | | | | |
380 | | x 1:42ccdea3bb16 B |
|
380 | | x 1:42ccdea3bb16 B | |
381 | |/ |
|
381 | |/ | |
382 | o 0:cd010b8cd998 A |
|
382 | o 0:cd010b8cd998 A | |
383 |
|
383 | |||
384 | $ hg debugobsolete |
|
384 | $ hg debugobsolete | |
385 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob) |
|
385 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob) | |
386 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob) |
|
386 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob) | |
387 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob) |
|
387 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob) | |
388 |
|
388 | |||
389 | Test that rewriting leaving instability behind is allowed |
|
389 | Test that rewriting leaving instability behind is allowed | |
390 | --------------------------------------------------------------------- |
|
390 | --------------------------------------------------------------------- | |
391 |
|
391 | |||
392 | $ hg log -r 'children(8)' |
|
392 | $ hg log -r 'children(8)' | |
393 | 9:cf44d2f5a9f4 D (no-eol) |
|
393 | 9:cf44d2f5a9f4 D (no-eol) | |
394 | $ hg rebase -r 8 |
|
394 | $ hg rebase -r 8 | |
395 | rebasing 8:e273c5e7d2d2 "C" |
|
395 | rebasing 8:e273c5e7d2d2 "C" | |
396 | $ hg log -G |
|
396 | $ hg log -G | |
397 | o 11:0d8f238b634c C |
|
397 | o 11:0d8f238b634c C | |
398 | | |
|
398 | | | |
399 | o 10:7c6027df6a99 B |
|
399 | o 10:7c6027df6a99 B | |
400 | | |
|
400 | | | |
401 | | o 9:cf44d2f5a9f4 D |
|
401 | | o 9:cf44d2f5a9f4 D | |
402 | | | |
|
402 | | | | |
403 | | x 8:e273c5e7d2d2 C |
|
403 | | x 8:e273c5e7d2d2 C | |
404 | | | |
|
404 | | | | |
405 | @ | 7:02de42196ebe H |
|
405 | @ | 7:02de42196ebe H | |
406 | | | |
|
406 | | | | |
407 | | o 6:eea13746799a G |
|
407 | | o 6:eea13746799a G | |
408 | |/| |
|
408 | |/| | |
409 | o | 5:24b6387c8c8c F |
|
409 | o | 5:24b6387c8c8c F | |
410 | | | |
|
410 | | | | |
411 | | o 4:9520eea781bc E |
|
411 | | o 4:9520eea781bc E | |
412 | |/ |
|
412 | |/ | |
413 | o 0:cd010b8cd998 A |
|
413 | o 0:cd010b8cd998 A | |
414 |
|
414 | |||
415 |
|
415 | |||
416 |
|
416 | |||
417 | Test multiple root handling |
|
417 | Test multiple root handling | |
418 | ------------------------------------ |
|
418 | ------------------------------------ | |
419 |
|
419 | |||
420 | $ hg rebase --dest 4 --rev '7+11+9' |
|
420 | $ hg rebase --dest 4 --rev '7+11+9' | |
421 | rebasing 7:02de42196ebe "H" |
|
421 | rebasing 7:02de42196ebe "H" | |
422 | rebasing 9:cf44d2f5a9f4 "D" |
|
422 | rebasing 9:cf44d2f5a9f4 "D" | |
423 | not rebasing ignored 10:7c6027df6a99 "B" |
|
423 | not rebasing ignored 10:7c6027df6a99 "B" | |
424 | rebasing 11:0d8f238b634c "C" (tip) |
|
424 | rebasing 11:0d8f238b634c "C" (tip) | |
425 | $ hg log -G |
|
425 | $ hg log -G | |
426 | o 14:1e8370e38cca C |
|
426 | o 14:1e8370e38cca C | |
427 | | |
|
427 | | | |
428 | | o 13:102b4c1d889b D |
|
428 | | o 13:102b4c1d889b D | |
429 | | | |
|
429 | | | | |
430 | @ | 12:bfe264faf697 H |
|
430 | @ | 12:bfe264faf697 H | |
431 | |/ |
|
431 | |/ | |
432 | | o 10:7c6027df6a99 B |
|
432 | | o 10:7c6027df6a99 B | |
433 | | | |
|
433 | | | | |
434 | | x 7:02de42196ebe H |
|
434 | | x 7:02de42196ebe H | |
435 | | | |
|
435 | | | | |
436 | +---o 6:eea13746799a G |
|
436 | +---o 6:eea13746799a G | |
437 | | |/ |
|
437 | | |/ | |
438 | | o 5:24b6387c8c8c F |
|
438 | | o 5:24b6387c8c8c F | |
439 | | | |
|
439 | | | | |
440 | o | 4:9520eea781bc E |
|
440 | o | 4:9520eea781bc E | |
441 | |/ |
|
441 | |/ | |
442 | o 0:cd010b8cd998 A |
|
442 | o 0:cd010b8cd998 A | |
443 |
|
443 | |||
444 | $ cd .. |
|
444 | $ cd .. | |
445 |
|
445 | |||
446 | test on rebase dropping a merge |
|
446 | test on rebase dropping a merge | |
447 |
|
447 | |||
448 | (setup) |
|
448 | (setup) | |
449 |
|
449 | |||
450 | $ hg init dropmerge |
|
450 | $ hg init dropmerge | |
451 | $ cd dropmerge |
|
451 | $ cd dropmerge | |
452 | $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
|
452 | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | |
453 | adding changesets |
|
453 | adding changesets | |
454 | adding manifests |
|
454 | adding manifests | |
455 | adding file changes |
|
455 | adding file changes | |
456 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
456 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
457 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
457 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
458 | $ hg up 3 |
|
458 | $ hg up 3 | |
459 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
459 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
460 | $ hg merge 7 |
|
460 | $ hg merge 7 | |
461 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
461 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
462 | (branch merge, don't forget to commit) |
|
462 | (branch merge, don't forget to commit) | |
463 | $ hg ci -m 'M' |
|
463 | $ hg ci -m 'M' | |
464 | $ echo I > I |
|
464 | $ echo I > I | |
465 | $ hg add I |
|
465 | $ hg add I | |
466 | $ hg ci -m I |
|
466 | $ hg ci -m I | |
467 | $ hg log -G |
|
467 | $ hg log -G | |
468 | @ 9:4bde274eefcf I |
|
468 | @ 9:4bde274eefcf I | |
469 | | |
|
469 | | | |
470 | o 8:53a6a128b2b7 M |
|
470 | o 8:53a6a128b2b7 M | |
471 | |\ |
|
471 | |\ | |
472 | | o 7:02de42196ebe H |
|
472 | | o 7:02de42196ebe H | |
473 | | | |
|
473 | | | | |
474 | | | o 6:eea13746799a G |
|
474 | | | o 6:eea13746799a G | |
475 | | |/| |
|
475 | | |/| | |
476 | | o | 5:24b6387c8c8c F |
|
476 | | o | 5:24b6387c8c8c F | |
477 | | | | |
|
477 | | | | | |
478 | | | o 4:9520eea781bc E |
|
478 | | | o 4:9520eea781bc E | |
479 | | |/ |
|
479 | | |/ | |
480 | o | 3:32af7686d403 D |
|
480 | o | 3:32af7686d403 D | |
481 | | | |
|
481 | | | | |
482 | o | 2:5fddd98957c8 C |
|
482 | o | 2:5fddd98957c8 C | |
483 | | | |
|
483 | | | | |
484 | o | 1:42ccdea3bb16 B |
|
484 | o | 1:42ccdea3bb16 B | |
485 | |/ |
|
485 | |/ | |
486 | o 0:cd010b8cd998 A |
|
486 | o 0:cd010b8cd998 A | |
487 |
|
487 | |||
488 | (actual test) |
|
488 | (actual test) | |
489 |
|
489 | |||
490 | $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' |
|
490 | $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)' | |
491 | rebasing 3:32af7686d403 "D" |
|
491 | rebasing 3:32af7686d403 "D" | |
492 | rebasing 7:02de42196ebe "H" |
|
492 | rebasing 7:02de42196ebe "H" | |
493 | not rebasing ignored 8:53a6a128b2b7 "M" |
|
493 | not rebasing ignored 8:53a6a128b2b7 "M" | |
494 | rebasing 9:4bde274eefcf "I" (tip) |
|
494 | rebasing 9:4bde274eefcf "I" (tip) | |
495 | $ hg log -G |
|
495 | $ hg log -G | |
496 | @ 12:acd174b7ab39 I |
|
496 | @ 12:acd174b7ab39 I | |
497 | | |
|
497 | | | |
498 | o 11:6c11a6218c97 H |
|
498 | o 11:6c11a6218c97 H | |
499 | | |
|
499 | | | |
500 | | o 10:b5313c85b22e D |
|
500 | | o 10:b5313c85b22e D | |
501 | |/ |
|
501 | |/ | |
502 | | o 8:53a6a128b2b7 M |
|
502 | | o 8:53a6a128b2b7 M | |
503 | | |\ |
|
503 | | |\ | |
504 | | | x 7:02de42196ebe H |
|
504 | | | x 7:02de42196ebe H | |
505 | | | | |
|
505 | | | | | |
506 | o---+ 6:eea13746799a G |
|
506 | o---+ 6:eea13746799a G | |
507 | | | | |
|
507 | | | | | |
508 | | | o 5:24b6387c8c8c F |
|
508 | | | o 5:24b6387c8c8c F | |
509 | | | | |
|
509 | | | | | |
510 | o---+ 4:9520eea781bc E |
|
510 | o---+ 4:9520eea781bc E | |
511 | / / |
|
511 | / / | |
512 | x | 3:32af7686d403 D |
|
512 | x | 3:32af7686d403 D | |
513 | | | |
|
513 | | | | |
514 | o | 2:5fddd98957c8 C |
|
514 | o | 2:5fddd98957c8 C | |
515 | | | |
|
515 | | | | |
516 | o | 1:42ccdea3bb16 B |
|
516 | o | 1:42ccdea3bb16 B | |
517 | |/ |
|
517 | |/ | |
518 | o 0:cd010b8cd998 A |
|
518 | o 0:cd010b8cd998 A | |
519 |
|
519 | |||
520 |
|
520 | |||
521 | Test hidden changesets in the rebase set (issue4504) |
|
521 | Test hidden changesets in the rebase set (issue4504) | |
522 |
|
522 | |||
523 | $ hg up --hidden 9 |
|
523 | $ hg up --hidden 9 | |
524 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
524 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
525 | $ echo J > J |
|
525 | $ echo J > J | |
526 | $ hg add J |
|
526 | $ hg add J | |
527 | $ hg commit -m J |
|
527 | $ hg commit -m J | |
528 | $ hg debugobsolete `hg log --rev . -T '{node}'` |
|
528 | $ hg debugobsolete `hg log --rev . -T '{node}'` | |
529 |
|
529 | |||
530 | $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback |
|
530 | $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback | |
531 | rebasing 9:4bde274eefcf "I" |
|
531 | rebasing 9:4bde274eefcf "I" | |
532 | rebasing 13:06edfc82198f "J" (tip) |
|
532 | rebasing 13:06edfc82198f "J" (tip) | |
533 | $ hg log -G |
|
533 | $ hg log -G | |
534 | @ 15:5ae8a643467b J |
|
534 | @ 15:5ae8a643467b J | |
535 | | |
|
535 | | | |
536 | o 14:9ad579b4a5de I |
|
536 | o 14:9ad579b4a5de I | |
537 | | |
|
537 | | | |
538 | | o 12:acd174b7ab39 I |
|
538 | | o 12:acd174b7ab39 I | |
539 | | | |
|
539 | | | | |
540 | | o 11:6c11a6218c97 H |
|
540 | | o 11:6c11a6218c97 H | |
541 | | | |
|
541 | | | | |
542 | o | 10:b5313c85b22e D |
|
542 | o | 10:b5313c85b22e D | |
543 | |/ |
|
543 | |/ | |
544 | | o 8:53a6a128b2b7 M |
|
544 | | o 8:53a6a128b2b7 M | |
545 | | |\ |
|
545 | | |\ | |
546 | | | x 7:02de42196ebe H |
|
546 | | | x 7:02de42196ebe H | |
547 | | | | |
|
547 | | | | | |
548 | o---+ 6:eea13746799a G |
|
548 | o---+ 6:eea13746799a G | |
549 | | | | |
|
549 | | | | | |
550 | | | o 5:24b6387c8c8c F |
|
550 | | | o 5:24b6387c8c8c F | |
551 | | | | |
|
551 | | | | | |
552 | o---+ 4:9520eea781bc E |
|
552 | o---+ 4:9520eea781bc E | |
553 | / / |
|
553 | / / | |
554 | x | 3:32af7686d403 D |
|
554 | x | 3:32af7686d403 D | |
555 | | | |
|
555 | | | | |
556 | o | 2:5fddd98957c8 C |
|
556 | o | 2:5fddd98957c8 C | |
557 | | | |
|
557 | | | | |
558 | o | 1:42ccdea3bb16 B |
|
558 | o | 1:42ccdea3bb16 B | |
559 | |/ |
|
559 | |/ | |
560 | o 0:cd010b8cd998 A |
|
560 | o 0:cd010b8cd998 A | |
561 |
|
561 | |||
562 | $ hg up 14 -C |
|
562 | $ hg up 14 -C | |
563 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
563 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
564 | $ echo "K" > K |
|
564 | $ echo "K" > K | |
565 | $ hg add K |
|
565 | $ hg add K | |
566 | $ hg commit --amend -m "K" |
|
566 | $ hg commit --amend -m "K" | |
567 | $ echo "L" > L |
|
567 | $ echo "L" > L | |
568 | $ hg add L |
|
568 | $ hg add L | |
569 | $ hg commit -m "L" |
|
569 | $ hg commit -m "L" | |
570 | $ hg up '.^' |
|
570 | $ hg up '.^' | |
571 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
571 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
572 | $ echo "M" > M |
|
572 | $ echo "M" > M | |
573 | $ hg add M |
|
573 | $ hg add M | |
574 | $ hg commit --amend -m "M" |
|
574 | $ hg commit --amend -m "M" | |
575 | $ hg log -G |
|
575 | $ hg log -G | |
576 | @ 20:bfaedf8eb73b M |
|
576 | @ 20:bfaedf8eb73b M | |
577 | | |
|
577 | | | |
578 | | o 18:97219452e4bd L |
|
578 | | o 18:97219452e4bd L | |
579 | | | |
|
579 | | | | |
580 | | x 17:fc37a630c901 K |
|
580 | | x 17:fc37a630c901 K | |
581 | |/ |
|
581 | |/ | |
582 | | o 15:5ae8a643467b J |
|
582 | | o 15:5ae8a643467b J | |
583 | | | |
|
583 | | | | |
584 | | x 14:9ad579b4a5de I |
|
584 | | x 14:9ad579b4a5de I | |
585 | |/ |
|
585 | |/ | |
586 | | o 12:acd174b7ab39 I |
|
586 | | o 12:acd174b7ab39 I | |
587 | | | |
|
587 | | | | |
588 | | o 11:6c11a6218c97 H |
|
588 | | o 11:6c11a6218c97 H | |
589 | | | |
|
589 | | | | |
590 | o | 10:b5313c85b22e D |
|
590 | o | 10:b5313c85b22e D | |
591 | |/ |
|
591 | |/ | |
592 | | o 8:53a6a128b2b7 M |
|
592 | | o 8:53a6a128b2b7 M | |
593 | | |\ |
|
593 | | |\ | |
594 | | | x 7:02de42196ebe H |
|
594 | | | x 7:02de42196ebe H | |
595 | | | | |
|
595 | | | | | |
596 | o---+ 6:eea13746799a G |
|
596 | o---+ 6:eea13746799a G | |
597 | | | | |
|
597 | | | | | |
598 | | | o 5:24b6387c8c8c F |
|
598 | | | o 5:24b6387c8c8c F | |
599 | | | | |
|
599 | | | | | |
600 | o---+ 4:9520eea781bc E |
|
600 | o---+ 4:9520eea781bc E | |
601 | / / |
|
601 | / / | |
602 | x | 3:32af7686d403 D |
|
602 | x | 3:32af7686d403 D | |
603 | | | |
|
603 | | | | |
604 | o | 2:5fddd98957c8 C |
|
604 | o | 2:5fddd98957c8 C | |
605 | | | |
|
605 | | | | |
606 | o | 1:42ccdea3bb16 B |
|
606 | o | 1:42ccdea3bb16 B | |
607 | |/ |
|
607 | |/ | |
608 | o 0:cd010b8cd998 A |
|
608 | o 0:cd010b8cd998 A | |
609 |
|
609 | |||
610 | $ hg rebase -s 14 -d 18 --config experimental.rebaseskipobsolete=True |
|
610 | $ hg rebase -s 14 -d 18 --config experimental.rebaseskipobsolete=True | |
611 | note: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K" |
|
611 | note: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K" | |
612 | rebasing 15:5ae8a643467b "J" |
|
612 | rebasing 15:5ae8a643467b "J" | |
613 |
|
613 | |||
614 | $ cd .. |
|
614 | $ cd .. | |
615 |
|
615 | |||
616 | Skip obsolete changeset even with multiple hops |
|
616 | Skip obsolete changeset even with multiple hops | |
617 | ----------------------------------------------- |
|
617 | ----------------------------------------------- | |
618 |
|
618 | |||
619 | setup |
|
619 | setup | |
620 |
|
620 | |||
621 | $ hg init obsskip |
|
621 | $ hg init obsskip | |
622 | $ cd obsskip |
|
622 | $ cd obsskip | |
623 | $ cat << EOF >> .hg/hgrc |
|
623 | $ cat << EOF >> .hg/hgrc | |
624 | > [experimental] |
|
624 | > [experimental] | |
625 | > rebaseskipobsolete = True |
|
625 | > rebaseskipobsolete = True | |
626 | > [extensions] |
|
626 | > [extensions] | |
627 | > strip = |
|
627 | > strip = | |
628 | > EOF |
|
628 | > EOF | |
629 | $ echo A > A |
|
629 | $ echo A > A | |
630 | $ hg add A |
|
630 | $ hg add A | |
631 | $ hg commit -m A |
|
631 | $ hg commit -m A | |
632 | $ echo B > B |
|
632 | $ echo B > B | |
633 | $ hg add B |
|
633 | $ hg add B | |
634 | $ hg commit -m B0 |
|
634 | $ hg commit -m B0 | |
635 | $ hg commit --amend -m B1 |
|
635 | $ hg commit --amend -m B1 | |
636 | $ hg commit --amend -m B2 |
|
636 | $ hg commit --amend -m B2 | |
637 | $ hg up --hidden 'desc(B0)' |
|
637 | $ hg up --hidden 'desc(B0)' | |
638 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
638 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
639 | $ echo C > C |
|
639 | $ echo C > C | |
640 | $ hg add C |
|
640 | $ hg add C | |
641 | $ hg commit -m C |
|
641 | $ hg commit -m C | |
642 |
|
642 | |||
643 | Rebase finds its way in a chain of marker |
|
643 | Rebase finds its way in a chain of marker | |
644 |
|
644 | |||
645 | $ hg rebase -d 'desc(B2)' |
|
645 | $ hg rebase -d 'desc(B2)' | |
646 | note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" |
|
646 | note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" | |
647 | rebasing 4:212cb178bcbb "C" (tip) |
|
647 | rebasing 4:212cb178bcbb "C" (tip) | |
648 |
|
648 | |||
649 | Even when the chain include missing node |
|
649 | Even when the chain include missing node | |
650 |
|
650 | |||
651 | $ hg up --hidden 'desc(B0)' |
|
651 | $ hg up --hidden 'desc(B0)' | |
652 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
652 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
653 | $ echo D > D |
|
653 | $ echo D > D | |
654 | $ hg add D |
|
654 | $ hg add D | |
655 | $ hg commit -m D |
|
655 | $ hg commit -m D | |
656 | $ hg --hidden strip -r 'desc(B1)' |
|
656 | $ hg --hidden strip -r 'desc(B1)' | |
657 | saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob) |
|
657 | saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob) | |
658 |
|
658 | |||
659 | $ hg rebase -d 'desc(B2)' |
|
659 | $ hg rebase -d 'desc(B2)' | |
660 | note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" |
|
660 | note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" | |
661 | rebasing 5:1a79b7535141 "D" (tip) |
|
661 | rebasing 5:1a79b7535141 "D" (tip) | |
662 | $ hg up 4 |
|
662 | $ hg up 4 | |
663 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
663 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
664 | $ echo "O" > O |
|
664 | $ echo "O" > O | |
665 | $ hg add O |
|
665 | $ hg add O | |
666 | $ hg commit -m O |
|
666 | $ hg commit -m O | |
667 | $ echo "P" > P |
|
667 | $ echo "P" > P | |
668 | $ hg add P |
|
668 | $ hg add P | |
669 | $ hg commit -m P |
|
669 | $ hg commit -m P | |
670 | $ hg log -G |
|
670 | $ hg log -G | |
671 | @ 8:8d47583e023f P |
|
671 | @ 8:8d47583e023f P | |
672 | | |
|
672 | | | |
673 | o 7:360bbaa7d3ce O |
|
673 | o 7:360bbaa7d3ce O | |
674 | | |
|
674 | | | |
675 | | o 6:9c48361117de D |
|
675 | | o 6:9c48361117de D | |
676 | | | |
|
676 | | | | |
677 | o | 4:ff2c4d47b71d C |
|
677 | o | 4:ff2c4d47b71d C | |
678 | |/ |
|
678 | |/ | |
679 | o 2:261e70097290 B2 |
|
679 | o 2:261e70097290 B2 | |
680 | | |
|
680 | | | |
681 | o 0:4a2df7238c3b A |
|
681 | o 0:4a2df7238c3b A | |
682 |
|
682 | |||
683 | $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all |
|
683 | $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all | |
684 | $ hg rebase -d 6 -r "4::" |
|
684 | $ hg rebase -d 6 -r "4::" | |
685 | rebasing 4:ff2c4d47b71d "C" |
|
685 | rebasing 4:ff2c4d47b71d "C" | |
686 | note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
|
686 | note: not rebasing 7:360bbaa7d3ce "O", it has no successor | |
687 | rebasing 8:8d47583e023f "P" (tip) |
|
687 | rebasing 8:8d47583e023f "P" (tip) |
General Comments 0
You need to be logged in to leave comments.
Login now