Show More
@@ -1,5937 +1,5936 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from node import hex, bin, nullid, nullrev, short |
|
8 | from node import hex, bin, nullid, nullrev, short | |
9 | from lock import release |
|
9 | from lock import release | |
10 | from i18n import _ |
|
10 | from i18n import _ | |
11 | import os, re, difflib, time, tempfile, errno |
|
11 | import os, re, difflib, time, tempfile, errno | |
12 | import hg, scmutil, util, revlog, copies, error, bookmarks |
|
12 | import hg, scmutil, util, revlog, copies, error, bookmarks | |
13 | import patch, help, encoding, templatekw, discovery |
|
13 | import patch, help, encoding, templatekw, discovery | |
14 | import archival, changegroup, cmdutil, hbisect |
|
14 | import archival, changegroup, cmdutil, hbisect | |
15 | import sshserver, hgweb, commandserver |
|
15 | import sshserver, hgweb, commandserver | |
16 | from hgweb import server as hgweb_server |
|
16 | from hgweb import server as hgweb_server | |
17 | import merge as mergemod |
|
17 | import merge as mergemod | |
18 | import minirst, revset, fileset |
|
18 | import minirst, revset, fileset | |
19 | import dagparser, context, simplemerge, graphmod |
|
19 | import dagparser, context, simplemerge, graphmod | |
20 | import random |
|
20 | import random | |
21 | import setdiscovery, treediscovery, dagutil, pvec, localrepo |
|
21 | import setdiscovery, treediscovery, dagutil, pvec, localrepo | |
22 | import phases, obsolete |
|
22 | import phases, obsolete | |
23 |
|
23 | |||
24 | table = {} |
|
24 | table = {} | |
25 |
|
25 | |||
26 | command = cmdutil.command(table) |
|
26 | command = cmdutil.command(table) | |
27 |
|
27 | |||
28 | # common command options |
|
28 | # common command options | |
29 |
|
29 | |||
30 | globalopts = [ |
|
30 | globalopts = [ | |
31 | ('R', 'repository', '', |
|
31 | ('R', 'repository', '', | |
32 | _('repository root directory or name of overlay bundle file'), |
|
32 | _('repository root directory or name of overlay bundle file'), | |
33 | _('REPO')), |
|
33 | _('REPO')), | |
34 | ('', 'cwd', '', |
|
34 | ('', 'cwd', '', | |
35 | _('change working directory'), _('DIR')), |
|
35 | _('change working directory'), _('DIR')), | |
36 | ('y', 'noninteractive', None, |
|
36 | ('y', 'noninteractive', None, | |
37 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
37 | _('do not prompt, automatically pick the first choice for all prompts')), | |
38 | ('q', 'quiet', None, _('suppress output')), |
|
38 | ('q', 'quiet', None, _('suppress output')), | |
39 | ('v', 'verbose', None, _('enable additional output')), |
|
39 | ('v', 'verbose', None, _('enable additional output')), | |
40 | ('', 'config', [], |
|
40 | ('', 'config', [], | |
41 | _('set/override config option (use \'section.name=value\')'), |
|
41 | _('set/override config option (use \'section.name=value\')'), | |
42 | _('CONFIG')), |
|
42 | _('CONFIG')), | |
43 | ('', 'debug', None, _('enable debugging output')), |
|
43 | ('', 'debug', None, _('enable debugging output')), | |
44 | ('', 'debugger', None, _('start debugger')), |
|
44 | ('', 'debugger', None, _('start debugger')), | |
45 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
45 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
46 | _('ENCODE')), |
|
46 | _('ENCODE')), | |
47 | ('', 'encodingmode', encoding.encodingmode, |
|
47 | ('', 'encodingmode', encoding.encodingmode, | |
48 | _('set the charset encoding mode'), _('MODE')), |
|
48 | _('set the charset encoding mode'), _('MODE')), | |
49 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
49 | ('', 'traceback', None, _('always print a traceback on exception')), | |
50 | ('', 'time', None, _('time how long the command takes')), |
|
50 | ('', 'time', None, _('time how long the command takes')), | |
51 | ('', 'profile', None, _('print command execution profile')), |
|
51 | ('', 'profile', None, _('print command execution profile')), | |
52 | ('', 'version', None, _('output version information and exit')), |
|
52 | ('', 'version', None, _('output version information and exit')), | |
53 | ('h', 'help', None, _('display help and exit')), |
|
53 | ('h', 'help', None, _('display help and exit')), | |
54 | ('', 'hidden', False, _('consider hidden changesets')), |
|
54 | ('', 'hidden', False, _('consider hidden changesets')), | |
55 | ] |
|
55 | ] | |
56 |
|
56 | |||
57 | dryrunopts = [('n', 'dry-run', None, |
|
57 | dryrunopts = [('n', 'dry-run', None, | |
58 | _('do not perform actions, just print output'))] |
|
58 | _('do not perform actions, just print output'))] | |
59 |
|
59 | |||
60 | remoteopts = [ |
|
60 | remoteopts = [ | |
61 | ('e', 'ssh', '', |
|
61 | ('e', 'ssh', '', | |
62 | _('specify ssh command to use'), _('CMD')), |
|
62 | _('specify ssh command to use'), _('CMD')), | |
63 | ('', 'remotecmd', '', |
|
63 | ('', 'remotecmd', '', | |
64 | _('specify hg command to run on the remote side'), _('CMD')), |
|
64 | _('specify hg command to run on the remote side'), _('CMD')), | |
65 | ('', 'insecure', None, |
|
65 | ('', 'insecure', None, | |
66 | _('do not verify server certificate (ignoring web.cacerts config)')), |
|
66 | _('do not verify server certificate (ignoring web.cacerts config)')), | |
67 | ] |
|
67 | ] | |
68 |
|
68 | |||
69 | walkopts = [ |
|
69 | walkopts = [ | |
70 | ('I', 'include', [], |
|
70 | ('I', 'include', [], | |
71 | _('include names matching the given patterns'), _('PATTERN')), |
|
71 | _('include names matching the given patterns'), _('PATTERN')), | |
72 | ('X', 'exclude', [], |
|
72 | ('X', 'exclude', [], | |
73 | _('exclude names matching the given patterns'), _('PATTERN')), |
|
73 | _('exclude names matching the given patterns'), _('PATTERN')), | |
74 | ] |
|
74 | ] | |
75 |
|
75 | |||
76 | commitopts = [ |
|
76 | commitopts = [ | |
77 | ('m', 'message', '', |
|
77 | ('m', 'message', '', | |
78 | _('use text as commit message'), _('TEXT')), |
|
78 | _('use text as commit message'), _('TEXT')), | |
79 | ('l', 'logfile', '', |
|
79 | ('l', 'logfile', '', | |
80 | _('read commit message from file'), _('FILE')), |
|
80 | _('read commit message from file'), _('FILE')), | |
81 | ] |
|
81 | ] | |
82 |
|
82 | |||
83 | commitopts2 = [ |
|
83 | commitopts2 = [ | |
84 | ('d', 'date', '', |
|
84 | ('d', 'date', '', | |
85 | _('record the specified date as commit date'), _('DATE')), |
|
85 | _('record the specified date as commit date'), _('DATE')), | |
86 | ('u', 'user', '', |
|
86 | ('u', 'user', '', | |
87 | _('record the specified user as committer'), _('USER')), |
|
87 | _('record the specified user as committer'), _('USER')), | |
88 | ] |
|
88 | ] | |
89 |
|
89 | |||
90 | templateopts = [ |
|
90 | templateopts = [ | |
91 | ('', 'style', '', |
|
91 | ('', 'style', '', | |
92 | _('display using template map file'), _('STYLE')), |
|
92 | _('display using template map file'), _('STYLE')), | |
93 | ('', 'template', '', |
|
93 | ('', 'template', '', | |
94 | _('display with template'), _('TEMPLATE')), |
|
94 | _('display with template'), _('TEMPLATE')), | |
95 | ] |
|
95 | ] | |
96 |
|
96 | |||
97 | logopts = [ |
|
97 | logopts = [ | |
98 | ('p', 'patch', None, _('show patch')), |
|
98 | ('p', 'patch', None, _('show patch')), | |
99 | ('g', 'git', None, _('use git extended diff format')), |
|
99 | ('g', 'git', None, _('use git extended diff format')), | |
100 | ('l', 'limit', '', |
|
100 | ('l', 'limit', '', | |
101 | _('limit number of changes displayed'), _('NUM')), |
|
101 | _('limit number of changes displayed'), _('NUM')), | |
102 | ('M', 'no-merges', None, _('do not show merges')), |
|
102 | ('M', 'no-merges', None, _('do not show merges')), | |
103 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
103 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
104 | ('G', 'graph', None, _("show the revision DAG")), |
|
104 | ('G', 'graph', None, _("show the revision DAG")), | |
105 | ] + templateopts |
|
105 | ] + templateopts | |
106 |
|
106 | |||
107 | diffopts = [ |
|
107 | diffopts = [ | |
108 | ('a', 'text', None, _('treat all files as text')), |
|
108 | ('a', 'text', None, _('treat all files as text')), | |
109 | ('g', 'git', None, _('use git extended diff format')), |
|
109 | ('g', 'git', None, _('use git extended diff format')), | |
110 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
110 | ('', 'nodates', None, _('omit dates from diff headers')) | |
111 | ] |
|
111 | ] | |
112 |
|
112 | |||
113 | diffwsopts = [ |
|
113 | diffwsopts = [ | |
114 | ('w', 'ignore-all-space', None, |
|
114 | ('w', 'ignore-all-space', None, | |
115 | _('ignore white space when comparing lines')), |
|
115 | _('ignore white space when comparing lines')), | |
116 | ('b', 'ignore-space-change', None, |
|
116 | ('b', 'ignore-space-change', None, | |
117 | _('ignore changes in the amount of white space')), |
|
117 | _('ignore changes in the amount of white space')), | |
118 | ('B', 'ignore-blank-lines', None, |
|
118 | ('B', 'ignore-blank-lines', None, | |
119 | _('ignore changes whose lines are all blank')), |
|
119 | _('ignore changes whose lines are all blank')), | |
120 | ] |
|
120 | ] | |
121 |
|
121 | |||
122 | diffopts2 = [ |
|
122 | diffopts2 = [ | |
123 | ('p', 'show-function', None, _('show which function each change is in')), |
|
123 | ('p', 'show-function', None, _('show which function each change is in')), | |
124 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
124 | ('', 'reverse', None, _('produce a diff that undoes the changes')), | |
125 | ] + diffwsopts + [ |
|
125 | ] + diffwsopts + [ | |
126 | ('U', 'unified', '', |
|
126 | ('U', 'unified', '', | |
127 | _('number of lines of context to show'), _('NUM')), |
|
127 | _('number of lines of context to show'), _('NUM')), | |
128 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
128 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
129 | ] |
|
129 | ] | |
130 |
|
130 | |||
131 | mergetoolopts = [ |
|
131 | mergetoolopts = [ | |
132 | ('t', 'tool', '', _('specify merge tool')), |
|
132 | ('t', 'tool', '', _('specify merge tool')), | |
133 | ] |
|
133 | ] | |
134 |
|
134 | |||
135 | similarityopts = [ |
|
135 | similarityopts = [ | |
136 | ('s', 'similarity', '', |
|
136 | ('s', 'similarity', '', | |
137 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
|
137 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) | |
138 | ] |
|
138 | ] | |
139 |
|
139 | |||
140 | subrepoopts = [ |
|
140 | subrepoopts = [ | |
141 | ('S', 'subrepos', None, |
|
141 | ('S', 'subrepos', None, | |
142 | _('recurse into subrepositories')) |
|
142 | _('recurse into subrepositories')) | |
143 | ] |
|
143 | ] | |
144 |
|
144 | |||
145 | # Commands start here, listed alphabetically |
|
145 | # Commands start here, listed alphabetically | |
146 |
|
146 | |||
147 | @command('^add', |
|
147 | @command('^add', | |
148 | walkopts + subrepoopts + dryrunopts, |
|
148 | walkopts + subrepoopts + dryrunopts, | |
149 | _('[OPTION]... [FILE]...')) |
|
149 | _('[OPTION]... [FILE]...')) | |
150 | def add(ui, repo, *pats, **opts): |
|
150 | def add(ui, repo, *pats, **opts): | |
151 | """add the specified files on the next commit |
|
151 | """add the specified files on the next commit | |
152 |
|
152 | |||
153 | Schedule files to be version controlled and added to the |
|
153 | Schedule files to be version controlled and added to the | |
154 | repository. |
|
154 | repository. | |
155 |
|
155 | |||
156 | The files will be added to the repository at the next commit. To |
|
156 | The files will be added to the repository at the next commit. To | |
157 | undo an add before that, see :hg:`forget`. |
|
157 | undo an add before that, see :hg:`forget`. | |
158 |
|
158 | |||
159 | If no names are given, add all files to the repository. |
|
159 | If no names are given, add all files to the repository. | |
160 |
|
160 | |||
161 | .. container:: verbose |
|
161 | .. container:: verbose | |
162 |
|
162 | |||
163 | An example showing how new (unknown) files are added |
|
163 | An example showing how new (unknown) files are added | |
164 | automatically by :hg:`add`:: |
|
164 | automatically by :hg:`add`:: | |
165 |
|
165 | |||
166 | $ ls |
|
166 | $ ls | |
167 | foo.c |
|
167 | foo.c | |
168 | $ hg status |
|
168 | $ hg status | |
169 | ? foo.c |
|
169 | ? foo.c | |
170 | $ hg add |
|
170 | $ hg add | |
171 | adding foo.c |
|
171 | adding foo.c | |
172 | $ hg status |
|
172 | $ hg status | |
173 | A foo.c |
|
173 | A foo.c | |
174 |
|
174 | |||
175 | Returns 0 if all files are successfully added. |
|
175 | Returns 0 if all files are successfully added. | |
176 | """ |
|
176 | """ | |
177 |
|
177 | |||
178 | m = scmutil.match(repo[None], pats, opts) |
|
178 | m = scmutil.match(repo[None], pats, opts) | |
179 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), |
|
179 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), | |
180 | opts.get('subrepos'), prefix="", explicitonly=False) |
|
180 | opts.get('subrepos'), prefix="", explicitonly=False) | |
181 | return rejected and 1 or 0 |
|
181 | return rejected and 1 or 0 | |
182 |
|
182 | |||
183 | @command('addremove', |
|
183 | @command('addremove', | |
184 | similarityopts + walkopts + dryrunopts, |
|
184 | similarityopts + walkopts + dryrunopts, | |
185 | _('[OPTION]... [FILE]...')) |
|
185 | _('[OPTION]... [FILE]...')) | |
186 | def addremove(ui, repo, *pats, **opts): |
|
186 | def addremove(ui, repo, *pats, **opts): | |
187 | """add all new files, delete all missing files |
|
187 | """add all new files, delete all missing files | |
188 |
|
188 | |||
189 | Add all new files and remove all missing files from the |
|
189 | Add all new files and remove all missing files from the | |
190 | repository. |
|
190 | repository. | |
191 |
|
191 | |||
192 | New files are ignored if they match any of the patterns in |
|
192 | New files are ignored if they match any of the patterns in | |
193 | ``.hgignore``. As with add, these changes take effect at the next |
|
193 | ``.hgignore``. As with add, these changes take effect at the next | |
194 | commit. |
|
194 | commit. | |
195 |
|
195 | |||
196 | Use the -s/--similarity option to detect renamed files. This |
|
196 | Use the -s/--similarity option to detect renamed files. This | |
197 | option takes a percentage between 0 (disabled) and 100 (files must |
|
197 | option takes a percentage between 0 (disabled) and 100 (files must | |
198 | be identical) as its parameter. With a parameter greater than 0, |
|
198 | be identical) as its parameter. With a parameter greater than 0, | |
199 | this compares every removed file with every added file and records |
|
199 | this compares every removed file with every added file and records | |
200 | those similar enough as renames. Detecting renamed files this way |
|
200 | those similar enough as renames. Detecting renamed files this way | |
201 | can be expensive. After using this option, :hg:`status -C` can be |
|
201 | can be expensive. After using this option, :hg:`status -C` can be | |
202 | used to check which files were identified as moved or renamed. If |
|
202 | used to check which files were identified as moved or renamed. If | |
203 | not specified, -s/--similarity defaults to 100 and only renames of |
|
203 | not specified, -s/--similarity defaults to 100 and only renames of | |
204 | identical files are detected. |
|
204 | identical files are detected. | |
205 |
|
205 | |||
206 | Returns 0 if all files are successfully added. |
|
206 | Returns 0 if all files are successfully added. | |
207 | """ |
|
207 | """ | |
208 | try: |
|
208 | try: | |
209 | sim = float(opts.get('similarity') or 100) |
|
209 | sim = float(opts.get('similarity') or 100) | |
210 | except ValueError: |
|
210 | except ValueError: | |
211 | raise util.Abort(_('similarity must be a number')) |
|
211 | raise util.Abort(_('similarity must be a number')) | |
212 | if sim < 0 or sim > 100: |
|
212 | if sim < 0 or sim > 100: | |
213 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
213 | raise util.Abort(_('similarity must be between 0 and 100')) | |
214 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) |
|
214 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) | |
215 |
|
215 | |||
216 | @command('^annotate|blame', |
|
216 | @command('^annotate|blame', | |
217 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
217 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
218 | ('', 'follow', None, |
|
218 | ('', 'follow', None, | |
219 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
219 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
220 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
220 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
221 | ('a', 'text', None, _('treat all files as text')), |
|
221 | ('a', 'text', None, _('treat all files as text')), | |
222 | ('u', 'user', None, _('list the author (long with -v)')), |
|
222 | ('u', 'user', None, _('list the author (long with -v)')), | |
223 | ('f', 'file', None, _('list the filename')), |
|
223 | ('f', 'file', None, _('list the filename')), | |
224 | ('d', 'date', None, _('list the date (short with -q)')), |
|
224 | ('d', 'date', None, _('list the date (short with -q)')), | |
225 | ('n', 'number', None, _('list the revision number (default)')), |
|
225 | ('n', 'number', None, _('list the revision number (default)')), | |
226 | ('c', 'changeset', None, _('list the changeset')), |
|
226 | ('c', 'changeset', None, _('list the changeset')), | |
227 | ('l', 'line-number', None, _('show line number at the first appearance')) |
|
227 | ('l', 'line-number', None, _('show line number at the first appearance')) | |
228 | ] + diffwsopts + walkopts, |
|
228 | ] + diffwsopts + walkopts, | |
229 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) |
|
229 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) | |
230 | def annotate(ui, repo, *pats, **opts): |
|
230 | def annotate(ui, repo, *pats, **opts): | |
231 | """show changeset information by line for each file |
|
231 | """show changeset information by line for each file | |
232 |
|
232 | |||
233 | List changes in files, showing the revision id responsible for |
|
233 | List changes in files, showing the revision id responsible for | |
234 | each line |
|
234 | each line | |
235 |
|
235 | |||
236 | This command is useful for discovering when a change was made and |
|
236 | This command is useful for discovering when a change was made and | |
237 | by whom. |
|
237 | by whom. | |
238 |
|
238 | |||
239 | Without the -a/--text option, annotate will avoid processing files |
|
239 | Without the -a/--text option, annotate will avoid processing files | |
240 | it detects as binary. With -a, annotate will annotate the file |
|
240 | it detects as binary. With -a, annotate will annotate the file | |
241 | anyway, although the results will probably be neither useful |
|
241 | anyway, although the results will probably be neither useful | |
242 | nor desirable. |
|
242 | nor desirable. | |
243 |
|
243 | |||
244 | Returns 0 on success. |
|
244 | Returns 0 on success. | |
245 | """ |
|
245 | """ | |
246 | if opts.get('follow'): |
|
246 | if opts.get('follow'): | |
247 | # --follow is deprecated and now just an alias for -f/--file |
|
247 | # --follow is deprecated and now just an alias for -f/--file | |
248 | # to mimic the behavior of Mercurial before version 1.5 |
|
248 | # to mimic the behavior of Mercurial before version 1.5 | |
249 | opts['file'] = True |
|
249 | opts['file'] = True | |
250 |
|
250 | |||
251 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
251 | datefunc = ui.quiet and util.shortdate or util.datestr | |
252 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
|
252 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) | |
253 |
|
253 | |||
254 | if not pats: |
|
254 | if not pats: | |
255 | raise util.Abort(_('at least one filename or pattern is required')) |
|
255 | raise util.Abort(_('at least one filename or pattern is required')) | |
256 |
|
256 | |||
257 | hexfn = ui.debugflag and hex or short |
|
257 | hexfn = ui.debugflag and hex or short | |
258 |
|
258 | |||
259 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), |
|
259 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), | |
260 | ('number', ' ', lambda x: str(x[0].rev())), |
|
260 | ('number', ' ', lambda x: str(x[0].rev())), | |
261 | ('changeset', ' ', lambda x: hexfn(x[0].node())), |
|
261 | ('changeset', ' ', lambda x: hexfn(x[0].node())), | |
262 | ('date', ' ', getdate), |
|
262 | ('date', ' ', getdate), | |
263 | ('file', ' ', lambda x: x[0].path()), |
|
263 | ('file', ' ', lambda x: x[0].path()), | |
264 | ('line_number', ':', lambda x: str(x[1])), |
|
264 | ('line_number', ':', lambda x: str(x[1])), | |
265 | ] |
|
265 | ] | |
266 |
|
266 | |||
267 | if (not opts.get('user') and not opts.get('changeset') |
|
267 | if (not opts.get('user') and not opts.get('changeset') | |
268 | and not opts.get('date') and not opts.get('file')): |
|
268 | and not opts.get('date') and not opts.get('file')): | |
269 | opts['number'] = True |
|
269 | opts['number'] = True | |
270 |
|
270 | |||
271 | linenumber = opts.get('line_number') is not None |
|
271 | linenumber = opts.get('line_number') is not None | |
272 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
272 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
273 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
273 | raise util.Abort(_('at least one of -n/-c is required for -l')) | |
274 |
|
274 | |||
275 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] |
|
275 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] | |
276 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
276 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
277 |
|
277 | |||
278 | def bad(x, y): |
|
278 | def bad(x, y): | |
279 | raise util.Abort("%s: %s" % (x, y)) |
|
279 | raise util.Abort("%s: %s" % (x, y)) | |
280 |
|
280 | |||
281 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
281 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
282 | m = scmutil.match(ctx, pats, opts) |
|
282 | m = scmutil.match(ctx, pats, opts) | |
283 | m.bad = bad |
|
283 | m.bad = bad | |
284 | follow = not opts.get('no_follow') |
|
284 | follow = not opts.get('no_follow') | |
285 | diffopts = patch.diffopts(ui, opts, section='annotate') |
|
285 | diffopts = patch.diffopts(ui, opts, section='annotate') | |
286 | for abs in ctx.walk(m): |
|
286 | for abs in ctx.walk(m): | |
287 | fctx = ctx[abs] |
|
287 | fctx = ctx[abs] | |
288 | if not opts.get('text') and util.binary(fctx.data()): |
|
288 | if not opts.get('text') and util.binary(fctx.data()): | |
289 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
289 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) | |
290 | continue |
|
290 | continue | |
291 |
|
291 | |||
292 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
292 | lines = fctx.annotate(follow=follow, linenumber=linenumber, | |
293 | diffopts=diffopts) |
|
293 | diffopts=diffopts) | |
294 | pieces = [] |
|
294 | pieces = [] | |
295 |
|
295 | |||
296 | for f, sep in funcmap: |
|
296 | for f, sep in funcmap: | |
297 | l = [f(n) for n, dummy in lines] |
|
297 | l = [f(n) for n, dummy in lines] | |
298 | if l: |
|
298 | if l: | |
299 | sized = [(x, encoding.colwidth(x)) for x in l] |
|
299 | sized = [(x, encoding.colwidth(x)) for x in l] | |
300 | ml = max([w for x, w in sized]) |
|
300 | ml = max([w for x, w in sized]) | |
301 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) |
|
301 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) | |
302 | for x, w in sized]) |
|
302 | for x, w in sized]) | |
303 |
|
303 | |||
304 | if pieces: |
|
304 | if pieces: | |
305 | for p, l in zip(zip(*pieces), lines): |
|
305 | for p, l in zip(zip(*pieces), lines): | |
306 | ui.write("%s: %s" % ("".join(p), l[1])) |
|
306 | ui.write("%s: %s" % ("".join(p), l[1])) | |
307 |
|
307 | |||
308 | if lines and not lines[-1][1].endswith('\n'): |
|
308 | if lines and not lines[-1][1].endswith('\n'): | |
309 | ui.write('\n') |
|
309 | ui.write('\n') | |
310 |
|
310 | |||
311 | @command('archive', |
|
311 | @command('archive', | |
312 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
312 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
313 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
313 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
314 | _('PREFIX')), |
|
314 | _('PREFIX')), | |
315 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
315 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
316 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
316 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
317 | ] + subrepoopts + walkopts, |
|
317 | ] + subrepoopts + walkopts, | |
318 | _('[OPTION]... DEST')) |
|
318 | _('[OPTION]... DEST')) | |
319 | def archive(ui, repo, dest, **opts): |
|
319 | def archive(ui, repo, dest, **opts): | |
320 | '''create an unversioned archive of a repository revision |
|
320 | '''create an unversioned archive of a repository revision | |
321 |
|
321 | |||
322 | By default, the revision used is the parent of the working |
|
322 | By default, the revision used is the parent of the working | |
323 | directory; use -r/--rev to specify a different revision. |
|
323 | directory; use -r/--rev to specify a different revision. | |
324 |
|
324 | |||
325 | The archive type is automatically detected based on file |
|
325 | The archive type is automatically detected based on file | |
326 | extension (or override using -t/--type). |
|
326 | extension (or override using -t/--type). | |
327 |
|
327 | |||
328 | .. container:: verbose |
|
328 | .. container:: verbose | |
329 |
|
329 | |||
330 | Examples: |
|
330 | Examples: | |
331 |
|
331 | |||
332 | - create a zip file containing the 1.0 release:: |
|
332 | - create a zip file containing the 1.0 release:: | |
333 |
|
333 | |||
334 | hg archive -r 1.0 project-1.0.zip |
|
334 | hg archive -r 1.0 project-1.0.zip | |
335 |
|
335 | |||
336 | - create a tarball excluding .hg files:: |
|
336 | - create a tarball excluding .hg files:: | |
337 |
|
337 | |||
338 | hg archive project.tar.gz -X ".hg*" |
|
338 | hg archive project.tar.gz -X ".hg*" | |
339 |
|
339 | |||
340 | Valid types are: |
|
340 | Valid types are: | |
341 |
|
341 | |||
342 | :``files``: a directory full of files (default) |
|
342 | :``files``: a directory full of files (default) | |
343 | :``tar``: tar archive, uncompressed |
|
343 | :``tar``: tar archive, uncompressed | |
344 | :``tbz2``: tar archive, compressed using bzip2 |
|
344 | :``tbz2``: tar archive, compressed using bzip2 | |
345 | :``tgz``: tar archive, compressed using gzip |
|
345 | :``tgz``: tar archive, compressed using gzip | |
346 | :``uzip``: zip archive, uncompressed |
|
346 | :``uzip``: zip archive, uncompressed | |
347 | :``zip``: zip archive, compressed using deflate |
|
347 | :``zip``: zip archive, compressed using deflate | |
348 |
|
348 | |||
349 | The exact name of the destination archive or directory is given |
|
349 | The exact name of the destination archive or directory is given | |
350 | using a format string; see :hg:`help export` for details. |
|
350 | using a format string; see :hg:`help export` for details. | |
351 |
|
351 | |||
352 | Each member added to an archive file has a directory prefix |
|
352 | Each member added to an archive file has a directory prefix | |
353 | prepended. Use -p/--prefix to specify a format string for the |
|
353 | prepended. Use -p/--prefix to specify a format string for the | |
354 | prefix. The default is the basename of the archive, with suffixes |
|
354 | prefix. The default is the basename of the archive, with suffixes | |
355 | removed. |
|
355 | removed. | |
356 |
|
356 | |||
357 | Returns 0 on success. |
|
357 | Returns 0 on success. | |
358 | ''' |
|
358 | ''' | |
359 |
|
359 | |||
360 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
360 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
361 | if not ctx: |
|
361 | if not ctx: | |
362 | raise util.Abort(_('no working directory: please specify a revision')) |
|
362 | raise util.Abort(_('no working directory: please specify a revision')) | |
363 | node = ctx.node() |
|
363 | node = ctx.node() | |
364 | dest = cmdutil.makefilename(repo, dest, node) |
|
364 | dest = cmdutil.makefilename(repo, dest, node) | |
365 | if os.path.realpath(dest) == repo.root: |
|
365 | if os.path.realpath(dest) == repo.root: | |
366 | raise util.Abort(_('repository root cannot be destination')) |
|
366 | raise util.Abort(_('repository root cannot be destination')) | |
367 |
|
367 | |||
368 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
368 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
369 | prefix = opts.get('prefix') |
|
369 | prefix = opts.get('prefix') | |
370 |
|
370 | |||
371 | if dest == '-': |
|
371 | if dest == '-': | |
372 | if kind == 'files': |
|
372 | if kind == 'files': | |
373 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
373 | raise util.Abort(_('cannot archive plain files to stdout')) | |
374 | dest = cmdutil.makefileobj(repo, dest) |
|
374 | dest = cmdutil.makefileobj(repo, dest) | |
375 | if not prefix: |
|
375 | if not prefix: | |
376 | prefix = os.path.basename(repo.root) + '-%h' |
|
376 | prefix = os.path.basename(repo.root) + '-%h' | |
377 |
|
377 | |||
378 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
378 | prefix = cmdutil.makefilename(repo, prefix, node) | |
379 | matchfn = scmutil.match(ctx, [], opts) |
|
379 | matchfn = scmutil.match(ctx, [], opts) | |
380 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
380 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
381 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
381 | matchfn, prefix, subrepos=opts.get('subrepos')) | |
382 |
|
382 | |||
383 | @command('backout', |
|
383 | @command('backout', | |
384 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
384 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
385 | ('', 'parent', '', |
|
385 | ('', 'parent', '', | |
386 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
386 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
387 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
387 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
388 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
388 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
389 | _('[OPTION]... [-r] REV')) |
|
389 | _('[OPTION]... [-r] REV')) | |
390 | def backout(ui, repo, node=None, rev=None, **opts): |
|
390 | def backout(ui, repo, node=None, rev=None, **opts): | |
391 | '''reverse effect of earlier changeset |
|
391 | '''reverse effect of earlier changeset | |
392 |
|
392 | |||
393 | Prepare a new changeset with the effect of REV undone in the |
|
393 | Prepare a new changeset with the effect of REV undone in the | |
394 | current working directory. |
|
394 | current working directory. | |
395 |
|
395 | |||
396 | If REV is the parent of the working directory, then this new changeset |
|
396 | If REV is the parent of the working directory, then this new changeset | |
397 | is committed automatically. Otherwise, hg needs to merge the |
|
397 | is committed automatically. Otherwise, hg needs to merge the | |
398 | changes and the merged result is left uncommitted. |
|
398 | changes and the merged result is left uncommitted. | |
399 |
|
399 | |||
400 | .. note:: |
|
400 | .. note:: | |
401 |
|
401 | |||
402 | backout cannot be used to fix either an unwanted or |
|
402 | backout cannot be used to fix either an unwanted or | |
403 | incorrect merge. |
|
403 | incorrect merge. | |
404 |
|
404 | |||
405 | .. container:: verbose |
|
405 | .. container:: verbose | |
406 |
|
406 | |||
407 | By default, the pending changeset will have one parent, |
|
407 | By default, the pending changeset will have one parent, | |
408 | maintaining a linear history. With --merge, the pending |
|
408 | maintaining a linear history. With --merge, the pending | |
409 | changeset will instead have two parents: the old parent of the |
|
409 | changeset will instead have two parents: the old parent of the | |
410 | working directory and a new child of REV that simply undoes REV. |
|
410 | working directory and a new child of REV that simply undoes REV. | |
411 |
|
411 | |||
412 | Before version 1.7, the behavior without --merge was equivalent |
|
412 | Before version 1.7, the behavior without --merge was equivalent | |
413 | to specifying --merge followed by :hg:`update --clean .` to |
|
413 | to specifying --merge followed by :hg:`update --clean .` to | |
414 | cancel the merge and leave the child of REV as a head to be |
|
414 | cancel the merge and leave the child of REV as a head to be | |
415 | merged separately. |
|
415 | merged separately. | |
416 |
|
416 | |||
417 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
417 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
418 |
|
418 | |||
419 | Returns 0 on success. |
|
419 | Returns 0 on success. | |
420 | ''' |
|
420 | ''' | |
421 | if rev and node: |
|
421 | if rev and node: | |
422 | raise util.Abort(_("please specify just one revision")) |
|
422 | raise util.Abort(_("please specify just one revision")) | |
423 |
|
423 | |||
424 | if not rev: |
|
424 | if not rev: | |
425 | rev = node |
|
425 | rev = node | |
426 |
|
426 | |||
427 | if not rev: |
|
427 | if not rev: | |
428 | raise util.Abort(_("please specify a revision to backout")) |
|
428 | raise util.Abort(_("please specify a revision to backout")) | |
429 |
|
429 | |||
430 | date = opts.get('date') |
|
430 | date = opts.get('date') | |
431 | if date: |
|
431 | if date: | |
432 | opts['date'] = util.parsedate(date) |
|
432 | opts['date'] = util.parsedate(date) | |
433 |
|
433 | |||
434 | cmdutil.checkunfinished(repo) |
|
434 | cmdutil.checkunfinished(repo) | |
435 | cmdutil.bailifchanged(repo) |
|
435 | cmdutil.bailifchanged(repo) | |
436 | node = scmutil.revsingle(repo, rev).node() |
|
436 | node = scmutil.revsingle(repo, rev).node() | |
437 |
|
437 | |||
438 | op1, op2 = repo.dirstate.parents() |
|
438 | op1, op2 = repo.dirstate.parents() | |
439 | a = repo.changelog.ancestor(op1, node) |
|
439 | a = repo.changelog.ancestor(op1, node) | |
440 | if a != node: |
|
440 | if a != node: | |
441 | raise util.Abort(_('cannot backout change on a different branch')) |
|
441 | raise util.Abort(_('cannot backout change on a different branch')) | |
442 |
|
442 | |||
443 | p1, p2 = repo.changelog.parents(node) |
|
443 | p1, p2 = repo.changelog.parents(node) | |
444 | if p1 == nullid: |
|
444 | if p1 == nullid: | |
445 | raise util.Abort(_('cannot backout a change with no parents')) |
|
445 | raise util.Abort(_('cannot backout a change with no parents')) | |
446 | if p2 != nullid: |
|
446 | if p2 != nullid: | |
447 | if not opts.get('parent'): |
|
447 | if not opts.get('parent'): | |
448 | raise util.Abort(_('cannot backout a merge changeset')) |
|
448 | raise util.Abort(_('cannot backout a merge changeset')) | |
449 | p = repo.lookup(opts['parent']) |
|
449 | p = repo.lookup(opts['parent']) | |
450 | if p not in (p1, p2): |
|
450 | if p not in (p1, p2): | |
451 | raise util.Abort(_('%s is not a parent of %s') % |
|
451 | raise util.Abort(_('%s is not a parent of %s') % | |
452 | (short(p), short(node))) |
|
452 | (short(p), short(node))) | |
453 | parent = p |
|
453 | parent = p | |
454 | else: |
|
454 | else: | |
455 | if opts.get('parent'): |
|
455 | if opts.get('parent'): | |
456 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
456 | raise util.Abort(_('cannot use --parent on non-merge changeset')) | |
457 | parent = p1 |
|
457 | parent = p1 | |
458 |
|
458 | |||
459 | # the backout should appear on the same branch |
|
459 | # the backout should appear on the same branch | |
460 | wlock = repo.wlock() |
|
460 | wlock = repo.wlock() | |
461 | try: |
|
461 | try: | |
462 | branch = repo.dirstate.branch() |
|
462 | branch = repo.dirstate.branch() | |
463 | bheads = repo.branchheads(branch) |
|
463 | bheads = repo.branchheads(branch) | |
464 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
464 | rctx = scmutil.revsingle(repo, hex(parent)) | |
465 | if not opts.get('merge') and op1 != node: |
|
465 | if not opts.get('merge') and op1 != node: | |
466 | try: |
|
466 | try: | |
467 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
467 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
468 | stats = mergemod.update(repo, parent, True, True, False, |
|
468 | stats = mergemod.update(repo, parent, True, True, False, | |
469 | node, False) |
|
469 | node, False) | |
470 | repo.setparents(op1, op2) |
|
470 | repo.setparents(op1, op2) | |
471 | hg._showstats(repo, stats) |
|
471 | hg._showstats(repo, stats) | |
472 | if stats[3]: |
|
472 | if stats[3]: | |
473 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
473 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
474 | "file merges\n")) |
|
474 | "file merges\n")) | |
475 | else: |
|
475 | else: | |
476 | msg = _("changeset %s backed out, " |
|
476 | msg = _("changeset %s backed out, " | |
477 | "don't forget to commit.\n") |
|
477 | "don't forget to commit.\n") | |
478 | ui.status(msg % short(node)) |
|
478 | ui.status(msg % short(node)) | |
479 | return stats[3] > 0 |
|
479 | return stats[3] > 0 | |
480 | finally: |
|
480 | finally: | |
481 | ui.setconfig('ui', 'forcemerge', '') |
|
481 | ui.setconfig('ui', 'forcemerge', '') | |
482 | else: |
|
482 | else: | |
483 | hg.clean(repo, node, show_stats=False) |
|
483 | hg.clean(repo, node, show_stats=False) | |
484 | repo.dirstate.setbranch(branch) |
|
484 | repo.dirstate.setbranch(branch) | |
485 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
485 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
486 |
|
486 | |||
487 |
|
487 | |||
488 | e = cmdutil.commiteditor |
|
488 | e = cmdutil.commiteditor | |
489 | if not opts['message'] and not opts['logfile']: |
|
489 | if not opts['message'] and not opts['logfile']: | |
490 | # we don't translate commit messages |
|
490 | # we don't translate commit messages | |
491 | opts['message'] = "Backed out changeset %s" % short(node) |
|
491 | opts['message'] = "Backed out changeset %s" % short(node) | |
492 | e = cmdutil.commitforceeditor |
|
492 | e = cmdutil.commitforceeditor | |
493 |
|
493 | |||
494 | def commitfunc(ui, repo, message, match, opts): |
|
494 | def commitfunc(ui, repo, message, match, opts): | |
495 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
495 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
496 | match, editor=e) |
|
496 | match, editor=e) | |
497 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
497 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
498 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
498 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
499 |
|
499 | |||
500 | def nice(node): |
|
500 | def nice(node): | |
501 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
501 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
502 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
502 | ui.status(_('changeset %s backs out changeset %s\n') % | |
503 | (nice(repo.changelog.tip()), nice(node))) |
|
503 | (nice(repo.changelog.tip()), nice(node))) | |
504 | if opts.get('merge') and op1 != node: |
|
504 | if opts.get('merge') and op1 != node: | |
505 | hg.clean(repo, op1, show_stats=False) |
|
505 | hg.clean(repo, op1, show_stats=False) | |
506 | ui.status(_('merging with changeset %s\n') |
|
506 | ui.status(_('merging with changeset %s\n') | |
507 | % nice(repo.changelog.tip())) |
|
507 | % nice(repo.changelog.tip())) | |
508 | try: |
|
508 | try: | |
509 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
509 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
510 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
510 | return hg.merge(repo, hex(repo.changelog.tip())) | |
511 | finally: |
|
511 | finally: | |
512 | ui.setconfig('ui', 'forcemerge', '') |
|
512 | ui.setconfig('ui', 'forcemerge', '') | |
513 | finally: |
|
513 | finally: | |
514 | wlock.release() |
|
514 | wlock.release() | |
515 | return 0 |
|
515 | return 0 | |
516 |
|
516 | |||
517 | @command('bisect', |
|
517 | @command('bisect', | |
518 | [('r', 'reset', False, _('reset bisect state')), |
|
518 | [('r', 'reset', False, _('reset bisect state')), | |
519 | ('g', 'good', False, _('mark changeset good')), |
|
519 | ('g', 'good', False, _('mark changeset good')), | |
520 | ('b', 'bad', False, _('mark changeset bad')), |
|
520 | ('b', 'bad', False, _('mark changeset bad')), | |
521 | ('s', 'skip', False, _('skip testing changeset')), |
|
521 | ('s', 'skip', False, _('skip testing changeset')), | |
522 | ('e', 'extend', False, _('extend the bisect range')), |
|
522 | ('e', 'extend', False, _('extend the bisect range')), | |
523 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
523 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
524 | ('U', 'noupdate', False, _('do not update to target'))], |
|
524 | ('U', 'noupdate', False, _('do not update to target'))], | |
525 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
525 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
526 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
526 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
527 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
527 | reset=None, good=None, bad=None, skip=None, extend=None, | |
528 | noupdate=None): |
|
528 | noupdate=None): | |
529 | """subdivision search of changesets |
|
529 | """subdivision search of changesets | |
530 |
|
530 | |||
531 | This command helps to find changesets which introduce problems. To |
|
531 | This command helps to find changesets which introduce problems. To | |
532 | use, mark the earliest changeset you know exhibits the problem as |
|
532 | use, mark the earliest changeset you know exhibits the problem as | |
533 | bad, then mark the latest changeset which is free from the problem |
|
533 | bad, then mark the latest changeset which is free from the problem | |
534 | as good. Bisect will update your working directory to a revision |
|
534 | as good. Bisect will update your working directory to a revision | |
535 | for testing (unless the -U/--noupdate option is specified). Once |
|
535 | for testing (unless the -U/--noupdate option is specified). Once | |
536 | you have performed tests, mark the working directory as good or |
|
536 | you have performed tests, mark the working directory as good or | |
537 | bad, and bisect will either update to another candidate changeset |
|
537 | bad, and bisect will either update to another candidate changeset | |
538 | or announce that it has found the bad revision. |
|
538 | or announce that it has found the bad revision. | |
539 |
|
539 | |||
540 | As a shortcut, you can also use the revision argument to mark a |
|
540 | As a shortcut, you can also use the revision argument to mark a | |
541 | revision as good or bad without checking it out first. |
|
541 | revision as good or bad without checking it out first. | |
542 |
|
542 | |||
543 | If you supply a command, it will be used for automatic bisection. |
|
543 | If you supply a command, it will be used for automatic bisection. | |
544 | The environment variable HG_NODE will contain the ID of the |
|
544 | The environment variable HG_NODE will contain the ID of the | |
545 | changeset being tested. The exit status of the command will be |
|
545 | changeset being tested. The exit status of the command will be | |
546 | used to mark revisions as good or bad: status 0 means good, 125 |
|
546 | used to mark revisions as good or bad: status 0 means good, 125 | |
547 | means to skip the revision, 127 (command not found) will abort the |
|
547 | means to skip the revision, 127 (command not found) will abort the | |
548 | bisection, and any other non-zero exit status means the revision |
|
548 | bisection, and any other non-zero exit status means the revision | |
549 | is bad. |
|
549 | is bad. | |
550 |
|
550 | |||
551 | .. container:: verbose |
|
551 | .. container:: verbose | |
552 |
|
552 | |||
553 | Some examples: |
|
553 | Some examples: | |
554 |
|
554 | |||
555 | - start a bisection with known bad revision 34, and good revision 12:: |
|
555 | - start a bisection with known bad revision 34, and good revision 12:: | |
556 |
|
556 | |||
557 | hg bisect --bad 34 |
|
557 | hg bisect --bad 34 | |
558 | hg bisect --good 12 |
|
558 | hg bisect --good 12 | |
559 |
|
559 | |||
560 | - advance the current bisection by marking current revision as good or |
|
560 | - advance the current bisection by marking current revision as good or | |
561 | bad:: |
|
561 | bad:: | |
562 |
|
562 | |||
563 | hg bisect --good |
|
563 | hg bisect --good | |
564 | hg bisect --bad |
|
564 | hg bisect --bad | |
565 |
|
565 | |||
566 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
566 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
567 | that revision is not usable because of another issue):: |
|
567 | that revision is not usable because of another issue):: | |
568 |
|
568 | |||
569 | hg bisect --skip |
|
569 | hg bisect --skip | |
570 | hg bisect --skip 23 |
|
570 | hg bisect --skip 23 | |
571 |
|
571 | |||
572 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
572 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
573 |
|
573 | |||
574 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
574 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
575 |
|
575 | |||
576 | - forget the current bisection:: |
|
576 | - forget the current bisection:: | |
577 |
|
577 | |||
578 | hg bisect --reset |
|
578 | hg bisect --reset | |
579 |
|
579 | |||
580 | - use 'make && make tests' to automatically find the first broken |
|
580 | - use 'make && make tests' to automatically find the first broken | |
581 | revision:: |
|
581 | revision:: | |
582 |
|
582 | |||
583 | hg bisect --reset |
|
583 | hg bisect --reset | |
584 | hg bisect --bad 34 |
|
584 | hg bisect --bad 34 | |
585 | hg bisect --good 12 |
|
585 | hg bisect --good 12 | |
586 | hg bisect --command "make && make tests" |
|
586 | hg bisect --command "make && make tests" | |
587 |
|
587 | |||
588 | - see all changesets whose states are already known in the current |
|
588 | - see all changesets whose states are already known in the current | |
589 | bisection:: |
|
589 | bisection:: | |
590 |
|
590 | |||
591 | hg log -r "bisect(pruned)" |
|
591 | hg log -r "bisect(pruned)" | |
592 |
|
592 | |||
593 | - see the changeset currently being bisected (especially useful |
|
593 | - see the changeset currently being bisected (especially useful | |
594 | if running with -U/--noupdate):: |
|
594 | if running with -U/--noupdate):: | |
595 |
|
595 | |||
596 | hg log -r "bisect(current)" |
|
596 | hg log -r "bisect(current)" | |
597 |
|
597 | |||
598 | - see all changesets that took part in the current bisection:: |
|
598 | - see all changesets that took part in the current bisection:: | |
599 |
|
599 | |||
600 | hg log -r "bisect(range)" |
|
600 | hg log -r "bisect(range)" | |
601 |
|
601 | |||
602 | - you can even get a nice graph:: |
|
602 | - you can even get a nice graph:: | |
603 |
|
603 | |||
604 | hg log --graph -r "bisect(range)" |
|
604 | hg log --graph -r "bisect(range)" | |
605 |
|
605 | |||
606 | See :hg:`help revsets` for more about the `bisect()` keyword. |
|
606 | See :hg:`help revsets` for more about the `bisect()` keyword. | |
607 |
|
607 | |||
608 | Returns 0 on success. |
|
608 | Returns 0 on success. | |
609 | """ |
|
609 | """ | |
610 | def extendbisectrange(nodes, good): |
|
610 | def extendbisectrange(nodes, good): | |
611 | # bisect is incomplete when it ends on a merge node and |
|
611 | # bisect is incomplete when it ends on a merge node and | |
612 | # one of the parent was not checked. |
|
612 | # one of the parent was not checked. | |
613 | parents = repo[nodes[0]].parents() |
|
613 | parents = repo[nodes[0]].parents() | |
614 | if len(parents) > 1: |
|
614 | if len(parents) > 1: | |
615 | side = good and state['bad'] or state['good'] |
|
615 | side = good and state['bad'] or state['good'] | |
616 | num = len(set(i.node() for i in parents) & set(side)) |
|
616 | num = len(set(i.node() for i in parents) & set(side)) | |
617 | if num == 1: |
|
617 | if num == 1: | |
618 | return parents[0].ancestor(parents[1]) |
|
618 | return parents[0].ancestor(parents[1]) | |
619 | return None |
|
619 | return None | |
620 |
|
620 | |||
621 | def print_result(nodes, good): |
|
621 | def print_result(nodes, good): | |
622 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
622 | displayer = cmdutil.show_changeset(ui, repo, {}) | |
623 | if len(nodes) == 1: |
|
623 | if len(nodes) == 1: | |
624 | # narrowed it down to a single revision |
|
624 | # narrowed it down to a single revision | |
625 | if good: |
|
625 | if good: | |
626 | ui.write(_("The first good revision is:\n")) |
|
626 | ui.write(_("The first good revision is:\n")) | |
627 | else: |
|
627 | else: | |
628 | ui.write(_("The first bad revision is:\n")) |
|
628 | ui.write(_("The first bad revision is:\n")) | |
629 | displayer.show(repo[nodes[0]]) |
|
629 | displayer.show(repo[nodes[0]]) | |
630 | extendnode = extendbisectrange(nodes, good) |
|
630 | extendnode = extendbisectrange(nodes, good) | |
631 | if extendnode is not None: |
|
631 | if extendnode is not None: | |
632 | ui.write(_('Not all ancestors of this changeset have been' |
|
632 | ui.write(_('Not all ancestors of this changeset have been' | |
633 | ' checked.\nUse bisect --extend to continue the ' |
|
633 | ' checked.\nUse bisect --extend to continue the ' | |
634 | 'bisection from\nthe common ancestor, %s.\n') |
|
634 | 'bisection from\nthe common ancestor, %s.\n') | |
635 | % extendnode) |
|
635 | % extendnode) | |
636 | else: |
|
636 | else: | |
637 | # multiple possible revisions |
|
637 | # multiple possible revisions | |
638 | if good: |
|
638 | if good: | |
639 | ui.write(_("Due to skipped revisions, the first " |
|
639 | ui.write(_("Due to skipped revisions, the first " | |
640 | "good revision could be any of:\n")) |
|
640 | "good revision could be any of:\n")) | |
641 | else: |
|
641 | else: | |
642 | ui.write(_("Due to skipped revisions, the first " |
|
642 | ui.write(_("Due to skipped revisions, the first " | |
643 | "bad revision could be any of:\n")) |
|
643 | "bad revision could be any of:\n")) | |
644 | for n in nodes: |
|
644 | for n in nodes: | |
645 | displayer.show(repo[n]) |
|
645 | displayer.show(repo[n]) | |
646 | displayer.close() |
|
646 | displayer.close() | |
647 |
|
647 | |||
648 | def check_state(state, interactive=True): |
|
648 | def check_state(state, interactive=True): | |
649 | if not state['good'] or not state['bad']: |
|
649 | if not state['good'] or not state['bad']: | |
650 | if (good or bad or skip or reset) and interactive: |
|
650 | if (good or bad or skip or reset) and interactive: | |
651 | return |
|
651 | return | |
652 | if not state['good']: |
|
652 | if not state['good']: | |
653 | raise util.Abort(_('cannot bisect (no known good revisions)')) |
|
653 | raise util.Abort(_('cannot bisect (no known good revisions)')) | |
654 | else: |
|
654 | else: | |
655 | raise util.Abort(_('cannot bisect (no known bad revisions)')) |
|
655 | raise util.Abort(_('cannot bisect (no known bad revisions)')) | |
656 | return True |
|
656 | return True | |
657 |
|
657 | |||
658 | # backward compatibility |
|
658 | # backward compatibility | |
659 | if rev in "good bad reset init".split(): |
|
659 | if rev in "good bad reset init".split(): | |
660 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
660 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
661 | cmd, rev, extra = rev, extra, None |
|
661 | cmd, rev, extra = rev, extra, None | |
662 | if cmd == "good": |
|
662 | if cmd == "good": | |
663 | good = True |
|
663 | good = True | |
664 | elif cmd == "bad": |
|
664 | elif cmd == "bad": | |
665 | bad = True |
|
665 | bad = True | |
666 | else: |
|
666 | else: | |
667 | reset = True |
|
667 | reset = True | |
668 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: |
|
668 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: | |
669 | raise util.Abort(_('incompatible arguments')) |
|
669 | raise util.Abort(_('incompatible arguments')) | |
670 |
|
670 | |||
671 | cmdutil.checkunfinished(repo) |
|
671 | cmdutil.checkunfinished(repo) | |
672 |
|
672 | |||
673 | if reset: |
|
673 | if reset: | |
674 | p = repo.join("bisect.state") |
|
674 | p = repo.join("bisect.state") | |
675 | if os.path.exists(p): |
|
675 | if os.path.exists(p): | |
676 | os.unlink(p) |
|
676 | os.unlink(p) | |
677 | return |
|
677 | return | |
678 |
|
678 | |||
679 | state = hbisect.load_state(repo) |
|
679 | state = hbisect.load_state(repo) | |
680 |
|
680 | |||
681 | if command: |
|
681 | if command: | |
682 | changesets = 1 |
|
682 | changesets = 1 | |
683 | if noupdate: |
|
683 | if noupdate: | |
684 | try: |
|
684 | try: | |
685 | node = state['current'][0] |
|
685 | node = state['current'][0] | |
686 | except LookupError: |
|
686 | except LookupError: | |
687 | raise util.Abort(_('current bisect revision is unknown - ' |
|
687 | raise util.Abort(_('current bisect revision is unknown - ' | |
688 | 'start a new bisect to fix')) |
|
688 | 'start a new bisect to fix')) | |
689 | else: |
|
689 | else: | |
690 | node, p2 = repo.dirstate.parents() |
|
690 | node, p2 = repo.dirstate.parents() | |
691 | if p2 != nullid: |
|
691 | if p2 != nullid: | |
692 | raise util.Abort(_('current bisect revision is a merge')) |
|
692 | raise util.Abort(_('current bisect revision is a merge')) | |
693 | try: |
|
693 | try: | |
694 | while changesets: |
|
694 | while changesets: | |
695 | # update state |
|
695 | # update state | |
696 | state['current'] = [node] |
|
696 | state['current'] = [node] | |
697 | hbisect.save_state(repo, state) |
|
697 | hbisect.save_state(repo, state) | |
698 | status = util.system(command, |
|
698 | status = util.system(command, | |
699 | environ={'HG_NODE': hex(node)}, |
|
699 | environ={'HG_NODE': hex(node)}, | |
700 | out=ui.fout) |
|
700 | out=ui.fout) | |
701 | if status == 125: |
|
701 | if status == 125: | |
702 | transition = "skip" |
|
702 | transition = "skip" | |
703 | elif status == 0: |
|
703 | elif status == 0: | |
704 | transition = "good" |
|
704 | transition = "good" | |
705 | # status < 0 means process was killed |
|
705 | # status < 0 means process was killed | |
706 | elif status == 127: |
|
706 | elif status == 127: | |
707 | raise util.Abort(_("failed to execute %s") % command) |
|
707 | raise util.Abort(_("failed to execute %s") % command) | |
708 | elif status < 0: |
|
708 | elif status < 0: | |
709 | raise util.Abort(_("%s killed") % command) |
|
709 | raise util.Abort(_("%s killed") % command) | |
710 | else: |
|
710 | else: | |
711 | transition = "bad" |
|
711 | transition = "bad" | |
712 | ctx = scmutil.revsingle(repo, rev, node) |
|
712 | ctx = scmutil.revsingle(repo, rev, node) | |
713 | rev = None # clear for future iterations |
|
713 | rev = None # clear for future iterations | |
714 | state[transition].append(ctx.node()) |
|
714 | state[transition].append(ctx.node()) | |
715 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
715 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
716 | check_state(state, interactive=False) |
|
716 | check_state(state, interactive=False) | |
717 | # bisect |
|
717 | # bisect | |
718 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) |
|
718 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) | |
719 | # update to next check |
|
719 | # update to next check | |
720 | node = nodes[0] |
|
720 | node = nodes[0] | |
721 | if not noupdate: |
|
721 | if not noupdate: | |
722 | cmdutil.bailifchanged(repo) |
|
722 | cmdutil.bailifchanged(repo) | |
723 | hg.clean(repo, node, show_stats=False) |
|
723 | hg.clean(repo, node, show_stats=False) | |
724 | finally: |
|
724 | finally: | |
725 | state['current'] = [node] |
|
725 | state['current'] = [node] | |
726 | hbisect.save_state(repo, state) |
|
726 | hbisect.save_state(repo, state) | |
727 | print_result(nodes, bgood) |
|
727 | print_result(nodes, bgood) | |
728 | return |
|
728 | return | |
729 |
|
729 | |||
730 | # update state |
|
730 | # update state | |
731 |
|
731 | |||
732 | if rev: |
|
732 | if rev: | |
733 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
733 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
734 | else: |
|
734 | else: | |
735 | nodes = [repo.lookup('.')] |
|
735 | nodes = [repo.lookup('.')] | |
736 |
|
736 | |||
737 | if good or bad or skip: |
|
737 | if good or bad or skip: | |
738 | if good: |
|
738 | if good: | |
739 | state['good'] += nodes |
|
739 | state['good'] += nodes | |
740 | elif bad: |
|
740 | elif bad: | |
741 | state['bad'] += nodes |
|
741 | state['bad'] += nodes | |
742 | elif skip: |
|
742 | elif skip: | |
743 | state['skip'] += nodes |
|
743 | state['skip'] += nodes | |
744 | hbisect.save_state(repo, state) |
|
744 | hbisect.save_state(repo, state) | |
745 |
|
745 | |||
746 | if not check_state(state): |
|
746 | if not check_state(state): | |
747 | return |
|
747 | return | |
748 |
|
748 | |||
749 | # actually bisect |
|
749 | # actually bisect | |
750 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
750 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) | |
751 | if extend: |
|
751 | if extend: | |
752 | if not changesets: |
|
752 | if not changesets: | |
753 | extendnode = extendbisectrange(nodes, good) |
|
753 | extendnode = extendbisectrange(nodes, good) | |
754 | if extendnode is not None: |
|
754 | if extendnode is not None: | |
755 | ui.write(_("Extending search to changeset %d:%s\n" |
|
755 | ui.write(_("Extending search to changeset %d:%s\n" | |
756 | % (extendnode.rev(), extendnode))) |
|
756 | % (extendnode.rev(), extendnode))) | |
757 | state['current'] = [extendnode.node()] |
|
757 | state['current'] = [extendnode.node()] | |
758 | hbisect.save_state(repo, state) |
|
758 | hbisect.save_state(repo, state) | |
759 | if noupdate: |
|
759 | if noupdate: | |
760 | return |
|
760 | return | |
761 | cmdutil.bailifchanged(repo) |
|
761 | cmdutil.bailifchanged(repo) | |
762 | return hg.clean(repo, extendnode.node()) |
|
762 | return hg.clean(repo, extendnode.node()) | |
763 | raise util.Abort(_("nothing to extend")) |
|
763 | raise util.Abort(_("nothing to extend")) | |
764 |
|
764 | |||
765 | if changesets == 0: |
|
765 | if changesets == 0: | |
766 | print_result(nodes, good) |
|
766 | print_result(nodes, good) | |
767 | else: |
|
767 | else: | |
768 | assert len(nodes) == 1 # only a single node can be tested next |
|
768 | assert len(nodes) == 1 # only a single node can be tested next | |
769 | node = nodes[0] |
|
769 | node = nodes[0] | |
770 | # compute the approximate number of remaining tests |
|
770 | # compute the approximate number of remaining tests | |
771 | tests, size = 0, 2 |
|
771 | tests, size = 0, 2 | |
772 | while size <= changesets: |
|
772 | while size <= changesets: | |
773 | tests, size = tests + 1, size * 2 |
|
773 | tests, size = tests + 1, size * 2 | |
774 | rev = repo.changelog.rev(node) |
|
774 | rev = repo.changelog.rev(node) | |
775 | ui.write(_("Testing changeset %d:%s " |
|
775 | ui.write(_("Testing changeset %d:%s " | |
776 | "(%d changesets remaining, ~%d tests)\n") |
|
776 | "(%d changesets remaining, ~%d tests)\n") | |
777 | % (rev, short(node), changesets, tests)) |
|
777 | % (rev, short(node), changesets, tests)) | |
778 | state['current'] = [node] |
|
778 | state['current'] = [node] | |
779 | hbisect.save_state(repo, state) |
|
779 | hbisect.save_state(repo, state) | |
780 | if not noupdate: |
|
780 | if not noupdate: | |
781 | cmdutil.bailifchanged(repo) |
|
781 | cmdutil.bailifchanged(repo) | |
782 | return hg.clean(repo, node) |
|
782 | return hg.clean(repo, node) | |
783 |
|
783 | |||
784 | @command('bookmarks|bookmark', |
|
784 | @command('bookmarks|bookmark', | |
785 | [('f', 'force', False, _('force')), |
|
785 | [('f', 'force', False, _('force')), | |
786 | ('r', 'rev', '', _('revision'), _('REV')), |
|
786 | ('r', 'rev', '', _('revision'), _('REV')), | |
787 | ('d', 'delete', False, _('delete a given bookmark')), |
|
787 | ('d', 'delete', False, _('delete a given bookmark')), | |
788 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), |
|
788 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), | |
789 | ('i', 'inactive', False, _('mark a bookmark inactive'))], |
|
789 | ('i', 'inactive', False, _('mark a bookmark inactive'))], | |
790 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
790 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
791 | def bookmark(ui, repo, *names, **opts): |
|
791 | def bookmark(ui, repo, *names, **opts): | |
792 | '''track a line of development with movable markers |
|
792 | '''track a line of development with movable markers | |
793 |
|
793 | |||
794 | Bookmarks are pointers to certain commits that move when committing. |
|
794 | Bookmarks are pointers to certain commits that move when committing. | |
795 | Bookmarks are local. They can be renamed, copied and deleted. It is |
|
795 | Bookmarks are local. They can be renamed, copied and deleted. It is | |
796 | possible to use :hg:`merge NAME` to merge from a given bookmark, and |
|
796 | possible to use :hg:`merge NAME` to merge from a given bookmark, and | |
797 | :hg:`update NAME` to update to a given bookmark. |
|
797 | :hg:`update NAME` to update to a given bookmark. | |
798 |
|
798 | |||
799 | You can use :hg:`bookmark NAME` to set a bookmark on the working |
|
799 | You can use :hg:`bookmark NAME` to set a bookmark on the working | |
800 | directory's parent revision with the given name. If you specify |
|
800 | directory's parent revision with the given name. If you specify | |
801 | a revision using -r REV (where REV may be an existing bookmark), |
|
801 | a revision using -r REV (where REV may be an existing bookmark), | |
802 | the bookmark is assigned to that revision. |
|
802 | the bookmark is assigned to that revision. | |
803 |
|
803 | |||
804 | Bookmarks can be pushed and pulled between repositories (see :hg:`help |
|
804 | Bookmarks can be pushed and pulled between repositories (see :hg:`help | |
805 | push` and :hg:`help pull`). This requires both the local and remote |
|
805 | push` and :hg:`help pull`). This requires both the local and remote | |
806 | repositories to support bookmarks. For versions prior to 1.8, this means |
|
806 | repositories to support bookmarks. For versions prior to 1.8, this means | |
807 | the bookmarks extension must be enabled. |
|
807 | the bookmarks extension must be enabled. | |
808 |
|
808 | |||
809 | If you set a bookmark called '@', new clones of the repository will |
|
809 | If you set a bookmark called '@', new clones of the repository will | |
810 | have that revision checked out (and the bookmark made active) by |
|
810 | have that revision checked out (and the bookmark made active) by | |
811 | default. |
|
811 | default. | |
812 |
|
812 | |||
813 | With -i/--inactive, the new bookmark will not be made the active |
|
813 | With -i/--inactive, the new bookmark will not be made the active | |
814 | bookmark. If -r/--rev is given, the new bookmark will not be made |
|
814 | bookmark. If -r/--rev is given, the new bookmark will not be made | |
815 | active even if -i/--inactive is not given. If no NAME is given, the |
|
815 | active even if -i/--inactive is not given. If no NAME is given, the | |
816 | current active bookmark will be marked inactive. |
|
816 | current active bookmark will be marked inactive. | |
817 | ''' |
|
817 | ''' | |
818 | force = opts.get('force') |
|
818 | force = opts.get('force') | |
819 | rev = opts.get('rev') |
|
819 | rev = opts.get('rev') | |
820 | delete = opts.get('delete') |
|
820 | delete = opts.get('delete') | |
821 | rename = opts.get('rename') |
|
821 | rename = opts.get('rename') | |
822 | inactive = opts.get('inactive') |
|
822 | inactive = opts.get('inactive') | |
823 |
|
823 | |||
824 | def checkformat(mark): |
|
824 | def checkformat(mark): | |
825 | mark = mark.strip() |
|
825 | mark = mark.strip() | |
826 | if not mark: |
|
826 | if not mark: | |
827 | raise util.Abort(_("bookmark names cannot consist entirely of " |
|
827 | raise util.Abort(_("bookmark names cannot consist entirely of " | |
828 | "whitespace")) |
|
828 | "whitespace")) | |
829 | scmutil.checknewlabel(repo, mark, 'bookmark') |
|
829 | scmutil.checknewlabel(repo, mark, 'bookmark') | |
830 | return mark |
|
830 | return mark | |
831 |
|
831 | |||
832 | def checkconflict(repo, mark, cur, force=False, target=None): |
|
832 | def checkconflict(repo, mark, cur, force=False, target=None): | |
833 | if mark in marks and not force: |
|
833 | if mark in marks and not force: | |
834 | if target: |
|
834 | if target: | |
835 | if marks[mark] == target and target == cur: |
|
835 | if marks[mark] == target and target == cur: | |
836 | # re-activating a bookmark |
|
836 | # re-activating a bookmark | |
837 | return |
|
837 | return | |
838 | anc = repo.changelog.ancestors([repo[target].rev()]) |
|
838 | anc = repo.changelog.ancestors([repo[target].rev()]) | |
839 | bmctx = repo[marks[mark]] |
|
839 | bmctx = repo[marks[mark]] | |
840 | divs = [repo[b].node() for b in marks |
|
840 | divs = [repo[b].node() for b in marks | |
841 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] |
|
841 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] | |
842 |
|
842 | |||
843 | # allow resolving a single divergent bookmark even if moving |
|
843 | # allow resolving a single divergent bookmark even if moving | |
844 | # the bookmark across branches when a revision is specified |
|
844 | # the bookmark across branches when a revision is specified | |
845 | # that contains a divergent bookmark |
|
845 | # that contains a divergent bookmark | |
846 | if bmctx.rev() not in anc and target in divs: |
|
846 | if bmctx.rev() not in anc and target in divs: | |
847 | bookmarks.deletedivergent(repo, [target], mark) |
|
847 | bookmarks.deletedivergent(repo, [target], mark) | |
848 | return |
|
848 | return | |
849 |
|
849 | |||
850 | deletefrom = [b for b in divs |
|
850 | deletefrom = [b for b in divs | |
851 | if repo[b].rev() in anc or b == target] |
|
851 | if repo[b].rev() in anc or b == target] | |
852 | bookmarks.deletedivergent(repo, deletefrom, mark) |
|
852 | bookmarks.deletedivergent(repo, deletefrom, mark) | |
853 | if bookmarks.validdest(repo, bmctx, repo[target]): |
|
853 | if bookmarks.validdest(repo, bmctx, repo[target]): | |
854 | ui.status(_("moving bookmark '%s' forward from %s\n") % |
|
854 | ui.status(_("moving bookmark '%s' forward from %s\n") % | |
855 | (mark, short(bmctx.node()))) |
|
855 | (mark, short(bmctx.node()))) | |
856 | return |
|
856 | return | |
857 | raise util.Abort(_("bookmark '%s' already exists " |
|
857 | raise util.Abort(_("bookmark '%s' already exists " | |
858 | "(use -f to force)") % mark) |
|
858 | "(use -f to force)") % mark) | |
859 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) |
|
859 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) | |
860 | and not force): |
|
860 | and not force): | |
861 | raise util.Abort( |
|
861 | raise util.Abort( | |
862 | _("a bookmark cannot have the name of an existing branch")) |
|
862 | _("a bookmark cannot have the name of an existing branch")) | |
863 |
|
863 | |||
864 | if delete and rename: |
|
864 | if delete and rename: | |
865 | raise util.Abort(_("--delete and --rename are incompatible")) |
|
865 | raise util.Abort(_("--delete and --rename are incompatible")) | |
866 | if delete and rev: |
|
866 | if delete and rev: | |
867 | raise util.Abort(_("--rev is incompatible with --delete")) |
|
867 | raise util.Abort(_("--rev is incompatible with --delete")) | |
868 | if rename and rev: |
|
868 | if rename and rev: | |
869 | raise util.Abort(_("--rev is incompatible with --rename")) |
|
869 | raise util.Abort(_("--rev is incompatible with --rename")) | |
870 | if not names and (delete or rev): |
|
870 | if not names and (delete or rev): | |
871 | raise util.Abort(_("bookmark name required")) |
|
871 | raise util.Abort(_("bookmark name required")) | |
872 |
|
872 | |||
873 | if delete or rename or names or inactive: |
|
873 | if delete or rename or names or inactive: | |
874 | wlock = repo.wlock() |
|
874 | wlock = repo.wlock() | |
875 | try: |
|
875 | try: | |
876 | cur = repo.changectx('.').node() |
|
876 | cur = repo.changectx('.').node() | |
877 | marks = repo._bookmarks |
|
877 | marks = repo._bookmarks | |
878 | if delete: |
|
878 | if delete: | |
879 | for mark in names: |
|
879 | for mark in names: | |
880 | if mark not in marks: |
|
880 | if mark not in marks: | |
881 | raise util.Abort(_("bookmark '%s' does not exist") % |
|
881 | raise util.Abort(_("bookmark '%s' does not exist") % | |
882 | mark) |
|
882 | mark) | |
883 | if mark == repo._bookmarkcurrent: |
|
883 | if mark == repo._bookmarkcurrent: | |
884 | bookmarks.unsetcurrent(repo) |
|
884 | bookmarks.unsetcurrent(repo) | |
885 | del marks[mark] |
|
885 | del marks[mark] | |
886 | marks.write() |
|
886 | marks.write() | |
887 |
|
887 | |||
888 | elif rename: |
|
888 | elif rename: | |
889 | if not names: |
|
889 | if not names: | |
890 | raise util.Abort(_("new bookmark name required")) |
|
890 | raise util.Abort(_("new bookmark name required")) | |
891 | elif len(names) > 1: |
|
891 | elif len(names) > 1: | |
892 | raise util.Abort(_("only one new bookmark name allowed")) |
|
892 | raise util.Abort(_("only one new bookmark name allowed")) | |
893 | mark = checkformat(names[0]) |
|
893 | mark = checkformat(names[0]) | |
894 | if rename not in marks: |
|
894 | if rename not in marks: | |
895 | raise util.Abort(_("bookmark '%s' does not exist") % rename) |
|
895 | raise util.Abort(_("bookmark '%s' does not exist") % rename) | |
896 | checkconflict(repo, mark, cur, force) |
|
896 | checkconflict(repo, mark, cur, force) | |
897 | marks[mark] = marks[rename] |
|
897 | marks[mark] = marks[rename] | |
898 | if repo._bookmarkcurrent == rename and not inactive: |
|
898 | if repo._bookmarkcurrent == rename and not inactive: | |
899 | bookmarks.setcurrent(repo, mark) |
|
899 | bookmarks.setcurrent(repo, mark) | |
900 | del marks[rename] |
|
900 | del marks[rename] | |
901 | marks.write() |
|
901 | marks.write() | |
902 |
|
902 | |||
903 | elif names: |
|
903 | elif names: | |
904 | newact = None |
|
904 | newact = None | |
905 | for mark in names: |
|
905 | for mark in names: | |
906 | mark = checkformat(mark) |
|
906 | mark = checkformat(mark) | |
907 | if newact is None: |
|
907 | if newact is None: | |
908 | newact = mark |
|
908 | newact = mark | |
909 | if inactive and mark == repo._bookmarkcurrent: |
|
909 | if inactive and mark == repo._bookmarkcurrent: | |
910 | bookmarks.unsetcurrent(repo) |
|
910 | bookmarks.unsetcurrent(repo) | |
911 | return |
|
911 | return | |
912 | tgt = cur |
|
912 | tgt = cur | |
913 | if rev: |
|
913 | if rev: | |
914 | tgt = scmutil.revsingle(repo, rev).node() |
|
914 | tgt = scmutil.revsingle(repo, rev).node() | |
915 | checkconflict(repo, mark, cur, force, tgt) |
|
915 | checkconflict(repo, mark, cur, force, tgt) | |
916 | marks[mark] = tgt |
|
916 | marks[mark] = tgt | |
917 | if not inactive and cur == marks[newact] and not rev: |
|
917 | if not inactive and cur == marks[newact] and not rev: | |
918 | bookmarks.setcurrent(repo, newact) |
|
918 | bookmarks.setcurrent(repo, newact) | |
919 | elif cur != tgt and newact == repo._bookmarkcurrent: |
|
919 | elif cur != tgt and newact == repo._bookmarkcurrent: | |
920 | bookmarks.unsetcurrent(repo) |
|
920 | bookmarks.unsetcurrent(repo) | |
921 | marks.write() |
|
921 | marks.write() | |
922 |
|
922 | |||
923 | elif inactive: |
|
923 | elif inactive: | |
924 | if len(marks) == 0: |
|
924 | if len(marks) == 0: | |
925 | ui.status(_("no bookmarks set\n")) |
|
925 | ui.status(_("no bookmarks set\n")) | |
926 | elif not repo._bookmarkcurrent: |
|
926 | elif not repo._bookmarkcurrent: | |
927 | ui.status(_("no active bookmark\n")) |
|
927 | ui.status(_("no active bookmark\n")) | |
928 | else: |
|
928 | else: | |
929 | bookmarks.unsetcurrent(repo) |
|
929 | bookmarks.unsetcurrent(repo) | |
930 | finally: |
|
930 | finally: | |
931 | wlock.release() |
|
931 | wlock.release() | |
932 | else: # show bookmarks |
|
932 | else: # show bookmarks | |
933 | hexfn = ui.debugflag and hex or short |
|
933 | hexfn = ui.debugflag and hex or short | |
934 | marks = repo._bookmarks |
|
934 | marks = repo._bookmarks | |
935 | if len(marks) == 0: |
|
935 | if len(marks) == 0: | |
936 | ui.status(_("no bookmarks set\n")) |
|
936 | ui.status(_("no bookmarks set\n")) | |
937 | else: |
|
937 | else: | |
938 | for bmark, n in sorted(marks.iteritems()): |
|
938 | for bmark, n in sorted(marks.iteritems()): | |
939 | current = repo._bookmarkcurrent |
|
939 | current = repo._bookmarkcurrent | |
940 | if bmark == current: |
|
940 | if bmark == current: | |
941 | prefix, label = '*', 'bookmarks.current' |
|
941 | prefix, label = '*', 'bookmarks.current' | |
942 | else: |
|
942 | else: | |
943 | prefix, label = ' ', '' |
|
943 | prefix, label = ' ', '' | |
944 |
|
944 | |||
945 | if ui.quiet: |
|
945 | if ui.quiet: | |
946 | ui.write("%s\n" % bmark, label=label) |
|
946 | ui.write("%s\n" % bmark, label=label) | |
947 | else: |
|
947 | else: | |
948 | ui.write(" %s %-25s %d:%s\n" % ( |
|
948 | ui.write(" %s %-25s %d:%s\n" % ( | |
949 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), |
|
949 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), | |
950 | label=label) |
|
950 | label=label) | |
951 |
|
951 | |||
952 | @command('branch', |
|
952 | @command('branch', | |
953 | [('f', 'force', None, |
|
953 | [('f', 'force', None, | |
954 | _('set branch name even if it shadows an existing branch')), |
|
954 | _('set branch name even if it shadows an existing branch')), | |
955 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
955 | ('C', 'clean', None, _('reset branch name to parent branch name'))], | |
956 | _('[-fC] [NAME]')) |
|
956 | _('[-fC] [NAME]')) | |
957 | def branch(ui, repo, label=None, **opts): |
|
957 | def branch(ui, repo, label=None, **opts): | |
958 | """set or show the current branch name |
|
958 | """set or show the current branch name | |
959 |
|
959 | |||
960 | .. note:: |
|
960 | .. note:: | |
961 |
|
961 | |||
962 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
962 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
963 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
963 | light-weight bookmark instead. See :hg:`help glossary` for more | |
964 | information about named branches and bookmarks. |
|
964 | information about named branches and bookmarks. | |
965 |
|
965 | |||
966 | With no argument, show the current branch name. With one argument, |
|
966 | With no argument, show the current branch name. With one argument, | |
967 | set the working directory branch name (the branch will not exist |
|
967 | set the working directory branch name (the branch will not exist | |
968 | in the repository until the next commit). Standard practice |
|
968 | in the repository until the next commit). Standard practice | |
969 | recommends that primary development take place on the 'default' |
|
969 | recommends that primary development take place on the 'default' | |
970 | branch. |
|
970 | branch. | |
971 |
|
971 | |||
972 | Unless -f/--force is specified, branch will not let you set a |
|
972 | Unless -f/--force is specified, branch will not let you set a | |
973 | branch name that already exists, even if it's inactive. |
|
973 | branch name that already exists, even if it's inactive. | |
974 |
|
974 | |||
975 | Use -C/--clean to reset the working directory branch to that of |
|
975 | Use -C/--clean to reset the working directory branch to that of | |
976 | the parent of the working directory, negating a previous branch |
|
976 | the parent of the working directory, negating a previous branch | |
977 | change. |
|
977 | change. | |
978 |
|
978 | |||
979 | Use the command :hg:`update` to switch to an existing branch. Use |
|
979 | Use the command :hg:`update` to switch to an existing branch. Use | |
980 | :hg:`commit --close-branch` to mark this branch as closed. |
|
980 | :hg:`commit --close-branch` to mark this branch as closed. | |
981 |
|
981 | |||
982 | Returns 0 on success. |
|
982 | Returns 0 on success. | |
983 | """ |
|
983 | """ | |
984 | if label: |
|
984 | if label: | |
985 | label = label.strip() |
|
985 | label = label.strip() | |
986 |
|
986 | |||
987 | if not opts.get('clean') and not label: |
|
987 | if not opts.get('clean') and not label: | |
988 | ui.write("%s\n" % repo.dirstate.branch()) |
|
988 | ui.write("%s\n" % repo.dirstate.branch()) | |
989 | return |
|
989 | return | |
990 |
|
990 | |||
991 | wlock = repo.wlock() |
|
991 | wlock = repo.wlock() | |
992 | try: |
|
992 | try: | |
993 | if opts.get('clean'): |
|
993 | if opts.get('clean'): | |
994 | label = repo[None].p1().branch() |
|
994 | label = repo[None].p1().branch() | |
995 | repo.dirstate.setbranch(label) |
|
995 | repo.dirstate.setbranch(label) | |
996 | ui.status(_('reset working directory to branch %s\n') % label) |
|
996 | ui.status(_('reset working directory to branch %s\n') % label) | |
997 | elif label: |
|
997 | elif label: | |
998 | if not opts.get('force') and label in repo.branchmap(): |
|
998 | if not opts.get('force') and label in repo.branchmap(): | |
999 | if label not in [p.branch() for p in repo.parents()]: |
|
999 | if label not in [p.branch() for p in repo.parents()]: | |
1000 | raise util.Abort(_('a branch of the same name already' |
|
1000 | raise util.Abort(_('a branch of the same name already' | |
1001 | ' exists'), |
|
1001 | ' exists'), | |
1002 | # i18n: "it" refers to an existing branch |
|
1002 | # i18n: "it" refers to an existing branch | |
1003 | hint=_("use 'hg update' to switch to it")) |
|
1003 | hint=_("use 'hg update' to switch to it")) | |
1004 | scmutil.checknewlabel(repo, label, 'branch') |
|
1004 | scmutil.checknewlabel(repo, label, 'branch') | |
1005 | repo.dirstate.setbranch(label) |
|
1005 | repo.dirstate.setbranch(label) | |
1006 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1006 | ui.status(_('marked working directory as branch %s\n') % label) | |
1007 | ui.status(_('(branches are permanent and global, ' |
|
1007 | ui.status(_('(branches are permanent and global, ' | |
1008 | 'did you want a bookmark?)\n')) |
|
1008 | 'did you want a bookmark?)\n')) | |
1009 | finally: |
|
1009 | finally: | |
1010 | wlock.release() |
|
1010 | wlock.release() | |
1011 |
|
1011 | |||
1012 | @command('branches', |
|
1012 | @command('branches', | |
1013 | [('a', 'active', False, _('show only branches that have unmerged heads')), |
|
1013 | [('a', 'active', False, _('show only branches that have unmerged heads')), | |
1014 | ('c', 'closed', False, _('show normal and closed branches'))], |
|
1014 | ('c', 'closed', False, _('show normal and closed branches'))], | |
1015 | _('[-ac]')) |
|
1015 | _('[-ac]')) | |
1016 | def branches(ui, repo, active=False, closed=False): |
|
1016 | def branches(ui, repo, active=False, closed=False): | |
1017 | """list repository named branches |
|
1017 | """list repository named branches | |
1018 |
|
1018 | |||
1019 | List the repository's named branches, indicating which ones are |
|
1019 | List the repository's named branches, indicating which ones are | |
1020 | inactive. If -c/--closed is specified, also list branches which have |
|
1020 | inactive. If -c/--closed is specified, also list branches which have | |
1021 | been marked closed (see :hg:`commit --close-branch`). |
|
1021 | been marked closed (see :hg:`commit --close-branch`). | |
1022 |
|
1022 | |||
1023 | If -a/--active is specified, only show active branches. A branch |
|
1023 | If -a/--active is specified, only show active branches. A branch | |
1024 | is considered active if it contains repository heads. |
|
1024 | is considered active if it contains repository heads. | |
1025 |
|
1025 | |||
1026 | Use the command :hg:`update` to switch to an existing branch. |
|
1026 | Use the command :hg:`update` to switch to an existing branch. | |
1027 |
|
1027 | |||
1028 | Returns 0. |
|
1028 | Returns 0. | |
1029 | """ |
|
1029 | """ | |
1030 |
|
1030 | |||
1031 | hexfunc = ui.debugflag and hex or short |
|
1031 | hexfunc = ui.debugflag and hex or short | |
1032 |
|
1032 | |||
1033 | allheads = set(repo.heads()) |
|
1033 | allheads = set(repo.heads()) | |
1034 | branches = [] |
|
1034 | branches = [] | |
1035 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1035 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1036 | isactive = not isclosed and bool(set(heads) & allheads) |
|
1036 | isactive = not isclosed and bool(set(heads) & allheads) | |
1037 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1037 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1038 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1038 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1039 | reverse=True) |
|
1039 | reverse=True) | |
1040 |
|
1040 | |||
1041 | for tag, ctx, isactive, isopen in branches: |
|
1041 | for tag, ctx, isactive, isopen in branches: | |
1042 | if (not active) or isactive: |
|
1042 | if (not active) or isactive: | |
1043 | if isactive: |
|
1043 | if isactive: | |
1044 | label = 'branches.active' |
|
1044 | label = 'branches.active' | |
1045 | notice = '' |
|
1045 | notice = '' | |
1046 | elif not isopen: |
|
1046 | elif not isopen: | |
1047 | if not closed: |
|
1047 | if not closed: | |
1048 | continue |
|
1048 | continue | |
1049 | label = 'branches.closed' |
|
1049 | label = 'branches.closed' | |
1050 | notice = _(' (closed)') |
|
1050 | notice = _(' (closed)') | |
1051 | else: |
|
1051 | else: | |
1052 | label = 'branches.inactive' |
|
1052 | label = 'branches.inactive' | |
1053 | notice = _(' (inactive)') |
|
1053 | notice = _(' (inactive)') | |
1054 | if tag == repo.dirstate.branch(): |
|
1054 | if tag == repo.dirstate.branch(): | |
1055 | label = 'branches.current' |
|
1055 | label = 'branches.current' | |
1056 | rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag)) |
|
1056 | rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag)) | |
1057 | rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())), |
|
1057 | rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())), | |
1058 | 'log.changeset changeset.%s' % ctx.phasestr()) |
|
1058 | 'log.changeset changeset.%s' % ctx.phasestr()) | |
1059 | labeledtag = ui.label(tag, label) |
|
1059 | labeledtag = ui.label(tag, label) | |
1060 | if ui.quiet: |
|
1060 | if ui.quiet: | |
1061 | ui.write("%s\n" % labeledtag) |
|
1061 | ui.write("%s\n" % labeledtag) | |
1062 | else: |
|
1062 | else: | |
1063 | ui.write("%s %s%s\n" % (labeledtag, rev, notice)) |
|
1063 | ui.write("%s %s%s\n" % (labeledtag, rev, notice)) | |
1064 |
|
1064 | |||
1065 | @command('bundle', |
|
1065 | @command('bundle', | |
1066 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1066 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1067 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1067 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1068 | _('REV')), |
|
1068 | _('REV')), | |
1069 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1069 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1070 | _('BRANCH')), |
|
1070 | _('BRANCH')), | |
1071 | ('', 'base', [], |
|
1071 | ('', 'base', [], | |
1072 | _('a base changeset assumed to be available at the destination'), |
|
1072 | _('a base changeset assumed to be available at the destination'), | |
1073 | _('REV')), |
|
1073 | _('REV')), | |
1074 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1074 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1075 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1075 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1076 | ] + remoteopts, |
|
1076 | ] + remoteopts, | |
1077 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1077 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1078 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1078 | def bundle(ui, repo, fname, dest=None, **opts): | |
1079 | """create a changegroup file |
|
1079 | """create a changegroup file | |
1080 |
|
1080 | |||
1081 | Generate a compressed changegroup file collecting changesets not |
|
1081 | Generate a compressed changegroup file collecting changesets not | |
1082 | known to be in another repository. |
|
1082 | known to be in another repository. | |
1083 |
|
1083 | |||
1084 | If you omit the destination repository, then hg assumes the |
|
1084 | If you omit the destination repository, then hg assumes the | |
1085 | destination will have all the nodes you specify with --base |
|
1085 | destination will have all the nodes you specify with --base | |
1086 | parameters. To create a bundle containing all changesets, use |
|
1086 | parameters. To create a bundle containing all changesets, use | |
1087 | -a/--all (or --base null). |
|
1087 | -a/--all (or --base null). | |
1088 |
|
1088 | |||
1089 | You can change compression method with the -t/--type option. |
|
1089 | You can change compression method with the -t/--type option. | |
1090 | The available compression methods are: none, bzip2, and |
|
1090 | The available compression methods are: none, bzip2, and | |
1091 | gzip (by default, bundles are compressed using bzip2). |
|
1091 | gzip (by default, bundles are compressed using bzip2). | |
1092 |
|
1092 | |||
1093 | The bundle file can then be transferred using conventional means |
|
1093 | The bundle file can then be transferred using conventional means | |
1094 | and applied to another repository with the unbundle or pull |
|
1094 | and applied to another repository with the unbundle or pull | |
1095 | command. This is useful when direct push and pull are not |
|
1095 | command. This is useful when direct push and pull are not | |
1096 | available or when exporting an entire repository is undesirable. |
|
1096 | available or when exporting an entire repository is undesirable. | |
1097 |
|
1097 | |||
1098 | Applying bundles preserves all changeset contents including |
|
1098 | Applying bundles preserves all changeset contents including | |
1099 | permissions, copy/rename information, and revision history. |
|
1099 | permissions, copy/rename information, and revision history. | |
1100 |
|
1100 | |||
1101 | Returns 0 on success, 1 if no changes found. |
|
1101 | Returns 0 on success, 1 if no changes found. | |
1102 | """ |
|
1102 | """ | |
1103 | revs = None |
|
1103 | revs = None | |
1104 | if 'rev' in opts: |
|
1104 | if 'rev' in opts: | |
1105 | revs = scmutil.revrange(repo, opts['rev']) |
|
1105 | revs = scmutil.revrange(repo, opts['rev']) | |
1106 |
|
1106 | |||
1107 | bundletype = opts.get('type', 'bzip2').lower() |
|
1107 | bundletype = opts.get('type', 'bzip2').lower() | |
1108 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1108 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} | |
1109 | bundletype = btypes.get(bundletype) |
|
1109 | bundletype = btypes.get(bundletype) | |
1110 | if bundletype not in changegroup.bundletypes: |
|
1110 | if bundletype not in changegroup.bundletypes: | |
1111 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1111 | raise util.Abort(_('unknown bundle type specified with --type')) | |
1112 |
|
1112 | |||
1113 | if opts.get('all'): |
|
1113 | if opts.get('all'): | |
1114 | base = ['null'] |
|
1114 | base = ['null'] | |
1115 | else: |
|
1115 | else: | |
1116 | base = scmutil.revrange(repo, opts.get('base')) |
|
1116 | base = scmutil.revrange(repo, opts.get('base')) | |
1117 | # TODO: get desired bundlecaps from command line. |
|
1117 | # TODO: get desired bundlecaps from command line. | |
1118 | bundlecaps = None |
|
1118 | bundlecaps = None | |
1119 | if base: |
|
1119 | if base: | |
1120 | if dest: |
|
1120 | if dest: | |
1121 | raise util.Abort(_("--base is incompatible with specifying " |
|
1121 | raise util.Abort(_("--base is incompatible with specifying " | |
1122 | "a destination")) |
|
1122 | "a destination")) | |
1123 | common = [repo.lookup(rev) for rev in base] |
|
1123 | common = [repo.lookup(rev) for rev in base] | |
1124 | heads = revs and map(repo.lookup, revs) or revs |
|
1124 | heads = revs and map(repo.lookup, revs) or revs | |
1125 | cg = repo.getbundle('bundle', heads=heads, common=common, |
|
1125 | cg = repo.getbundle('bundle', heads=heads, common=common, | |
1126 | bundlecaps=bundlecaps) |
|
1126 | bundlecaps=bundlecaps) | |
1127 | outgoing = None |
|
1127 | outgoing = None | |
1128 | else: |
|
1128 | else: | |
1129 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1129 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1130 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1130 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1131 | other = hg.peer(repo, opts, dest) |
|
1131 | other = hg.peer(repo, opts, dest) | |
1132 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1132 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1133 | heads = revs and map(repo.lookup, revs) or revs |
|
1133 | heads = revs and map(repo.lookup, revs) or revs | |
1134 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1134 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1135 | onlyheads=heads, |
|
1135 | onlyheads=heads, | |
1136 | force=opts.get('force'), |
|
1136 | force=opts.get('force'), | |
1137 | portable=True) |
|
1137 | portable=True) | |
1138 | cg = repo.getlocalbundle('bundle', outgoing, bundlecaps) |
|
1138 | cg = repo.getlocalbundle('bundle', outgoing, bundlecaps) | |
1139 | if not cg: |
|
1139 | if not cg: | |
1140 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) |
|
1140 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) | |
1141 | return 1 |
|
1141 | return 1 | |
1142 |
|
1142 | |||
1143 | changegroup.writebundle(cg, fname, bundletype) |
|
1143 | changegroup.writebundle(cg, fname, bundletype) | |
1144 |
|
1144 | |||
1145 | @command('cat', |
|
1145 | @command('cat', | |
1146 | [('o', 'output', '', |
|
1146 | [('o', 'output', '', | |
1147 | _('print output to file with formatted name'), _('FORMAT')), |
|
1147 | _('print output to file with formatted name'), _('FORMAT')), | |
1148 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1148 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1149 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1149 | ('', 'decode', None, _('apply any matching decode filter')), | |
1150 | ] + walkopts, |
|
1150 | ] + walkopts, | |
1151 | _('[OPTION]... FILE...')) |
|
1151 | _('[OPTION]... FILE...')) | |
1152 | def cat(ui, repo, file1, *pats, **opts): |
|
1152 | def cat(ui, repo, file1, *pats, **opts): | |
1153 | """output the current or given revision of files |
|
1153 | """output the current or given revision of files | |
1154 |
|
1154 | |||
1155 | Print the specified files as they were at the given revision. If |
|
1155 | Print the specified files as they were at the given revision. If | |
1156 | no revision is given, the parent of the working directory is used. |
|
1156 | no revision is given, the parent of the working directory is used. | |
1157 |
|
1157 | |||
1158 | Output may be to a file, in which case the name of the file is |
|
1158 | Output may be to a file, in which case the name of the file is | |
1159 | given using a format string. The formatting rules are the same as |
|
1159 | given using a format string. The formatting rules are the same as | |
1160 | for the export command, with the following additions: |
|
1160 | for the export command, with the following additions: | |
1161 |
|
1161 | |||
1162 | :``%s``: basename of file being printed |
|
1162 | :``%s``: basename of file being printed | |
1163 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1163 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1164 | :``%p``: root-relative path name of file being printed |
|
1164 | :``%p``: root-relative path name of file being printed | |
1165 |
|
1165 | |||
1166 | Returns 0 on success. |
|
1166 | Returns 0 on success. | |
1167 | """ |
|
1167 | """ | |
1168 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1168 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1169 | err = 1 |
|
1169 | err = 1 | |
1170 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1170 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1171 |
|
1171 | |||
1172 | def write(path): |
|
1172 | def write(path): | |
1173 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), |
|
1173 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), | |
1174 | pathname=path) |
|
1174 | pathname=path) | |
1175 | data = ctx[path].data() |
|
1175 | data = ctx[path].data() | |
1176 | if opts.get('decode'): |
|
1176 | if opts.get('decode'): | |
1177 | data = repo.wwritedata(path, data) |
|
1177 | data = repo.wwritedata(path, data) | |
1178 | fp.write(data) |
|
1178 | fp.write(data) | |
1179 | fp.close() |
|
1179 | fp.close() | |
1180 |
|
1180 | |||
1181 | # Automation often uses hg cat on single files, so special case it |
|
1181 | # Automation often uses hg cat on single files, so special case it | |
1182 | # for performance to avoid the cost of parsing the manifest. |
|
1182 | # for performance to avoid the cost of parsing the manifest. | |
1183 | if len(m.files()) == 1 and not m.anypats(): |
|
1183 | if len(m.files()) == 1 and not m.anypats(): | |
1184 | file = m.files()[0] |
|
1184 | file = m.files()[0] | |
1185 | mf = repo.manifest |
|
1185 | mf = repo.manifest | |
1186 | mfnode = ctx._changeset[0] |
|
1186 | mfnode = ctx._changeset[0] | |
1187 | if mf.find(mfnode, file)[0]: |
|
1187 | if mf.find(mfnode, file)[0]: | |
1188 | write(file) |
|
1188 | write(file) | |
1189 | return 0 |
|
1189 | return 0 | |
1190 |
|
1190 | |||
1191 | for abs in ctx.walk(m): |
|
1191 | for abs in ctx.walk(m): | |
1192 | write(abs) |
|
1192 | write(abs) | |
1193 | err = 0 |
|
1193 | err = 0 | |
1194 | return err |
|
1194 | return err | |
1195 |
|
1195 | |||
1196 | @command('^clone', |
|
1196 | @command('^clone', | |
1197 | [('U', 'noupdate', None, |
|
1197 | [('U', 'noupdate', None, | |
1198 | _('the clone will include an empty working copy (only a repository)')), |
|
1198 | _('the clone will include an empty working copy (only a repository)')), | |
1199 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), |
|
1199 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), | |
1200 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1200 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1201 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1201 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
1202 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1202 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1203 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), |
|
1203 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), | |
1204 | ] + remoteopts, |
|
1204 | ] + remoteopts, | |
1205 | _('[OPTION]... SOURCE [DEST]')) |
|
1205 | _('[OPTION]... SOURCE [DEST]')) | |
1206 | def clone(ui, source, dest=None, **opts): |
|
1206 | def clone(ui, source, dest=None, **opts): | |
1207 | """make a copy of an existing repository |
|
1207 | """make a copy of an existing repository | |
1208 |
|
1208 | |||
1209 | Create a copy of an existing repository in a new directory. |
|
1209 | Create a copy of an existing repository in a new directory. | |
1210 |
|
1210 | |||
1211 | If no destination directory name is specified, it defaults to the |
|
1211 | If no destination directory name is specified, it defaults to the | |
1212 | basename of the source. |
|
1212 | basename of the source. | |
1213 |
|
1213 | |||
1214 | The location of the source is added to the new repository's |
|
1214 | The location of the source is added to the new repository's | |
1215 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1215 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1216 |
|
1216 | |||
1217 | Only local paths and ``ssh://`` URLs are supported as |
|
1217 | Only local paths and ``ssh://`` URLs are supported as | |
1218 | destinations. For ``ssh://`` destinations, no working directory or |
|
1218 | destinations. For ``ssh://`` destinations, no working directory or | |
1219 | ``.hg/hgrc`` will be created on the remote side. |
|
1219 | ``.hg/hgrc`` will be created on the remote side. | |
1220 |
|
1220 | |||
1221 | To pull only a subset of changesets, specify one or more revisions |
|
1221 | To pull only a subset of changesets, specify one or more revisions | |
1222 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1222 | identifiers with -r/--rev or branches with -b/--branch. The | |
1223 | resulting clone will contain only the specified changesets and |
|
1223 | resulting clone will contain only the specified changesets and | |
1224 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1224 | their ancestors. These options (or 'clone src#rev dest') imply | |
1225 | --pull, even for local source repositories. Note that specifying a |
|
1225 | --pull, even for local source repositories. Note that specifying a | |
1226 | tag will include the tagged changeset but not the changeset |
|
1226 | tag will include the tagged changeset but not the changeset | |
1227 | containing the tag. |
|
1227 | containing the tag. | |
1228 |
|
1228 | |||
1229 | If the source repository has a bookmark called '@' set, that |
|
1229 | If the source repository has a bookmark called '@' set, that | |
1230 | revision will be checked out in the new repository by default. |
|
1230 | revision will be checked out in the new repository by default. | |
1231 |
|
1231 | |||
1232 | To check out a particular version, use -u/--update, or |
|
1232 | To check out a particular version, use -u/--update, or | |
1233 | -U/--noupdate to create a clone with no working directory. |
|
1233 | -U/--noupdate to create a clone with no working directory. | |
1234 |
|
1234 | |||
1235 | .. container:: verbose |
|
1235 | .. container:: verbose | |
1236 |
|
1236 | |||
1237 | For efficiency, hardlinks are used for cloning whenever the |
|
1237 | For efficiency, hardlinks are used for cloning whenever the | |
1238 | source and destination are on the same filesystem (note this |
|
1238 | source and destination are on the same filesystem (note this | |
1239 | applies only to the repository data, not to the working |
|
1239 | applies only to the repository data, not to the working | |
1240 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1240 | directory). Some filesystems, such as AFS, implement hardlinking | |
1241 | incorrectly, but do not report errors. In these cases, use the |
|
1241 | incorrectly, but do not report errors. In these cases, use the | |
1242 | --pull option to avoid hardlinking. |
|
1242 | --pull option to avoid hardlinking. | |
1243 |
|
1243 | |||
1244 | In some cases, you can clone repositories and the working |
|
1244 | In some cases, you can clone repositories and the working | |
1245 | directory using full hardlinks with :: |
|
1245 | directory using full hardlinks with :: | |
1246 |
|
1246 | |||
1247 | $ cp -al REPO REPOCLONE |
|
1247 | $ cp -al REPO REPOCLONE | |
1248 |
|
1248 | |||
1249 | This is the fastest way to clone, but it is not always safe. The |
|
1249 | This is the fastest way to clone, but it is not always safe. The | |
1250 | operation is not atomic (making sure REPO is not modified during |
|
1250 | operation is not atomic (making sure REPO is not modified during | |
1251 | the operation is up to you) and you have to make sure your |
|
1251 | the operation is up to you) and you have to make sure your | |
1252 | editor breaks hardlinks (Emacs and most Linux Kernel tools do |
|
1252 | editor breaks hardlinks (Emacs and most Linux Kernel tools do | |
1253 | so). Also, this is not compatible with certain extensions that |
|
1253 | so). Also, this is not compatible with certain extensions that | |
1254 | place their metadata under the .hg directory, such as mq. |
|
1254 | place their metadata under the .hg directory, such as mq. | |
1255 |
|
1255 | |||
1256 | Mercurial will update the working directory to the first applicable |
|
1256 | Mercurial will update the working directory to the first applicable | |
1257 | revision from this list: |
|
1257 | revision from this list: | |
1258 |
|
1258 | |||
1259 | a) null if -U or the source repository has no changesets |
|
1259 | a) null if -U or the source repository has no changesets | |
1260 | b) if -u . and the source repository is local, the first parent of |
|
1260 | b) if -u . and the source repository is local, the first parent of | |
1261 | the source repository's working directory |
|
1261 | the source repository's working directory | |
1262 | c) the changeset specified with -u (if a branch name, this means the |
|
1262 | c) the changeset specified with -u (if a branch name, this means the | |
1263 | latest head of that branch) |
|
1263 | latest head of that branch) | |
1264 | d) the changeset specified with -r |
|
1264 | d) the changeset specified with -r | |
1265 | e) the tipmost head specified with -b |
|
1265 | e) the tipmost head specified with -b | |
1266 | f) the tipmost head specified with the url#branch source syntax |
|
1266 | f) the tipmost head specified with the url#branch source syntax | |
1267 | g) the revision marked with the '@' bookmark, if present |
|
1267 | g) the revision marked with the '@' bookmark, if present | |
1268 | h) the tipmost head of the default branch |
|
1268 | h) the tipmost head of the default branch | |
1269 | i) tip |
|
1269 | i) tip | |
1270 |
|
1270 | |||
1271 | Examples: |
|
1271 | Examples: | |
1272 |
|
1272 | |||
1273 | - clone a remote repository to a new directory named hg/:: |
|
1273 | - clone a remote repository to a new directory named hg/:: | |
1274 |
|
1274 | |||
1275 | hg clone http://selenic.com/hg |
|
1275 | hg clone http://selenic.com/hg | |
1276 |
|
1276 | |||
1277 | - create a lightweight local clone:: |
|
1277 | - create a lightweight local clone:: | |
1278 |
|
1278 | |||
1279 | hg clone project/ project-feature/ |
|
1279 | hg clone project/ project-feature/ | |
1280 |
|
1280 | |||
1281 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1281 | - clone from an absolute path on an ssh server (note double-slash):: | |
1282 |
|
1282 | |||
1283 | hg clone ssh://user@server//home/projects/alpha/ |
|
1283 | hg clone ssh://user@server//home/projects/alpha/ | |
1284 |
|
1284 | |||
1285 | - do a high-speed clone over a LAN while checking out a |
|
1285 | - do a high-speed clone over a LAN while checking out a | |
1286 | specified version:: |
|
1286 | specified version:: | |
1287 |
|
1287 | |||
1288 | hg clone --uncompressed http://server/repo -u 1.5 |
|
1288 | hg clone --uncompressed http://server/repo -u 1.5 | |
1289 |
|
1289 | |||
1290 | - create a repository without changesets after a particular revision:: |
|
1290 | - create a repository without changesets after a particular revision:: | |
1291 |
|
1291 | |||
1292 | hg clone -r 04e544 experimental/ good/ |
|
1292 | hg clone -r 04e544 experimental/ good/ | |
1293 |
|
1293 | |||
1294 | - clone (and track) a particular named branch:: |
|
1294 | - clone (and track) a particular named branch:: | |
1295 |
|
1295 | |||
1296 | hg clone http://selenic.com/hg#stable |
|
1296 | hg clone http://selenic.com/hg#stable | |
1297 |
|
1297 | |||
1298 | See :hg:`help urls` for details on specifying URLs. |
|
1298 | See :hg:`help urls` for details on specifying URLs. | |
1299 |
|
1299 | |||
1300 | Returns 0 on success. |
|
1300 | Returns 0 on success. | |
1301 | """ |
|
1301 | """ | |
1302 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1302 | if opts.get('noupdate') and opts.get('updaterev'): | |
1303 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1303 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1304 |
|
1304 | |||
1305 | r = hg.clone(ui, opts, source, dest, |
|
1305 | r = hg.clone(ui, opts, source, dest, | |
1306 | pull=opts.get('pull'), |
|
1306 | pull=opts.get('pull'), | |
1307 | stream=opts.get('uncompressed'), |
|
1307 | stream=opts.get('uncompressed'), | |
1308 | rev=opts.get('rev'), |
|
1308 | rev=opts.get('rev'), | |
1309 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1309 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1310 | branch=opts.get('branch')) |
|
1310 | branch=opts.get('branch')) | |
1311 |
|
1311 | |||
1312 | return r is None |
|
1312 | return r is None | |
1313 |
|
1313 | |||
1314 | @command('^commit|ci', |
|
1314 | @command('^commit|ci', | |
1315 | [('A', 'addremove', None, |
|
1315 | [('A', 'addremove', None, | |
1316 | _('mark new/missing files as added/removed before committing')), |
|
1316 | _('mark new/missing files as added/removed before committing')), | |
1317 | ('', 'close-branch', None, |
|
1317 | ('', 'close-branch', None, | |
1318 | _('mark a branch as closed, hiding it from the branch list')), |
|
1318 | _('mark a branch as closed, hiding it from the branch list')), | |
1319 | ('', 'amend', None, _('amend the parent of the working dir')), |
|
1319 | ('', 'amend', None, _('amend the parent of the working dir')), | |
1320 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1320 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1321 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1321 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1322 | _('[OPTION]... [FILE]...')) |
|
1322 | _('[OPTION]... [FILE]...')) | |
1323 | def commit(ui, repo, *pats, **opts): |
|
1323 | def commit(ui, repo, *pats, **opts): | |
1324 | """commit the specified files or all outstanding changes |
|
1324 | """commit the specified files or all outstanding changes | |
1325 |
|
1325 | |||
1326 | Commit changes to the given files into the repository. Unlike a |
|
1326 | Commit changes to the given files into the repository. Unlike a | |
1327 | centralized SCM, this operation is a local operation. See |
|
1327 | centralized SCM, this operation is a local operation. See | |
1328 | :hg:`push` for a way to actively distribute your changes. |
|
1328 | :hg:`push` for a way to actively distribute your changes. | |
1329 |
|
1329 | |||
1330 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1330 | If a list of files is omitted, all changes reported by :hg:`status` | |
1331 | will be committed. |
|
1331 | will be committed. | |
1332 |
|
1332 | |||
1333 | If you are committing the result of a merge, do not provide any |
|
1333 | If you are committing the result of a merge, do not provide any | |
1334 | filenames or -I/-X filters. |
|
1334 | filenames or -I/-X filters. | |
1335 |
|
1335 | |||
1336 | If no commit message is specified, Mercurial starts your |
|
1336 | If no commit message is specified, Mercurial starts your | |
1337 | configured editor where you can enter a message. In case your |
|
1337 | configured editor where you can enter a message. In case your | |
1338 | commit fails, you will find a backup of your message in |
|
1338 | commit fails, you will find a backup of your message in | |
1339 | ``.hg/last-message.txt``. |
|
1339 | ``.hg/last-message.txt``. | |
1340 |
|
1340 | |||
1341 | The --amend flag can be used to amend the parent of the |
|
1341 | The --amend flag can be used to amend the parent of the | |
1342 | working directory with a new commit that contains the changes |
|
1342 | working directory with a new commit that contains the changes | |
1343 | in the parent in addition to those currently reported by :hg:`status`, |
|
1343 | in the parent in addition to those currently reported by :hg:`status`, | |
1344 | if there are any. The old commit is stored in a backup bundle in |
|
1344 | if there are any. The old commit is stored in a backup bundle in | |
1345 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1345 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1346 | on how to restore it). |
|
1346 | on how to restore it). | |
1347 |
|
1347 | |||
1348 | Message, user and date are taken from the amended commit unless |
|
1348 | Message, user and date are taken from the amended commit unless | |
1349 | specified. When a message isn't specified on the command line, |
|
1349 | specified. When a message isn't specified on the command line, | |
1350 | the editor will open with the message of the amended commit. |
|
1350 | the editor will open with the message of the amended commit. | |
1351 |
|
1351 | |||
1352 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1352 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1353 | or changesets that have children. |
|
1353 | or changesets that have children. | |
1354 |
|
1354 | |||
1355 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1355 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1356 |
|
1356 | |||
1357 | Returns 0 on success, 1 if nothing changed. |
|
1357 | Returns 0 on success, 1 if nothing changed. | |
1358 | """ |
|
1358 | """ | |
1359 | if opts.get('subrepos'): |
|
1359 | if opts.get('subrepos'): | |
1360 | if opts.get('amend'): |
|
1360 | if opts.get('amend'): | |
1361 | raise util.Abort(_('cannot amend with --subrepos')) |
|
1361 | raise util.Abort(_('cannot amend with --subrepos')) | |
1362 | # Let --subrepos on the command line override config setting. |
|
1362 | # Let --subrepos on the command line override config setting. | |
1363 | ui.setconfig('ui', 'commitsubrepos', True) |
|
1363 | ui.setconfig('ui', 'commitsubrepos', True) | |
1364 |
|
1364 | |||
1365 | # Save this for restoring it later |
|
1365 | # Save this for restoring it later | |
1366 | oldcommitphase = ui.config('phases', 'new-commit') |
|
1366 | oldcommitphase = ui.config('phases', 'new-commit') | |
1367 |
|
1367 | |||
1368 | cmdutil.checkunfinished(repo, commit=True) |
|
1368 | cmdutil.checkunfinished(repo, commit=True) | |
1369 |
|
1369 | |||
1370 | branch = repo[None].branch() |
|
1370 | branch = repo[None].branch() | |
1371 | bheads = repo.branchheads(branch) |
|
1371 | bheads = repo.branchheads(branch) | |
1372 |
|
1372 | |||
1373 | extra = {} |
|
1373 | extra = {} | |
1374 | if opts.get('close_branch'): |
|
1374 | if opts.get('close_branch'): | |
1375 | extra['close'] = 1 |
|
1375 | extra['close'] = 1 | |
1376 |
|
1376 | |||
1377 | if not bheads: |
|
1377 | if not bheads: | |
1378 | raise util.Abort(_('can only close branch heads')) |
|
1378 | raise util.Abort(_('can only close branch heads')) | |
1379 | elif opts.get('amend'): |
|
1379 | elif opts.get('amend'): | |
1380 | if repo.parents()[0].p1().branch() != branch and \ |
|
1380 | if repo.parents()[0].p1().branch() != branch and \ | |
1381 | repo.parents()[0].p2().branch() != branch: |
|
1381 | repo.parents()[0].p2().branch() != branch: | |
1382 | raise util.Abort(_('can only close branch heads')) |
|
1382 | raise util.Abort(_('can only close branch heads')) | |
1383 |
|
1383 | |||
1384 | if opts.get('amend'): |
|
1384 | if opts.get('amend'): | |
1385 | if ui.configbool('ui', 'commitsubrepos'): |
|
1385 | if ui.configbool('ui', 'commitsubrepos'): | |
1386 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1386 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1387 |
|
1387 | |||
1388 | old = repo['.'] |
|
1388 | old = repo['.'] | |
1389 | if old.phase() == phases.public: |
|
1389 | if old.phase() == phases.public: | |
1390 | raise util.Abort(_('cannot amend public changesets')) |
|
1390 | raise util.Abort(_('cannot amend public changesets')) | |
1391 | if len(repo[None].parents()) > 1: |
|
1391 | if len(repo[None].parents()) > 1: | |
1392 | raise util.Abort(_('cannot amend while merging')) |
|
1392 | raise util.Abort(_('cannot amend while merging')) | |
1393 | if (not obsolete._enabled) and old.children(): |
|
1393 | if (not obsolete._enabled) and old.children(): | |
1394 | raise util.Abort(_('cannot amend changeset with children')) |
|
1394 | raise util.Abort(_('cannot amend changeset with children')) | |
1395 |
|
1395 | |||
1396 | e = cmdutil.commiteditor |
|
1396 | e = cmdutil.commiteditor | |
1397 | if opts.get('force_editor'): |
|
1397 | if opts.get('force_editor'): | |
1398 | e = cmdutil.commitforceeditor |
|
1398 | e = cmdutil.commitforceeditor | |
1399 |
|
1399 | |||
1400 | def commitfunc(ui, repo, message, match, opts): |
|
1400 | def commitfunc(ui, repo, message, match, opts): | |
1401 | editor = e |
|
1401 | editor = e | |
1402 | # message contains text from -m or -l, if it's empty, |
|
1402 | # message contains text from -m or -l, if it's empty, | |
1403 | # open the editor with the old message |
|
1403 | # open the editor with the old message | |
1404 | if not message: |
|
1404 | if not message: | |
1405 | message = old.description() |
|
1405 | message = old.description() | |
1406 | editor = cmdutil.commitforceeditor |
|
1406 | editor = cmdutil.commitforceeditor | |
1407 | try: |
|
1407 | try: | |
1408 | if opts.get('secret'): |
|
1408 | if opts.get('secret'): | |
1409 | ui.setconfig('phases', 'new-commit', 'secret') |
|
1409 | ui.setconfig('phases', 'new-commit', 'secret') | |
1410 |
|
1410 | |||
1411 | return repo.commit(message, |
|
1411 | return repo.commit(message, | |
1412 | opts.get('user') or old.user(), |
|
1412 | opts.get('user') or old.user(), | |
1413 | opts.get('date') or old.date(), |
|
1413 | opts.get('date') or old.date(), | |
1414 | match, |
|
1414 | match, | |
1415 | editor=editor, |
|
1415 | editor=editor, | |
1416 | extra=extra) |
|
1416 | extra=extra) | |
1417 | finally: |
|
1417 | finally: | |
1418 | ui.setconfig('phases', 'new-commit', oldcommitphase) |
|
1418 | ui.setconfig('phases', 'new-commit', oldcommitphase) | |
1419 |
|
1419 | |||
1420 | current = repo._bookmarkcurrent |
|
1420 | current = repo._bookmarkcurrent | |
1421 | marks = old.bookmarks() |
|
1421 | marks = old.bookmarks() | |
1422 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) |
|
1422 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) | |
1423 | if node == old.node(): |
|
1423 | if node == old.node(): | |
1424 | ui.status(_("nothing changed\n")) |
|
1424 | ui.status(_("nothing changed\n")) | |
1425 | return 1 |
|
1425 | return 1 | |
1426 | elif marks: |
|
1426 | elif marks: | |
1427 | ui.debug('moving bookmarks %r from %s to %s\n' % |
|
1427 | ui.debug('moving bookmarks %r from %s to %s\n' % | |
1428 | (marks, old.hex(), hex(node))) |
|
1428 | (marks, old.hex(), hex(node))) | |
1429 | newmarks = repo._bookmarks |
|
1429 | newmarks = repo._bookmarks | |
1430 | for bm in marks: |
|
1430 | for bm in marks: | |
1431 | newmarks[bm] = node |
|
1431 | newmarks[bm] = node | |
1432 | if bm == current: |
|
1432 | if bm == current: | |
1433 | bookmarks.setcurrent(repo, bm) |
|
1433 | bookmarks.setcurrent(repo, bm) | |
1434 | newmarks.write() |
|
1434 | newmarks.write() | |
1435 | else: |
|
1435 | else: | |
1436 | e = cmdutil.commiteditor |
|
1436 | e = cmdutil.commiteditor | |
1437 | if opts.get('force_editor'): |
|
1437 | if opts.get('force_editor'): | |
1438 | e = cmdutil.commitforceeditor |
|
1438 | e = cmdutil.commitforceeditor | |
1439 |
|
1439 | |||
1440 | def commitfunc(ui, repo, message, match, opts): |
|
1440 | def commitfunc(ui, repo, message, match, opts): | |
1441 | try: |
|
1441 | try: | |
1442 | if opts.get('secret'): |
|
1442 | if opts.get('secret'): | |
1443 | ui.setconfig('phases', 'new-commit', 'secret') |
|
1443 | ui.setconfig('phases', 'new-commit', 'secret') | |
1444 |
|
1444 | |||
1445 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1445 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
1446 | match, editor=e, extra=extra) |
|
1446 | match, editor=e, extra=extra) | |
1447 | finally: |
|
1447 | finally: | |
1448 | ui.setconfig('phases', 'new-commit', oldcommitphase) |
|
1448 | ui.setconfig('phases', 'new-commit', oldcommitphase) | |
1449 |
|
1449 | |||
1450 |
|
1450 | |||
1451 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1451 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1452 |
|
1452 | |||
1453 | if not node: |
|
1453 | if not node: | |
1454 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
|
1454 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) | |
1455 | if stat[3]: |
|
1455 | if stat[3]: | |
1456 | ui.status(_("nothing changed (%d missing files, see " |
|
1456 | ui.status(_("nothing changed (%d missing files, see " | |
1457 | "'hg status')\n") % len(stat[3])) |
|
1457 | "'hg status')\n") % len(stat[3])) | |
1458 | else: |
|
1458 | else: | |
1459 | ui.status(_("nothing changed\n")) |
|
1459 | ui.status(_("nothing changed\n")) | |
1460 | return 1 |
|
1460 | return 1 | |
1461 |
|
1461 | |||
1462 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1462 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1463 |
|
1463 | |||
1464 | @command('copy|cp', |
|
1464 | @command('copy|cp', | |
1465 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1465 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1466 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1466 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1467 | ] + walkopts + dryrunopts, |
|
1467 | ] + walkopts + dryrunopts, | |
1468 | _('[OPTION]... [SOURCE]... DEST')) |
|
1468 | _('[OPTION]... [SOURCE]... DEST')) | |
1469 | def copy(ui, repo, *pats, **opts): |
|
1469 | def copy(ui, repo, *pats, **opts): | |
1470 | """mark files as copied for the next commit |
|
1470 | """mark files as copied for the next commit | |
1471 |
|
1471 | |||
1472 | Mark dest as having copies of source files. If dest is a |
|
1472 | Mark dest as having copies of source files. If dest is a | |
1473 | directory, copies are put in that directory. If dest is a file, |
|
1473 | directory, copies are put in that directory. If dest is a file, | |
1474 | the source must be a single file. |
|
1474 | the source must be a single file. | |
1475 |
|
1475 | |||
1476 | By default, this command copies the contents of files as they |
|
1476 | By default, this command copies the contents of files as they | |
1477 | exist in the working directory. If invoked with -A/--after, the |
|
1477 | exist in the working directory. If invoked with -A/--after, the | |
1478 | operation is recorded, but no copying is performed. |
|
1478 | operation is recorded, but no copying is performed. | |
1479 |
|
1479 | |||
1480 | This command takes effect with the next commit. To undo a copy |
|
1480 | This command takes effect with the next commit. To undo a copy | |
1481 | before that, see :hg:`revert`. |
|
1481 | before that, see :hg:`revert`. | |
1482 |
|
1482 | |||
1483 | Returns 0 on success, 1 if errors are encountered. |
|
1483 | Returns 0 on success, 1 if errors are encountered. | |
1484 | """ |
|
1484 | """ | |
1485 | wlock = repo.wlock(False) |
|
1485 | wlock = repo.wlock(False) | |
1486 | try: |
|
1486 | try: | |
1487 | return cmdutil.copy(ui, repo, pats, opts) |
|
1487 | return cmdutil.copy(ui, repo, pats, opts) | |
1488 | finally: |
|
1488 | finally: | |
1489 | wlock.release() |
|
1489 | wlock.release() | |
1490 |
|
1490 | |||
1491 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) |
|
1491 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) | |
1492 | def debugancestor(ui, repo, *args): |
|
1492 | def debugancestor(ui, repo, *args): | |
1493 | """find the ancestor revision of two revisions in a given index""" |
|
1493 | """find the ancestor revision of two revisions in a given index""" | |
1494 | if len(args) == 3: |
|
1494 | if len(args) == 3: | |
1495 | index, rev1, rev2 = args |
|
1495 | index, rev1, rev2 = args | |
1496 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) |
|
1496 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) | |
1497 | lookup = r.lookup |
|
1497 | lookup = r.lookup | |
1498 | elif len(args) == 2: |
|
1498 | elif len(args) == 2: | |
1499 | if not repo: |
|
1499 | if not repo: | |
1500 | raise util.Abort(_("there is no Mercurial repository here " |
|
1500 | raise util.Abort(_("there is no Mercurial repository here " | |
1501 | "(.hg not found)")) |
|
1501 | "(.hg not found)")) | |
1502 | rev1, rev2 = args |
|
1502 | rev1, rev2 = args | |
1503 | r = repo.changelog |
|
1503 | r = repo.changelog | |
1504 | lookup = repo.lookup |
|
1504 | lookup = repo.lookup | |
1505 | else: |
|
1505 | else: | |
1506 | raise util.Abort(_('either two or three arguments required')) |
|
1506 | raise util.Abort(_('either two or three arguments required')) | |
1507 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
1507 | a = r.ancestor(lookup(rev1), lookup(rev2)) | |
1508 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
1508 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
1509 |
|
1509 | |||
1510 | @command('debugbuilddag', |
|
1510 | @command('debugbuilddag', | |
1511 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
1511 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), | |
1512 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
1512 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), | |
1513 | ('n', 'new-file', None, _('add new file at each rev'))], |
|
1513 | ('n', 'new-file', None, _('add new file at each rev'))], | |
1514 | _('[OPTION]... [TEXT]')) |
|
1514 | _('[OPTION]... [TEXT]')) | |
1515 | def debugbuilddag(ui, repo, text=None, |
|
1515 | def debugbuilddag(ui, repo, text=None, | |
1516 | mergeable_file=False, |
|
1516 | mergeable_file=False, | |
1517 | overwritten_file=False, |
|
1517 | overwritten_file=False, | |
1518 | new_file=False): |
|
1518 | new_file=False): | |
1519 | """builds a repo with a given DAG from scratch in the current empty repo |
|
1519 | """builds a repo with a given DAG from scratch in the current empty repo | |
1520 |
|
1520 | |||
1521 | The description of the DAG is read from stdin if not given on the |
|
1521 | The description of the DAG is read from stdin if not given on the | |
1522 | command line. |
|
1522 | command line. | |
1523 |
|
1523 | |||
1524 | Elements: |
|
1524 | Elements: | |
1525 |
|
1525 | |||
1526 | - "+n" is a linear run of n nodes based on the current default parent |
|
1526 | - "+n" is a linear run of n nodes based on the current default parent | |
1527 | - "." is a single node based on the current default parent |
|
1527 | - "." is a single node based on the current default parent | |
1528 | - "$" resets the default parent to null (implied at the start); |
|
1528 | - "$" resets the default parent to null (implied at the start); | |
1529 | otherwise the default parent is always the last node created |
|
1529 | otherwise the default parent is always the last node created | |
1530 | - "<p" sets the default parent to the backref p |
|
1530 | - "<p" sets the default parent to the backref p | |
1531 | - "*p" is a fork at parent p, which is a backref |
|
1531 | - "*p" is a fork at parent p, which is a backref | |
1532 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs |
|
1532 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs | |
1533 | - "/p2" is a merge of the preceding node and p2 |
|
1533 | - "/p2" is a merge of the preceding node and p2 | |
1534 | - ":tag" defines a local tag for the preceding node |
|
1534 | - ":tag" defines a local tag for the preceding node | |
1535 | - "@branch" sets the named branch for subsequent nodes |
|
1535 | - "@branch" sets the named branch for subsequent nodes | |
1536 | - "#...\\n" is a comment up to the end of the line |
|
1536 | - "#...\\n" is a comment up to the end of the line | |
1537 |
|
1537 | |||
1538 | Whitespace between the above elements is ignored. |
|
1538 | Whitespace between the above elements is ignored. | |
1539 |
|
1539 | |||
1540 | A backref is either |
|
1540 | A backref is either | |
1541 |
|
1541 | |||
1542 | - a number n, which references the node curr-n, where curr is the current |
|
1542 | - a number n, which references the node curr-n, where curr is the current | |
1543 | node, or |
|
1543 | node, or | |
1544 | - the name of a local tag you placed earlier using ":tag", or |
|
1544 | - the name of a local tag you placed earlier using ":tag", or | |
1545 | - empty to denote the default parent. |
|
1545 | - empty to denote the default parent. | |
1546 |
|
1546 | |||
1547 | All string valued-elements are either strictly alphanumeric, or must |
|
1547 | All string valued-elements are either strictly alphanumeric, or must | |
1548 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
1548 | be enclosed in double quotes ("..."), with "\\" as escape character. | |
1549 | """ |
|
1549 | """ | |
1550 |
|
1550 | |||
1551 | if text is None: |
|
1551 | if text is None: | |
1552 | ui.status(_("reading DAG from stdin\n")) |
|
1552 | ui.status(_("reading DAG from stdin\n")) | |
1553 | text = ui.fin.read() |
|
1553 | text = ui.fin.read() | |
1554 |
|
1554 | |||
1555 | cl = repo.changelog |
|
1555 | cl = repo.changelog | |
1556 | if len(cl) > 0: |
|
1556 | if len(cl) > 0: | |
1557 | raise util.Abort(_('repository is not empty')) |
|
1557 | raise util.Abort(_('repository is not empty')) | |
1558 |
|
1558 | |||
1559 | # determine number of revs in DAG |
|
1559 | # determine number of revs in DAG | |
1560 | total = 0 |
|
1560 | total = 0 | |
1561 | for type, data in dagparser.parsedag(text): |
|
1561 | for type, data in dagparser.parsedag(text): | |
1562 | if type == 'n': |
|
1562 | if type == 'n': | |
1563 | total += 1 |
|
1563 | total += 1 | |
1564 |
|
1564 | |||
1565 | if mergeable_file: |
|
1565 | if mergeable_file: | |
1566 | linesperrev = 2 |
|
1566 | linesperrev = 2 | |
1567 | # make a file with k lines per rev |
|
1567 | # make a file with k lines per rev | |
1568 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] |
|
1568 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] | |
1569 | initialmergedlines.append("") |
|
1569 | initialmergedlines.append("") | |
1570 |
|
1570 | |||
1571 | tags = [] |
|
1571 | tags = [] | |
1572 |
|
1572 | |||
1573 | lock = tr = None |
|
1573 | lock = tr = None | |
1574 | try: |
|
1574 | try: | |
1575 | lock = repo.lock() |
|
1575 | lock = repo.lock() | |
1576 | tr = repo.transaction("builddag") |
|
1576 | tr = repo.transaction("builddag") | |
1577 |
|
1577 | |||
1578 | at = -1 |
|
1578 | at = -1 | |
1579 | atbranch = 'default' |
|
1579 | atbranch = 'default' | |
1580 | nodeids = [] |
|
1580 | nodeids = [] | |
1581 | id = 0 |
|
1581 | id = 0 | |
1582 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1582 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1583 | for type, data in dagparser.parsedag(text): |
|
1583 | for type, data in dagparser.parsedag(text): | |
1584 | if type == 'n': |
|
1584 | if type == 'n': | |
1585 | ui.note(('node %s\n' % str(data))) |
|
1585 | ui.note(('node %s\n' % str(data))) | |
1586 | id, ps = data |
|
1586 | id, ps = data | |
1587 |
|
1587 | |||
1588 | files = [] |
|
1588 | files = [] | |
1589 | fctxs = {} |
|
1589 | fctxs = {} | |
1590 |
|
1590 | |||
1591 | p2 = None |
|
1591 | p2 = None | |
1592 | if mergeable_file: |
|
1592 | if mergeable_file: | |
1593 | fn = "mf" |
|
1593 | fn = "mf" | |
1594 | p1 = repo[ps[0]] |
|
1594 | p1 = repo[ps[0]] | |
1595 | if len(ps) > 1: |
|
1595 | if len(ps) > 1: | |
1596 | p2 = repo[ps[1]] |
|
1596 | p2 = repo[ps[1]] | |
1597 | pa = p1.ancestor(p2) |
|
1597 | pa = p1.ancestor(p2) | |
1598 | base, local, other = [x[fn].data() for x in (pa, p1, |
|
1598 | base, local, other = [x[fn].data() for x in (pa, p1, | |
1599 | p2)] |
|
1599 | p2)] | |
1600 | m3 = simplemerge.Merge3Text(base, local, other) |
|
1600 | m3 = simplemerge.Merge3Text(base, local, other) | |
1601 | ml = [l.strip() for l in m3.merge_lines()] |
|
1601 | ml = [l.strip() for l in m3.merge_lines()] | |
1602 | ml.append("") |
|
1602 | ml.append("") | |
1603 | elif at > 0: |
|
1603 | elif at > 0: | |
1604 | ml = p1[fn].data().split("\n") |
|
1604 | ml = p1[fn].data().split("\n") | |
1605 | else: |
|
1605 | else: | |
1606 | ml = initialmergedlines |
|
1606 | ml = initialmergedlines | |
1607 | ml[id * linesperrev] += " r%i" % id |
|
1607 | ml[id * linesperrev] += " r%i" % id | |
1608 | mergedtext = "\n".join(ml) |
|
1608 | mergedtext = "\n".join(ml) | |
1609 | files.append(fn) |
|
1609 | files.append(fn) | |
1610 | fctxs[fn] = context.memfilectx(fn, mergedtext) |
|
1610 | fctxs[fn] = context.memfilectx(fn, mergedtext) | |
1611 |
|
1611 | |||
1612 | if overwritten_file: |
|
1612 | if overwritten_file: | |
1613 | fn = "of" |
|
1613 | fn = "of" | |
1614 | files.append(fn) |
|
1614 | files.append(fn) | |
1615 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1615 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1616 |
|
1616 | |||
1617 | if new_file: |
|
1617 | if new_file: | |
1618 | fn = "nf%i" % id |
|
1618 | fn = "nf%i" % id | |
1619 | files.append(fn) |
|
1619 | files.append(fn) | |
1620 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1620 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1621 | if len(ps) > 1: |
|
1621 | if len(ps) > 1: | |
1622 | if not p2: |
|
1622 | if not p2: | |
1623 | p2 = repo[ps[1]] |
|
1623 | p2 = repo[ps[1]] | |
1624 | for fn in p2: |
|
1624 | for fn in p2: | |
1625 | if fn.startswith("nf"): |
|
1625 | if fn.startswith("nf"): | |
1626 | files.append(fn) |
|
1626 | files.append(fn) | |
1627 | fctxs[fn] = p2[fn] |
|
1627 | fctxs[fn] = p2[fn] | |
1628 |
|
1628 | |||
1629 | def fctxfn(repo, cx, path): |
|
1629 | def fctxfn(repo, cx, path): | |
1630 | return fctxs.get(path) |
|
1630 | return fctxs.get(path) | |
1631 |
|
1631 | |||
1632 | if len(ps) == 0 or ps[0] < 0: |
|
1632 | if len(ps) == 0 or ps[0] < 0: | |
1633 | pars = [None, None] |
|
1633 | pars = [None, None] | |
1634 | elif len(ps) == 1: |
|
1634 | elif len(ps) == 1: | |
1635 | pars = [nodeids[ps[0]], None] |
|
1635 | pars = [nodeids[ps[0]], None] | |
1636 | else: |
|
1636 | else: | |
1637 | pars = [nodeids[p] for p in ps] |
|
1637 | pars = [nodeids[p] for p in ps] | |
1638 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, |
|
1638 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, | |
1639 | date=(id, 0), |
|
1639 | date=(id, 0), | |
1640 | user="debugbuilddag", |
|
1640 | user="debugbuilddag", | |
1641 | extra={'branch': atbranch}) |
|
1641 | extra={'branch': atbranch}) | |
1642 | nodeid = repo.commitctx(cx) |
|
1642 | nodeid = repo.commitctx(cx) | |
1643 | nodeids.append(nodeid) |
|
1643 | nodeids.append(nodeid) | |
1644 | at = id |
|
1644 | at = id | |
1645 | elif type == 'l': |
|
1645 | elif type == 'l': | |
1646 | id, name = data |
|
1646 | id, name = data | |
1647 | ui.note(('tag %s\n' % name)) |
|
1647 | ui.note(('tag %s\n' % name)) | |
1648 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) |
|
1648 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) | |
1649 | elif type == 'a': |
|
1649 | elif type == 'a': | |
1650 | ui.note(('branch %s\n' % data)) |
|
1650 | ui.note(('branch %s\n' % data)) | |
1651 | atbranch = data |
|
1651 | atbranch = data | |
1652 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1652 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1653 | tr.close() |
|
1653 | tr.close() | |
1654 |
|
1654 | |||
1655 | if tags: |
|
1655 | if tags: | |
1656 | repo.opener.write("localtags", "".join(tags)) |
|
1656 | repo.opener.write("localtags", "".join(tags)) | |
1657 | finally: |
|
1657 | finally: | |
1658 | ui.progress(_('building'), None) |
|
1658 | ui.progress(_('building'), None) | |
1659 | release(tr, lock) |
|
1659 | release(tr, lock) | |
1660 |
|
1660 | |||
1661 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) |
|
1661 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) | |
1662 | def debugbundle(ui, bundlepath, all=None, **opts): |
|
1662 | def debugbundle(ui, bundlepath, all=None, **opts): | |
1663 | """lists the contents of a bundle""" |
|
1663 | """lists the contents of a bundle""" | |
1664 | f = hg.openpath(ui, bundlepath) |
|
1664 | f = hg.openpath(ui, bundlepath) | |
1665 | try: |
|
1665 | try: | |
1666 | gen = changegroup.readbundle(f, bundlepath) |
|
1666 | gen = changegroup.readbundle(f, bundlepath) | |
1667 | if all: |
|
1667 | if all: | |
1668 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) |
|
1668 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) | |
1669 |
|
1669 | |||
1670 | def showchunks(named): |
|
1670 | def showchunks(named): | |
1671 | ui.write("\n%s\n" % named) |
|
1671 | ui.write("\n%s\n" % named) | |
1672 | chain = None |
|
1672 | chain = None | |
1673 | while True: |
|
1673 | while True: | |
1674 | chunkdata = gen.deltachunk(chain) |
|
1674 | chunkdata = gen.deltachunk(chain) | |
1675 | if not chunkdata: |
|
1675 | if not chunkdata: | |
1676 | break |
|
1676 | break | |
1677 | node = chunkdata['node'] |
|
1677 | node = chunkdata['node'] | |
1678 | p1 = chunkdata['p1'] |
|
1678 | p1 = chunkdata['p1'] | |
1679 | p2 = chunkdata['p2'] |
|
1679 | p2 = chunkdata['p2'] | |
1680 | cs = chunkdata['cs'] |
|
1680 | cs = chunkdata['cs'] | |
1681 | deltabase = chunkdata['deltabase'] |
|
1681 | deltabase = chunkdata['deltabase'] | |
1682 | delta = chunkdata['delta'] |
|
1682 | delta = chunkdata['delta'] | |
1683 | ui.write("%s %s %s %s %s %s\n" % |
|
1683 | ui.write("%s %s %s %s %s %s\n" % | |
1684 | (hex(node), hex(p1), hex(p2), |
|
1684 | (hex(node), hex(p1), hex(p2), | |
1685 | hex(cs), hex(deltabase), len(delta))) |
|
1685 | hex(cs), hex(deltabase), len(delta))) | |
1686 | chain = node |
|
1686 | chain = node | |
1687 |
|
1687 | |||
1688 | chunkdata = gen.changelogheader() |
|
1688 | chunkdata = gen.changelogheader() | |
1689 | showchunks("changelog") |
|
1689 | showchunks("changelog") | |
1690 | chunkdata = gen.manifestheader() |
|
1690 | chunkdata = gen.manifestheader() | |
1691 | showchunks("manifest") |
|
1691 | showchunks("manifest") | |
1692 | while True: |
|
1692 | while True: | |
1693 | chunkdata = gen.filelogheader() |
|
1693 | chunkdata = gen.filelogheader() | |
1694 | if not chunkdata: |
|
1694 | if not chunkdata: | |
1695 | break |
|
1695 | break | |
1696 | fname = chunkdata['filename'] |
|
1696 | fname = chunkdata['filename'] | |
1697 | showchunks(fname) |
|
1697 | showchunks(fname) | |
1698 | else: |
|
1698 | else: | |
1699 | chunkdata = gen.changelogheader() |
|
1699 | chunkdata = gen.changelogheader() | |
1700 | chain = None |
|
1700 | chain = None | |
1701 | while True: |
|
1701 | while True: | |
1702 | chunkdata = gen.deltachunk(chain) |
|
1702 | chunkdata = gen.deltachunk(chain) | |
1703 | if not chunkdata: |
|
1703 | if not chunkdata: | |
1704 | break |
|
1704 | break | |
1705 | node = chunkdata['node'] |
|
1705 | node = chunkdata['node'] | |
1706 | ui.write("%s\n" % hex(node)) |
|
1706 | ui.write("%s\n" % hex(node)) | |
1707 | chain = node |
|
1707 | chain = node | |
1708 | finally: |
|
1708 | finally: | |
1709 | f.close() |
|
1709 | f.close() | |
1710 |
|
1710 | |||
1711 | @command('debugcheckstate', [], '') |
|
1711 | @command('debugcheckstate', [], '') | |
1712 | def debugcheckstate(ui, repo): |
|
1712 | def debugcheckstate(ui, repo): | |
1713 | """validate the correctness of the current dirstate""" |
|
1713 | """validate the correctness of the current dirstate""" | |
1714 | parent1, parent2 = repo.dirstate.parents() |
|
1714 | parent1, parent2 = repo.dirstate.parents() | |
1715 | m1 = repo[parent1].manifest() |
|
1715 | m1 = repo[parent1].manifest() | |
1716 | m2 = repo[parent2].manifest() |
|
1716 | m2 = repo[parent2].manifest() | |
1717 | errors = 0 |
|
1717 | errors = 0 | |
1718 | for f in repo.dirstate: |
|
1718 | for f in repo.dirstate: | |
1719 | state = repo.dirstate[f] |
|
1719 | state = repo.dirstate[f] | |
1720 | if state in "nr" and f not in m1: |
|
1720 | if state in "nr" and f not in m1: | |
1721 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
1721 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | |
1722 | errors += 1 |
|
1722 | errors += 1 | |
1723 | if state in "a" and f in m1: |
|
1723 | if state in "a" and f in m1: | |
1724 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
1724 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | |
1725 | errors += 1 |
|
1725 | errors += 1 | |
1726 | if state in "m" and f not in m1 and f not in m2: |
|
1726 | if state in "m" and f not in m1 and f not in m2: | |
1727 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
1727 | ui.warn(_("%s in state %s, but not in either manifest\n") % | |
1728 | (f, state)) |
|
1728 | (f, state)) | |
1729 | errors += 1 |
|
1729 | errors += 1 | |
1730 | for f in m1: |
|
1730 | for f in m1: | |
1731 | state = repo.dirstate[f] |
|
1731 | state = repo.dirstate[f] | |
1732 | if state not in "nrm": |
|
1732 | if state not in "nrm": | |
1733 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
1733 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | |
1734 | errors += 1 |
|
1734 | errors += 1 | |
1735 | if errors: |
|
1735 | if errors: | |
1736 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
1736 | error = _(".hg/dirstate inconsistent with current parent's manifest") | |
1737 | raise util.Abort(error) |
|
1737 | raise util.Abort(error) | |
1738 |
|
1738 | |||
1739 | @command('debugcommands', [], _('[COMMAND]')) |
|
1739 | @command('debugcommands', [], _('[COMMAND]')) | |
1740 | def debugcommands(ui, cmd='', *args): |
|
1740 | def debugcommands(ui, cmd='', *args): | |
1741 | """list all available commands and options""" |
|
1741 | """list all available commands and options""" | |
1742 | for cmd, vals in sorted(table.iteritems()): |
|
1742 | for cmd, vals in sorted(table.iteritems()): | |
1743 | cmd = cmd.split('|')[0].strip('^') |
|
1743 | cmd = cmd.split('|')[0].strip('^') | |
1744 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1744 | opts = ', '.join([i[1] for i in vals[1]]) | |
1745 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1745 | ui.write('%s: %s\n' % (cmd, opts)) | |
1746 |
|
1746 | |||
1747 | @command('debugcomplete', |
|
1747 | @command('debugcomplete', | |
1748 | [('o', 'options', None, _('show the command options'))], |
|
1748 | [('o', 'options', None, _('show the command options'))], | |
1749 | _('[-o] CMD')) |
|
1749 | _('[-o] CMD')) | |
1750 | def debugcomplete(ui, cmd='', **opts): |
|
1750 | def debugcomplete(ui, cmd='', **opts): | |
1751 | """returns the completion list associated with the given command""" |
|
1751 | """returns the completion list associated with the given command""" | |
1752 |
|
1752 | |||
1753 | if opts.get('options'): |
|
1753 | if opts.get('options'): | |
1754 | options = [] |
|
1754 | options = [] | |
1755 | otables = [globalopts] |
|
1755 | otables = [globalopts] | |
1756 | if cmd: |
|
1756 | if cmd: | |
1757 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1757 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
1758 | otables.append(entry[1]) |
|
1758 | otables.append(entry[1]) | |
1759 | for t in otables: |
|
1759 | for t in otables: | |
1760 | for o in t: |
|
1760 | for o in t: | |
1761 | if "(DEPRECATED)" in o[3]: |
|
1761 | if "(DEPRECATED)" in o[3]: | |
1762 | continue |
|
1762 | continue | |
1763 | if o[0]: |
|
1763 | if o[0]: | |
1764 | options.append('-%s' % o[0]) |
|
1764 | options.append('-%s' % o[0]) | |
1765 | options.append('--%s' % o[1]) |
|
1765 | options.append('--%s' % o[1]) | |
1766 | ui.write("%s\n" % "\n".join(options)) |
|
1766 | ui.write("%s\n" % "\n".join(options)) | |
1767 | return |
|
1767 | return | |
1768 |
|
1768 | |||
1769 | cmdlist = cmdutil.findpossible(cmd, table) |
|
1769 | cmdlist = cmdutil.findpossible(cmd, table) | |
1770 | if ui.verbose: |
|
1770 | if ui.verbose: | |
1771 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1771 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
1772 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1772 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
1773 |
|
1773 | |||
1774 | @command('debugdag', |
|
1774 | @command('debugdag', | |
1775 | [('t', 'tags', None, _('use tags as labels')), |
|
1775 | [('t', 'tags', None, _('use tags as labels')), | |
1776 | ('b', 'branches', None, _('annotate with branch names')), |
|
1776 | ('b', 'branches', None, _('annotate with branch names')), | |
1777 | ('', 'dots', None, _('use dots for runs')), |
|
1777 | ('', 'dots', None, _('use dots for runs')), | |
1778 | ('s', 'spaces', None, _('separate elements by spaces'))], |
|
1778 | ('s', 'spaces', None, _('separate elements by spaces'))], | |
1779 | _('[OPTION]... [FILE [REV]...]')) |
|
1779 | _('[OPTION]... [FILE [REV]...]')) | |
1780 | def debugdag(ui, repo, file_=None, *revs, **opts): |
|
1780 | def debugdag(ui, repo, file_=None, *revs, **opts): | |
1781 | """format the changelog or an index DAG as a concise textual description |
|
1781 | """format the changelog or an index DAG as a concise textual description | |
1782 |
|
1782 | |||
1783 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1783 | If you pass a revlog index, the revlog's DAG is emitted. If you list | |
1784 | revision numbers, they get labeled in the output as rN. |
|
1784 | revision numbers, they get labeled in the output as rN. | |
1785 |
|
1785 | |||
1786 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1786 | Otherwise, the changelog DAG of the current repo is emitted. | |
1787 | """ |
|
1787 | """ | |
1788 | spaces = opts.get('spaces') |
|
1788 | spaces = opts.get('spaces') | |
1789 | dots = opts.get('dots') |
|
1789 | dots = opts.get('dots') | |
1790 | if file_: |
|
1790 | if file_: | |
1791 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1791 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
1792 | revs = set((int(r) for r in revs)) |
|
1792 | revs = set((int(r) for r in revs)) | |
1793 | def events(): |
|
1793 | def events(): | |
1794 | for r in rlog: |
|
1794 | for r in rlog: | |
1795 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) |
|
1795 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) | |
1796 | if p != -1))) |
|
1796 | if p != -1))) | |
1797 | if r in revs: |
|
1797 | if r in revs: | |
1798 | yield 'l', (r, "r%i" % r) |
|
1798 | yield 'l', (r, "r%i" % r) | |
1799 | elif repo: |
|
1799 | elif repo: | |
1800 | cl = repo.changelog |
|
1800 | cl = repo.changelog | |
1801 | tags = opts.get('tags') |
|
1801 | tags = opts.get('tags') | |
1802 | branches = opts.get('branches') |
|
1802 | branches = opts.get('branches') | |
1803 | if tags: |
|
1803 | if tags: | |
1804 | labels = {} |
|
1804 | labels = {} | |
1805 | for l, n in repo.tags().items(): |
|
1805 | for l, n in repo.tags().items(): | |
1806 | labels.setdefault(cl.rev(n), []).append(l) |
|
1806 | labels.setdefault(cl.rev(n), []).append(l) | |
1807 | def events(): |
|
1807 | def events(): | |
1808 | b = "default" |
|
1808 | b = "default" | |
1809 | for r in cl: |
|
1809 | for r in cl: | |
1810 | if branches: |
|
1810 | if branches: | |
1811 | newb = cl.read(cl.node(r))[5]['branch'] |
|
1811 | newb = cl.read(cl.node(r))[5]['branch'] | |
1812 | if newb != b: |
|
1812 | if newb != b: | |
1813 | yield 'a', newb |
|
1813 | yield 'a', newb | |
1814 | b = newb |
|
1814 | b = newb | |
1815 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) |
|
1815 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) | |
1816 | if p != -1))) |
|
1816 | if p != -1))) | |
1817 | if tags: |
|
1817 | if tags: | |
1818 | ls = labels.get(r) |
|
1818 | ls = labels.get(r) | |
1819 | if ls: |
|
1819 | if ls: | |
1820 | for l in ls: |
|
1820 | for l in ls: | |
1821 | yield 'l', (r, l) |
|
1821 | yield 'l', (r, l) | |
1822 | else: |
|
1822 | else: | |
1823 | raise util.Abort(_('need repo for changelog dag')) |
|
1823 | raise util.Abort(_('need repo for changelog dag')) | |
1824 |
|
1824 | |||
1825 | for line in dagparser.dagtextlines(events(), |
|
1825 | for line in dagparser.dagtextlines(events(), | |
1826 | addspaces=spaces, |
|
1826 | addspaces=spaces, | |
1827 | wraplabels=True, |
|
1827 | wraplabels=True, | |
1828 | wrapannotations=True, |
|
1828 | wrapannotations=True, | |
1829 | wrapnonlinear=dots, |
|
1829 | wrapnonlinear=dots, | |
1830 | usedots=dots, |
|
1830 | usedots=dots, | |
1831 | maxlinewidth=70): |
|
1831 | maxlinewidth=70): | |
1832 | ui.write(line) |
|
1832 | ui.write(line) | |
1833 | ui.write("\n") |
|
1833 | ui.write("\n") | |
1834 |
|
1834 | |||
1835 | @command('debugdata', |
|
1835 | @command('debugdata', | |
1836 | [('c', 'changelog', False, _('open changelog')), |
|
1836 | [('c', 'changelog', False, _('open changelog')), | |
1837 | ('m', 'manifest', False, _('open manifest'))], |
|
1837 | ('m', 'manifest', False, _('open manifest'))], | |
1838 | _('-c|-m|FILE REV')) |
|
1838 | _('-c|-m|FILE REV')) | |
1839 | def debugdata(ui, repo, file_, rev=None, **opts): |
|
1839 | def debugdata(ui, repo, file_, rev=None, **opts): | |
1840 | """dump the contents of a data file revision""" |
|
1840 | """dump the contents of a data file revision""" | |
1841 | if opts.get('changelog') or opts.get('manifest'): |
|
1841 | if opts.get('changelog') or opts.get('manifest'): | |
1842 | file_, rev = None, file_ |
|
1842 | file_, rev = None, file_ | |
1843 | elif rev is None: |
|
1843 | elif rev is None: | |
1844 | raise error.CommandError('debugdata', _('invalid arguments')) |
|
1844 | raise error.CommandError('debugdata', _('invalid arguments')) | |
1845 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) |
|
1845 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) | |
1846 | try: |
|
1846 | try: | |
1847 | ui.write(r.revision(r.lookup(rev))) |
|
1847 | ui.write(r.revision(r.lookup(rev))) | |
1848 | except KeyError: |
|
1848 | except KeyError: | |
1849 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
1849 | raise util.Abort(_('invalid revision identifier %s') % rev) | |
1850 |
|
1850 | |||
1851 | @command('debugdate', |
|
1851 | @command('debugdate', | |
1852 | [('e', 'extended', None, _('try extended date formats'))], |
|
1852 | [('e', 'extended', None, _('try extended date formats'))], | |
1853 | _('[-e] DATE [RANGE]')) |
|
1853 | _('[-e] DATE [RANGE]')) | |
1854 | def debugdate(ui, date, range=None, **opts): |
|
1854 | def debugdate(ui, date, range=None, **opts): | |
1855 | """parse and display a date""" |
|
1855 | """parse and display a date""" | |
1856 | if opts["extended"]: |
|
1856 | if opts["extended"]: | |
1857 | d = util.parsedate(date, util.extendeddateformats) |
|
1857 | d = util.parsedate(date, util.extendeddateformats) | |
1858 | else: |
|
1858 | else: | |
1859 | d = util.parsedate(date) |
|
1859 | d = util.parsedate(date) | |
1860 | ui.write(("internal: %s %s\n") % d) |
|
1860 | ui.write(("internal: %s %s\n") % d) | |
1861 | ui.write(("standard: %s\n") % util.datestr(d)) |
|
1861 | ui.write(("standard: %s\n") % util.datestr(d)) | |
1862 | if range: |
|
1862 | if range: | |
1863 | m = util.matchdate(range) |
|
1863 | m = util.matchdate(range) | |
1864 | ui.write(("match: %s\n") % m(d[0])) |
|
1864 | ui.write(("match: %s\n") % m(d[0])) | |
1865 |
|
1865 | |||
1866 | @command('debugdiscovery', |
|
1866 | @command('debugdiscovery', | |
1867 | [('', 'old', None, _('use old-style discovery')), |
|
1867 | [('', 'old', None, _('use old-style discovery')), | |
1868 | ('', 'nonheads', None, |
|
1868 | ('', 'nonheads', None, | |
1869 | _('use old-style discovery with non-heads included')), |
|
1869 | _('use old-style discovery with non-heads included')), | |
1870 | ] + remoteopts, |
|
1870 | ] + remoteopts, | |
1871 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) |
|
1871 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) | |
1872 | def debugdiscovery(ui, repo, remoteurl="default", **opts): |
|
1872 | def debugdiscovery(ui, repo, remoteurl="default", **opts): | |
1873 | """runs the changeset discovery protocol in isolation""" |
|
1873 | """runs the changeset discovery protocol in isolation""" | |
1874 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), |
|
1874 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), | |
1875 | opts.get('branch')) |
|
1875 | opts.get('branch')) | |
1876 | remote = hg.peer(repo, opts, remoteurl) |
|
1876 | remote = hg.peer(repo, opts, remoteurl) | |
1877 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) |
|
1877 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) | |
1878 |
|
1878 | |||
1879 | # make sure tests are repeatable |
|
1879 | # make sure tests are repeatable | |
1880 | random.seed(12323) |
|
1880 | random.seed(12323) | |
1881 |
|
1881 | |||
1882 | def doit(localheads, remoteheads, remote=remote): |
|
1882 | def doit(localheads, remoteheads, remote=remote): | |
1883 | if opts.get('old'): |
|
1883 | if opts.get('old'): | |
1884 | if localheads: |
|
1884 | if localheads: | |
1885 | raise util.Abort('cannot use localheads with old style ' |
|
1885 | raise util.Abort('cannot use localheads with old style ' | |
1886 | 'discovery') |
|
1886 | 'discovery') | |
1887 | if not util.safehasattr(remote, 'branches'): |
|
1887 | if not util.safehasattr(remote, 'branches'): | |
1888 | # enable in-client legacy support |
|
1888 | # enable in-client legacy support | |
1889 | remote = localrepo.locallegacypeer(remote.local()) |
|
1889 | remote = localrepo.locallegacypeer(remote.local()) | |
1890 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, |
|
1890 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, | |
1891 | force=True) |
|
1891 | force=True) | |
1892 | common = set(common) |
|
1892 | common = set(common) | |
1893 | if not opts.get('nonheads'): |
|
1893 | if not opts.get('nonheads'): | |
1894 | ui.write(("unpruned common: %s\n") % |
|
1894 | ui.write(("unpruned common: %s\n") % | |
1895 | " ".join(sorted(short(n) for n in common))) |
|
1895 | " ".join(sorted(short(n) for n in common))) | |
1896 | dag = dagutil.revlogdag(repo.changelog) |
|
1896 | dag = dagutil.revlogdag(repo.changelog) | |
1897 | all = dag.ancestorset(dag.internalizeall(common)) |
|
1897 | all = dag.ancestorset(dag.internalizeall(common)) | |
1898 | common = dag.externalizeall(dag.headsetofconnecteds(all)) |
|
1898 | common = dag.externalizeall(dag.headsetofconnecteds(all)) | |
1899 | else: |
|
1899 | else: | |
1900 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) |
|
1900 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) | |
1901 | common = set(common) |
|
1901 | common = set(common) | |
1902 | rheads = set(hds) |
|
1902 | rheads = set(hds) | |
1903 | lheads = set(repo.heads()) |
|
1903 | lheads = set(repo.heads()) | |
1904 | ui.write(("common heads: %s\n") % |
|
1904 | ui.write(("common heads: %s\n") % | |
1905 | " ".join(sorted(short(n) for n in common))) |
|
1905 | " ".join(sorted(short(n) for n in common))) | |
1906 | if lheads <= common: |
|
1906 | if lheads <= common: | |
1907 | ui.write(("local is subset\n")) |
|
1907 | ui.write(("local is subset\n")) | |
1908 | elif rheads <= common: |
|
1908 | elif rheads <= common: | |
1909 | ui.write(("remote is subset\n")) |
|
1909 | ui.write(("remote is subset\n")) | |
1910 |
|
1910 | |||
1911 | serverlogs = opts.get('serverlog') |
|
1911 | serverlogs = opts.get('serverlog') | |
1912 | if serverlogs: |
|
1912 | if serverlogs: | |
1913 | for filename in serverlogs: |
|
1913 | for filename in serverlogs: | |
1914 | logfile = open(filename, 'r') |
|
1914 | logfile = open(filename, 'r') | |
1915 | try: |
|
1915 | try: | |
1916 | line = logfile.readline() |
|
1916 | line = logfile.readline() | |
1917 | while line: |
|
1917 | while line: | |
1918 | parts = line.strip().split(';') |
|
1918 | parts = line.strip().split(';') | |
1919 | op = parts[1] |
|
1919 | op = parts[1] | |
1920 | if op == 'cg': |
|
1920 | if op == 'cg': | |
1921 | pass |
|
1921 | pass | |
1922 | elif op == 'cgss': |
|
1922 | elif op == 'cgss': | |
1923 | doit(parts[2].split(' '), parts[3].split(' ')) |
|
1923 | doit(parts[2].split(' '), parts[3].split(' ')) | |
1924 | elif op == 'unb': |
|
1924 | elif op == 'unb': | |
1925 | doit(parts[3].split(' '), parts[2].split(' ')) |
|
1925 | doit(parts[3].split(' '), parts[2].split(' ')) | |
1926 | line = logfile.readline() |
|
1926 | line = logfile.readline() | |
1927 | finally: |
|
1927 | finally: | |
1928 | logfile.close() |
|
1928 | logfile.close() | |
1929 |
|
1929 | |||
1930 | else: |
|
1930 | else: | |
1931 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, |
|
1931 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, | |
1932 | opts.get('remote_head')) |
|
1932 | opts.get('remote_head')) | |
1933 | localrevs = opts.get('local_head') |
|
1933 | localrevs = opts.get('local_head') | |
1934 | doit(localrevs, remoterevs) |
|
1934 | doit(localrevs, remoterevs) | |
1935 |
|
1935 | |||
1936 | @command('debugfileset', |
|
1936 | @command('debugfileset', | |
1937 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], |
|
1937 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], | |
1938 | _('[-r REV] FILESPEC')) |
|
1938 | _('[-r REV] FILESPEC')) | |
1939 | def debugfileset(ui, repo, expr, **opts): |
|
1939 | def debugfileset(ui, repo, expr, **opts): | |
1940 | '''parse and apply a fileset specification''' |
|
1940 | '''parse and apply a fileset specification''' | |
1941 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
1941 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
1942 | if ui.verbose: |
|
1942 | if ui.verbose: | |
1943 | tree = fileset.parse(expr)[0] |
|
1943 | tree = fileset.parse(expr)[0] | |
1944 | ui.note(tree, "\n") |
|
1944 | ui.note(tree, "\n") | |
1945 |
|
1945 | |||
1946 | for f in fileset.getfileset(ctx, expr): |
|
1946 | for f in fileset.getfileset(ctx, expr): | |
1947 | ui.write("%s\n" % f) |
|
1947 | ui.write("%s\n" % f) | |
1948 |
|
1948 | |||
1949 | @command('debugfsinfo', [], _('[PATH]')) |
|
1949 | @command('debugfsinfo', [], _('[PATH]')) | |
1950 | def debugfsinfo(ui, path="."): |
|
1950 | def debugfsinfo(ui, path="."): | |
1951 | """show information detected about current filesystem""" |
|
1951 | """show information detected about current filesystem""" | |
1952 | util.writefile('.debugfsinfo', '') |
|
1952 | util.writefile('.debugfsinfo', '') | |
1953 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) |
|
1953 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) | |
1954 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) |
|
1954 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) | |
1955 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) |
|
1955 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) | |
1956 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') |
|
1956 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') | |
1957 | and 'yes' or 'no')) |
|
1957 | and 'yes' or 'no')) | |
1958 | os.unlink('.debugfsinfo') |
|
1958 | os.unlink('.debugfsinfo') | |
1959 |
|
1959 | |||
1960 | @command('debuggetbundle', |
|
1960 | @command('debuggetbundle', | |
1961 | [('H', 'head', [], _('id of head node'), _('ID')), |
|
1961 | [('H', 'head', [], _('id of head node'), _('ID')), | |
1962 | ('C', 'common', [], _('id of common node'), _('ID')), |
|
1962 | ('C', 'common', [], _('id of common node'), _('ID')), | |
1963 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], |
|
1963 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], | |
1964 | _('REPO FILE [-H|-C ID]...')) |
|
1964 | _('REPO FILE [-H|-C ID]...')) | |
1965 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): |
|
1965 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): | |
1966 | """retrieves a bundle from a repo |
|
1966 | """retrieves a bundle from a repo | |
1967 |
|
1967 | |||
1968 | Every ID must be a full-length hex node id string. Saves the bundle to the |
|
1968 | Every ID must be a full-length hex node id string. Saves the bundle to the | |
1969 | given file. |
|
1969 | given file. | |
1970 | """ |
|
1970 | """ | |
1971 | repo = hg.peer(ui, opts, repopath) |
|
1971 | repo = hg.peer(ui, opts, repopath) | |
1972 | if not repo.capable('getbundle'): |
|
1972 | if not repo.capable('getbundle'): | |
1973 | raise util.Abort("getbundle() not supported by target repository") |
|
1973 | raise util.Abort("getbundle() not supported by target repository") | |
1974 | args = {} |
|
1974 | args = {} | |
1975 | if common: |
|
1975 | if common: | |
1976 | args['common'] = [bin(s) for s in common] |
|
1976 | args['common'] = [bin(s) for s in common] | |
1977 | if head: |
|
1977 | if head: | |
1978 | args['heads'] = [bin(s) for s in head] |
|
1978 | args['heads'] = [bin(s) for s in head] | |
1979 | # TODO: get desired bundlecaps from command line. |
|
1979 | # TODO: get desired bundlecaps from command line. | |
1980 | args['bundlecaps'] = None |
|
1980 | args['bundlecaps'] = None | |
1981 | bundle = repo.getbundle('debug', **args) |
|
1981 | bundle = repo.getbundle('debug', **args) | |
1982 |
|
1982 | |||
1983 | bundletype = opts.get('type', 'bzip2').lower() |
|
1983 | bundletype = opts.get('type', 'bzip2').lower() | |
1984 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1984 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} | |
1985 | bundletype = btypes.get(bundletype) |
|
1985 | bundletype = btypes.get(bundletype) | |
1986 | if bundletype not in changegroup.bundletypes: |
|
1986 | if bundletype not in changegroup.bundletypes: | |
1987 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1987 | raise util.Abort(_('unknown bundle type specified with --type')) | |
1988 | changegroup.writebundle(bundle, bundlepath, bundletype) |
|
1988 | changegroup.writebundle(bundle, bundlepath, bundletype) | |
1989 |
|
1989 | |||
1990 | @command('debugignore', [], '') |
|
1990 | @command('debugignore', [], '') | |
1991 | def debugignore(ui, repo, *values, **opts): |
|
1991 | def debugignore(ui, repo, *values, **opts): | |
1992 | """display the combined ignore pattern""" |
|
1992 | """display the combined ignore pattern""" | |
1993 | ignore = repo.dirstate._ignore |
|
1993 | ignore = repo.dirstate._ignore | |
1994 | includepat = getattr(ignore, 'includepat', None) |
|
1994 | includepat = getattr(ignore, 'includepat', None) | |
1995 | if includepat is not None: |
|
1995 | if includepat is not None: | |
1996 | ui.write("%s\n" % includepat) |
|
1996 | ui.write("%s\n" % includepat) | |
1997 | else: |
|
1997 | else: | |
1998 | raise util.Abort(_("no ignore patterns found")) |
|
1998 | raise util.Abort(_("no ignore patterns found")) | |
1999 |
|
1999 | |||
2000 | @command('debugindex', |
|
2000 | @command('debugindex', | |
2001 | [('c', 'changelog', False, _('open changelog')), |
|
2001 | [('c', 'changelog', False, _('open changelog')), | |
2002 | ('m', 'manifest', False, _('open manifest')), |
|
2002 | ('m', 'manifest', False, _('open manifest')), | |
2003 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], |
|
2003 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], | |
2004 | _('[-f FORMAT] -c|-m|FILE')) |
|
2004 | _('[-f FORMAT] -c|-m|FILE')) | |
2005 | def debugindex(ui, repo, file_=None, **opts): |
|
2005 | def debugindex(ui, repo, file_=None, **opts): | |
2006 | """dump the contents of an index file""" |
|
2006 | """dump the contents of an index file""" | |
2007 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) |
|
2007 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) | |
2008 | format = opts.get('format', 0) |
|
2008 | format = opts.get('format', 0) | |
2009 | if format not in (0, 1): |
|
2009 | if format not in (0, 1): | |
2010 | raise util.Abort(_("unknown format %d") % format) |
|
2010 | raise util.Abort(_("unknown format %d") % format) | |
2011 |
|
2011 | |||
2012 | generaldelta = r.version & revlog.REVLOGGENERALDELTA |
|
2012 | generaldelta = r.version & revlog.REVLOGGENERALDELTA | |
2013 | if generaldelta: |
|
2013 | if generaldelta: | |
2014 | basehdr = ' delta' |
|
2014 | basehdr = ' delta' | |
2015 | else: |
|
2015 | else: | |
2016 | basehdr = ' base' |
|
2016 | basehdr = ' base' | |
2017 |
|
2017 | |||
2018 | if format == 0: |
|
2018 | if format == 0: | |
2019 | ui.write(" rev offset length " + basehdr + " linkrev" |
|
2019 | ui.write(" rev offset length " + basehdr + " linkrev" | |
2020 | " nodeid p1 p2\n") |
|
2020 | " nodeid p1 p2\n") | |
2021 | elif format == 1: |
|
2021 | elif format == 1: | |
2022 | ui.write(" rev flag offset length" |
|
2022 | ui.write(" rev flag offset length" | |
2023 | " size " + basehdr + " link p1 p2" |
|
2023 | " size " + basehdr + " link p1 p2" | |
2024 | " nodeid\n") |
|
2024 | " nodeid\n") | |
2025 |
|
2025 | |||
2026 | for i in r: |
|
2026 | for i in r: | |
2027 | node = r.node(i) |
|
2027 | node = r.node(i) | |
2028 | if generaldelta: |
|
2028 | if generaldelta: | |
2029 | base = r.deltaparent(i) |
|
2029 | base = r.deltaparent(i) | |
2030 | else: |
|
2030 | else: | |
2031 | base = r.chainbase(i) |
|
2031 | base = r.chainbase(i) | |
2032 | if format == 0: |
|
2032 | if format == 0: | |
2033 | try: |
|
2033 | try: | |
2034 | pp = r.parents(node) |
|
2034 | pp = r.parents(node) | |
2035 | except Exception: |
|
2035 | except Exception: | |
2036 | pp = [nullid, nullid] |
|
2036 | pp = [nullid, nullid] | |
2037 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
2037 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | |
2038 | i, r.start(i), r.length(i), base, r.linkrev(i), |
|
2038 | i, r.start(i), r.length(i), base, r.linkrev(i), | |
2039 | short(node), short(pp[0]), short(pp[1]))) |
|
2039 | short(node), short(pp[0]), short(pp[1]))) | |
2040 | elif format == 1: |
|
2040 | elif format == 1: | |
2041 | pr = r.parentrevs(i) |
|
2041 | pr = r.parentrevs(i) | |
2042 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( |
|
2042 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( | |
2043 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), |
|
2043 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), | |
2044 | base, r.linkrev(i), pr[0], pr[1], short(node))) |
|
2044 | base, r.linkrev(i), pr[0], pr[1], short(node))) | |
2045 |
|
2045 | |||
2046 | @command('debugindexdot', [], _('FILE')) |
|
2046 | @command('debugindexdot', [], _('FILE')) | |
2047 | def debugindexdot(ui, repo, file_): |
|
2047 | def debugindexdot(ui, repo, file_): | |
2048 | """dump an index DAG as a graphviz dot file""" |
|
2048 | """dump an index DAG as a graphviz dot file""" | |
2049 | r = None |
|
2049 | r = None | |
2050 | if repo: |
|
2050 | if repo: | |
2051 | filelog = repo.file(file_) |
|
2051 | filelog = repo.file(file_) | |
2052 | if len(filelog): |
|
2052 | if len(filelog): | |
2053 | r = filelog |
|
2053 | r = filelog | |
2054 | if not r: |
|
2054 | if not r: | |
2055 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
2055 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
2056 | ui.write(("digraph G {\n")) |
|
2056 | ui.write(("digraph G {\n")) | |
2057 | for i in r: |
|
2057 | for i in r: | |
2058 | node = r.node(i) |
|
2058 | node = r.node(i) | |
2059 | pp = r.parents(node) |
|
2059 | pp = r.parents(node) | |
2060 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
2060 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | |
2061 | if pp[1] != nullid: |
|
2061 | if pp[1] != nullid: | |
2062 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
2062 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | |
2063 | ui.write("}\n") |
|
2063 | ui.write("}\n") | |
2064 |
|
2064 | |||
2065 | @command('debuginstall', [], '') |
|
2065 | @command('debuginstall', [], '') | |
2066 | def debuginstall(ui): |
|
2066 | def debuginstall(ui): | |
2067 | '''test Mercurial installation |
|
2067 | '''test Mercurial installation | |
2068 |
|
2068 | |||
2069 | Returns 0 on success. |
|
2069 | Returns 0 on success. | |
2070 | ''' |
|
2070 | ''' | |
2071 |
|
2071 | |||
2072 | def writetemp(contents): |
|
2072 | def writetemp(contents): | |
2073 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
2073 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") | |
2074 | f = os.fdopen(fd, "wb") |
|
2074 | f = os.fdopen(fd, "wb") | |
2075 | f.write(contents) |
|
2075 | f.write(contents) | |
2076 | f.close() |
|
2076 | f.close() | |
2077 | return name |
|
2077 | return name | |
2078 |
|
2078 | |||
2079 | problems = 0 |
|
2079 | problems = 0 | |
2080 |
|
2080 | |||
2081 | # encoding |
|
2081 | # encoding | |
2082 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) |
|
2082 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) | |
2083 | try: |
|
2083 | try: | |
2084 | encoding.fromlocal("test") |
|
2084 | encoding.fromlocal("test") | |
2085 | except util.Abort, inst: |
|
2085 | except util.Abort, inst: | |
2086 | ui.write(" %s\n" % inst) |
|
2086 | ui.write(" %s\n" % inst) | |
2087 | ui.write(_(" (check that your locale is properly set)\n")) |
|
2087 | ui.write(_(" (check that your locale is properly set)\n")) | |
2088 | problems += 1 |
|
2088 | problems += 1 | |
2089 |
|
2089 | |||
2090 | # Python lib |
|
2090 | # Python lib | |
2091 | ui.status(_("checking Python lib (%s)...\n") |
|
2091 | ui.status(_("checking Python lib (%s)...\n") | |
2092 | % os.path.dirname(os.__file__)) |
|
2092 | % os.path.dirname(os.__file__)) | |
2093 |
|
2093 | |||
2094 | # compiled modules |
|
2094 | # compiled modules | |
2095 | ui.status(_("checking installed modules (%s)...\n") |
|
2095 | ui.status(_("checking installed modules (%s)...\n") | |
2096 | % os.path.dirname(__file__)) |
|
2096 | % os.path.dirname(__file__)) | |
2097 | try: |
|
2097 | try: | |
2098 | import bdiff, mpatch, base85, osutil |
|
2098 | import bdiff, mpatch, base85, osutil | |
2099 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
2099 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes | |
2100 | except Exception, inst: |
|
2100 | except Exception, inst: | |
2101 | ui.write(" %s\n" % inst) |
|
2101 | ui.write(" %s\n" % inst) | |
2102 | ui.write(_(" One or more extensions could not be found")) |
|
2102 | ui.write(_(" One or more extensions could not be found")) | |
2103 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
2103 | ui.write(_(" (check that you compiled the extensions)\n")) | |
2104 | problems += 1 |
|
2104 | problems += 1 | |
2105 |
|
2105 | |||
2106 | # templates |
|
2106 | # templates | |
2107 | import templater |
|
2107 | import templater | |
2108 | p = templater.templatepath() |
|
2108 | p = templater.templatepath() | |
2109 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) |
|
2109 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) | |
2110 | try: |
|
2110 | try: | |
2111 | templater.templater(templater.templatepath("map-cmdline.default")) |
|
2111 | templater.templater(templater.templatepath("map-cmdline.default")) | |
2112 | except Exception, inst: |
|
2112 | except Exception, inst: | |
2113 | ui.write(" %s\n" % inst) |
|
2113 | ui.write(" %s\n" % inst) | |
2114 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
2114 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) | |
2115 | problems += 1 |
|
2115 | problems += 1 | |
2116 |
|
2116 | |||
2117 | # editor |
|
2117 | # editor | |
2118 | ui.status(_("checking commit editor...\n")) |
|
2118 | ui.status(_("checking commit editor...\n")) | |
2119 | editor = ui.geteditor() |
|
2119 | editor = ui.geteditor() | |
2120 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) |
|
2120 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) | |
2121 | if not cmdpath: |
|
2121 | if not cmdpath: | |
2122 | if editor == 'vi': |
|
2122 | if editor == 'vi': | |
2123 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
2123 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) | |
2124 | ui.write(_(" (specify a commit editor in your configuration" |
|
2124 | ui.write(_(" (specify a commit editor in your configuration" | |
2125 | " file)\n")) |
|
2125 | " file)\n")) | |
2126 | else: |
|
2126 | else: | |
2127 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
2127 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) | |
2128 | ui.write(_(" (specify a commit editor in your configuration" |
|
2128 | ui.write(_(" (specify a commit editor in your configuration" | |
2129 | " file)\n")) |
|
2129 | " file)\n")) | |
2130 | problems += 1 |
|
2130 | problems += 1 | |
2131 |
|
2131 | |||
2132 | # check username |
|
2132 | # check username | |
2133 | ui.status(_("checking username...\n")) |
|
2133 | ui.status(_("checking username...\n")) | |
2134 | try: |
|
2134 | try: | |
2135 | ui.username() |
|
2135 | ui.username() | |
2136 | except util.Abort, e: |
|
2136 | except util.Abort, e: | |
2137 | ui.write(" %s\n" % e) |
|
2137 | ui.write(" %s\n" % e) | |
2138 | ui.write(_(" (specify a username in your configuration file)\n")) |
|
2138 | ui.write(_(" (specify a username in your configuration file)\n")) | |
2139 | problems += 1 |
|
2139 | problems += 1 | |
2140 |
|
2140 | |||
2141 | if not problems: |
|
2141 | if not problems: | |
2142 | ui.status(_("no problems detected\n")) |
|
2142 | ui.status(_("no problems detected\n")) | |
2143 | else: |
|
2143 | else: | |
2144 | ui.write(_("%s problems detected," |
|
2144 | ui.write(_("%s problems detected," | |
2145 | " please check your install!\n") % problems) |
|
2145 | " please check your install!\n") % problems) | |
2146 |
|
2146 | |||
2147 | return problems |
|
2147 | return problems | |
2148 |
|
2148 | |||
2149 | @command('debugknown', [], _('REPO ID...')) |
|
2149 | @command('debugknown', [], _('REPO ID...')) | |
2150 | def debugknown(ui, repopath, *ids, **opts): |
|
2150 | def debugknown(ui, repopath, *ids, **opts): | |
2151 | """test whether node ids are known to a repo |
|
2151 | """test whether node ids are known to a repo | |
2152 |
|
2152 | |||
2153 | Every ID must be a full-length hex node id string. Returns a list of 0s |
|
2153 | Every ID must be a full-length hex node id string. Returns a list of 0s | |
2154 | and 1s indicating unknown/known. |
|
2154 | and 1s indicating unknown/known. | |
2155 | """ |
|
2155 | """ | |
2156 | repo = hg.peer(ui, opts, repopath) |
|
2156 | repo = hg.peer(ui, opts, repopath) | |
2157 | if not repo.capable('known'): |
|
2157 | if not repo.capable('known'): | |
2158 | raise util.Abort("known() not supported by target repository") |
|
2158 | raise util.Abort("known() not supported by target repository") | |
2159 | flags = repo.known([bin(s) for s in ids]) |
|
2159 | flags = repo.known([bin(s) for s in ids]) | |
2160 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
2160 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) | |
2161 |
|
2161 | |||
2162 | @command('debuglabelcomplete', [], _('LABEL...')) |
|
2162 | @command('debuglabelcomplete', [], _('LABEL...')) | |
2163 | def debuglabelcomplete(ui, repo, *args): |
|
2163 | def debuglabelcomplete(ui, repo, *args): | |
2164 | '''complete "labels" - tags, open branch names, bookmark names''' |
|
2164 | '''complete "labels" - tags, open branch names, bookmark names''' | |
2165 |
|
2165 | |||
2166 | labels = set() |
|
2166 | labels = set() | |
2167 | labels.update(t[0] for t in repo.tagslist()) |
|
2167 | labels.update(t[0] for t in repo.tagslist()) | |
2168 | labels.update(repo._bookmarks.keys()) |
|
2168 | labels.update(repo._bookmarks.keys()) | |
2169 | labels.update(tag for (tag, heads, tip, closed) |
|
2169 | labels.update(tag for (tag, heads, tip, closed) | |
2170 | in repo.branchmap().iterbranches() if not closed) |
|
2170 | in repo.branchmap().iterbranches() if not closed) | |
2171 | completions = set() |
|
2171 | completions = set() | |
2172 | if not args: |
|
2172 | if not args: | |
2173 | args = [''] |
|
2173 | args = [''] | |
2174 | for a in args: |
|
2174 | for a in args: | |
2175 | completions.update(l for l in labels if l.startswith(a)) |
|
2175 | completions.update(l for l in labels if l.startswith(a)) | |
2176 | ui.write('\n'.join(sorted(completions))) |
|
2176 | ui.write('\n'.join(sorted(completions))) | |
2177 | ui.write('\n') |
|
2177 | ui.write('\n') | |
2178 |
|
2178 | |||
2179 | @command('debugobsolete', |
|
2179 | @command('debugobsolete', | |
2180 | [('', 'flags', 0, _('markers flag')), |
|
2180 | [('', 'flags', 0, _('markers flag')), | |
2181 | ] + commitopts2, |
|
2181 | ] + commitopts2, | |
2182 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) |
|
2182 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) | |
2183 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): |
|
2183 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): | |
2184 | """create arbitrary obsolete marker |
|
2184 | """create arbitrary obsolete marker | |
2185 |
|
2185 | |||
2186 | With no arguments, displays the list of obsolescence markers.""" |
|
2186 | With no arguments, displays the list of obsolescence markers.""" | |
2187 | def parsenodeid(s): |
|
2187 | def parsenodeid(s): | |
2188 | try: |
|
2188 | try: | |
2189 | # We do not use revsingle/revrange functions here to accept |
|
2189 | # We do not use revsingle/revrange functions here to accept | |
2190 | # arbitrary node identifiers, possibly not present in the |
|
2190 | # arbitrary node identifiers, possibly not present in the | |
2191 | # local repository. |
|
2191 | # local repository. | |
2192 | n = bin(s) |
|
2192 | n = bin(s) | |
2193 | if len(n) != len(nullid): |
|
2193 | if len(n) != len(nullid): | |
2194 | raise TypeError() |
|
2194 | raise TypeError() | |
2195 | return n |
|
2195 | return n | |
2196 | except TypeError: |
|
2196 | except TypeError: | |
2197 | raise util.Abort('changeset references must be full hexadecimal ' |
|
2197 | raise util.Abort('changeset references must be full hexadecimal ' | |
2198 | 'node identifiers') |
|
2198 | 'node identifiers') | |
2199 |
|
2199 | |||
2200 | if precursor is not None: |
|
2200 | if precursor is not None: | |
2201 | metadata = {} |
|
2201 | metadata = {} | |
2202 | if 'date' in opts: |
|
2202 | if 'date' in opts: | |
2203 | metadata['date'] = opts['date'] |
|
2203 | metadata['date'] = opts['date'] | |
2204 | metadata['user'] = opts['user'] or ui.username() |
|
2204 | metadata['user'] = opts['user'] or ui.username() | |
2205 | succs = tuple(parsenodeid(succ) for succ in successors) |
|
2205 | succs = tuple(parsenodeid(succ) for succ in successors) | |
2206 | l = repo.lock() |
|
2206 | l = repo.lock() | |
2207 | try: |
|
2207 | try: | |
2208 | tr = repo.transaction('debugobsolete') |
|
2208 | tr = repo.transaction('debugobsolete') | |
2209 | try: |
|
2209 | try: | |
2210 | repo.obsstore.create(tr, parsenodeid(precursor), succs, |
|
2210 | repo.obsstore.create(tr, parsenodeid(precursor), succs, | |
2211 | opts['flags'], metadata) |
|
2211 | opts['flags'], metadata) | |
2212 | tr.close() |
|
2212 | tr.close() | |
2213 | finally: |
|
2213 | finally: | |
2214 | tr.release() |
|
2214 | tr.release() | |
2215 | finally: |
|
2215 | finally: | |
2216 | l.release() |
|
2216 | l.release() | |
2217 | else: |
|
2217 | else: | |
2218 | for m in obsolete.allmarkers(repo): |
|
2218 | for m in obsolete.allmarkers(repo): | |
2219 | ui.write(hex(m.precnode())) |
|
2219 | ui.write(hex(m.precnode())) | |
2220 | for repl in m.succnodes(): |
|
2220 | for repl in m.succnodes(): | |
2221 | ui.write(' ') |
|
2221 | ui.write(' ') | |
2222 | ui.write(hex(repl)) |
|
2222 | ui.write(hex(repl)) | |
2223 | ui.write(' %X ' % m._data[2]) |
|
2223 | ui.write(' %X ' % m._data[2]) | |
2224 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
2224 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | |
2225 | sorted(m.metadata().items())))) |
|
2225 | sorted(m.metadata().items())))) | |
2226 | ui.write('\n') |
|
2226 | ui.write('\n') | |
2227 |
|
2227 | |||
2228 | @command('debugpathcomplete', |
|
2228 | @command('debugpathcomplete', | |
2229 | [('f', 'full', None, _('complete an entire path')), |
|
2229 | [('f', 'full', None, _('complete an entire path')), | |
2230 | ('n', 'normal', None, _('show only normal files')), |
|
2230 | ('n', 'normal', None, _('show only normal files')), | |
2231 | ('a', 'added', None, _('show only added files')), |
|
2231 | ('a', 'added', None, _('show only added files')), | |
2232 | ('r', 'removed', None, _('show only removed files'))], |
|
2232 | ('r', 'removed', None, _('show only removed files'))], | |
2233 | _('FILESPEC...')) |
|
2233 | _('FILESPEC...')) | |
2234 | def debugpathcomplete(ui, repo, *specs, **opts): |
|
2234 | def debugpathcomplete(ui, repo, *specs, **opts): | |
2235 | '''complete part or all of a tracked path |
|
2235 | '''complete part or all of a tracked path | |
2236 |
|
2236 | |||
2237 | This command supports shells that offer path name completion. It |
|
2237 | This command supports shells that offer path name completion. It | |
2238 | currently completes only files already known to the dirstate. |
|
2238 | currently completes only files already known to the dirstate. | |
2239 |
|
2239 | |||
2240 | Completion extends only to the next path segment unless |
|
2240 | Completion extends only to the next path segment unless | |
2241 | --full is specified, in which case entire paths are used.''' |
|
2241 | --full is specified, in which case entire paths are used.''' | |
2242 |
|
2242 | |||
2243 | def complete(path, acceptable): |
|
2243 | def complete(path, acceptable): | |
2244 | dirstate = repo.dirstate |
|
2244 | dirstate = repo.dirstate | |
2245 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) |
|
2245 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) | |
2246 | rootdir = repo.root + os.sep |
|
2246 | rootdir = repo.root + os.sep | |
2247 | if spec != repo.root and not spec.startswith(rootdir): |
|
2247 | if spec != repo.root and not spec.startswith(rootdir): | |
2248 | return [], [] |
|
2248 | return [], [] | |
2249 | if os.path.isdir(spec): |
|
2249 | if os.path.isdir(spec): | |
2250 | spec += '/' |
|
2250 | spec += '/' | |
2251 | spec = spec[len(rootdir):] |
|
2251 | spec = spec[len(rootdir):] | |
2252 | fixpaths = os.sep != '/' |
|
2252 | fixpaths = os.sep != '/' | |
2253 | if fixpaths: |
|
2253 | if fixpaths: | |
2254 | spec = spec.replace(os.sep, '/') |
|
2254 | spec = spec.replace(os.sep, '/') | |
2255 | speclen = len(spec) |
|
2255 | speclen = len(spec) | |
2256 | fullpaths = opts['full'] |
|
2256 | fullpaths = opts['full'] | |
2257 | files, dirs = set(), set() |
|
2257 | files, dirs = set(), set() | |
2258 | adddir, addfile = dirs.add, files.add |
|
2258 | adddir, addfile = dirs.add, files.add | |
2259 | for f, st in dirstate.iteritems(): |
|
2259 | for f, st in dirstate.iteritems(): | |
2260 | if f.startswith(spec) and st[0] in acceptable: |
|
2260 | if f.startswith(spec) and st[0] in acceptable: | |
2261 | if fixpaths: |
|
2261 | if fixpaths: | |
2262 | f = f.replace('/', os.sep) |
|
2262 | f = f.replace('/', os.sep) | |
2263 | if fullpaths: |
|
2263 | if fullpaths: | |
2264 | addfile(f) |
|
2264 | addfile(f) | |
2265 | continue |
|
2265 | continue | |
2266 | s = f.find(os.sep, speclen) |
|
2266 | s = f.find(os.sep, speclen) | |
2267 | if s >= 0: |
|
2267 | if s >= 0: | |
2268 | adddir(f[:s]) |
|
2268 | adddir(f[:s]) | |
2269 | else: |
|
2269 | else: | |
2270 | addfile(f) |
|
2270 | addfile(f) | |
2271 | return files, dirs |
|
2271 | return files, dirs | |
2272 |
|
2272 | |||
2273 | acceptable = '' |
|
2273 | acceptable = '' | |
2274 | if opts['normal']: |
|
2274 | if opts['normal']: | |
2275 | acceptable += 'nm' |
|
2275 | acceptable += 'nm' | |
2276 | if opts['added']: |
|
2276 | if opts['added']: | |
2277 | acceptable += 'a' |
|
2277 | acceptable += 'a' | |
2278 | if opts['removed']: |
|
2278 | if opts['removed']: | |
2279 | acceptable += 'r' |
|
2279 | acceptable += 'r' | |
2280 | cwd = repo.getcwd() |
|
2280 | cwd = repo.getcwd() | |
2281 | if not specs: |
|
2281 | if not specs: | |
2282 | specs = ['.'] |
|
2282 | specs = ['.'] | |
2283 |
|
2283 | |||
2284 | files, dirs = set(), set() |
|
2284 | files, dirs = set(), set() | |
2285 | for spec in specs: |
|
2285 | for spec in specs: | |
2286 | f, d = complete(spec, acceptable or 'nmar') |
|
2286 | f, d = complete(spec, acceptable or 'nmar') | |
2287 | files.update(f) |
|
2287 | files.update(f) | |
2288 | dirs.update(d) |
|
2288 | dirs.update(d) | |
2289 | files.update(dirs) |
|
2289 | files.update(dirs) | |
2290 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) |
|
2290 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) | |
2291 | ui.write('\n') |
|
2291 | ui.write('\n') | |
2292 |
|
2292 | |||
2293 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) |
|
2293 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) | |
2294 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): |
|
2294 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): | |
2295 | '''access the pushkey key/value protocol |
|
2295 | '''access the pushkey key/value protocol | |
2296 |
|
2296 | |||
2297 | With two args, list the keys in the given namespace. |
|
2297 | With two args, list the keys in the given namespace. | |
2298 |
|
2298 | |||
2299 | With five args, set a key to new if it currently is set to old. |
|
2299 | With five args, set a key to new if it currently is set to old. | |
2300 | Reports success or failure. |
|
2300 | Reports success or failure. | |
2301 | ''' |
|
2301 | ''' | |
2302 |
|
2302 | |||
2303 | target = hg.peer(ui, {}, repopath) |
|
2303 | target = hg.peer(ui, {}, repopath) | |
2304 | if keyinfo: |
|
2304 | if keyinfo: | |
2305 | key, old, new = keyinfo |
|
2305 | key, old, new = keyinfo | |
2306 | r = target.pushkey(namespace, key, old, new) |
|
2306 | r = target.pushkey(namespace, key, old, new) | |
2307 | ui.status(str(r) + '\n') |
|
2307 | ui.status(str(r) + '\n') | |
2308 | return not r |
|
2308 | return not r | |
2309 | else: |
|
2309 | else: | |
2310 | for k, v in sorted(target.listkeys(namespace).iteritems()): |
|
2310 | for k, v in sorted(target.listkeys(namespace).iteritems()): | |
2311 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
2311 | ui.write("%s\t%s\n" % (k.encode('string-escape'), | |
2312 | v.encode('string-escape'))) |
|
2312 | v.encode('string-escape'))) | |
2313 |
|
2313 | |||
2314 | @command('debugpvec', [], _('A B')) |
|
2314 | @command('debugpvec', [], _('A B')) | |
2315 | def debugpvec(ui, repo, a, b=None): |
|
2315 | def debugpvec(ui, repo, a, b=None): | |
2316 | ca = scmutil.revsingle(repo, a) |
|
2316 | ca = scmutil.revsingle(repo, a) | |
2317 | cb = scmutil.revsingle(repo, b) |
|
2317 | cb = scmutil.revsingle(repo, b) | |
2318 | pa = pvec.ctxpvec(ca) |
|
2318 | pa = pvec.ctxpvec(ca) | |
2319 | pb = pvec.ctxpvec(cb) |
|
2319 | pb = pvec.ctxpvec(cb) | |
2320 | if pa == pb: |
|
2320 | if pa == pb: | |
2321 | rel = "=" |
|
2321 | rel = "=" | |
2322 | elif pa > pb: |
|
2322 | elif pa > pb: | |
2323 | rel = ">" |
|
2323 | rel = ">" | |
2324 | elif pa < pb: |
|
2324 | elif pa < pb: | |
2325 | rel = "<" |
|
2325 | rel = "<" | |
2326 | elif pa | pb: |
|
2326 | elif pa | pb: | |
2327 | rel = "|" |
|
2327 | rel = "|" | |
2328 | ui.write(_("a: %s\n") % pa) |
|
2328 | ui.write(_("a: %s\n") % pa) | |
2329 | ui.write(_("b: %s\n") % pb) |
|
2329 | ui.write(_("b: %s\n") % pb) | |
2330 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) |
|
2330 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) | |
2331 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % |
|
2331 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % | |
2332 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), |
|
2332 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), | |
2333 | pa.distance(pb), rel)) |
|
2333 | pa.distance(pb), rel)) | |
2334 |
|
2334 | |||
2335 | @command('debugrebuilddirstate|debugrebuildstate', |
|
2335 | @command('debugrebuilddirstate|debugrebuildstate', | |
2336 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], |
|
2336 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], | |
2337 | _('[-r REV]')) |
|
2337 | _('[-r REV]')) | |
2338 | def debugrebuilddirstate(ui, repo, rev): |
|
2338 | def debugrebuilddirstate(ui, repo, rev): | |
2339 | """rebuild the dirstate as it would look like for the given revision |
|
2339 | """rebuild the dirstate as it would look like for the given revision | |
2340 |
|
2340 | |||
2341 | If no revision is specified the first current parent will be used. |
|
2341 | If no revision is specified the first current parent will be used. | |
2342 |
|
2342 | |||
2343 | The dirstate will be set to the files of the given revision. |
|
2343 | The dirstate will be set to the files of the given revision. | |
2344 | The actual working directory content or existing dirstate |
|
2344 | The actual working directory content or existing dirstate | |
2345 | information such as adds or removes is not considered. |
|
2345 | information such as adds or removes is not considered. | |
2346 |
|
2346 | |||
2347 | One use of this command is to make the next :hg:`status` invocation |
|
2347 | One use of this command is to make the next :hg:`status` invocation | |
2348 | check the actual file content. |
|
2348 | check the actual file content. | |
2349 | """ |
|
2349 | """ | |
2350 | ctx = scmutil.revsingle(repo, rev) |
|
2350 | ctx = scmutil.revsingle(repo, rev) | |
2351 | wlock = repo.wlock() |
|
2351 | wlock = repo.wlock() | |
2352 | try: |
|
2352 | try: | |
2353 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
2353 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) | |
2354 | finally: |
|
2354 | finally: | |
2355 | wlock.release() |
|
2355 | wlock.release() | |
2356 |
|
2356 | |||
2357 | @command('debugrename', |
|
2357 | @command('debugrename', | |
2358 | [('r', 'rev', '', _('revision to debug'), _('REV'))], |
|
2358 | [('r', 'rev', '', _('revision to debug'), _('REV'))], | |
2359 | _('[-r REV] FILE')) |
|
2359 | _('[-r REV] FILE')) | |
2360 | def debugrename(ui, repo, file1, *pats, **opts): |
|
2360 | def debugrename(ui, repo, file1, *pats, **opts): | |
2361 | """dump rename information""" |
|
2361 | """dump rename information""" | |
2362 |
|
2362 | |||
2363 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
2363 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
2364 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
2364 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
2365 | for abs in ctx.walk(m): |
|
2365 | for abs in ctx.walk(m): | |
2366 | fctx = ctx[abs] |
|
2366 | fctx = ctx[abs] | |
2367 | o = fctx.filelog().renamed(fctx.filenode()) |
|
2367 | o = fctx.filelog().renamed(fctx.filenode()) | |
2368 | rel = m.rel(abs) |
|
2368 | rel = m.rel(abs) | |
2369 | if o: |
|
2369 | if o: | |
2370 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
2370 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) | |
2371 | else: |
|
2371 | else: | |
2372 | ui.write(_("%s not renamed\n") % rel) |
|
2372 | ui.write(_("%s not renamed\n") % rel) | |
2373 |
|
2373 | |||
2374 | @command('debugrevlog', |
|
2374 | @command('debugrevlog', | |
2375 | [('c', 'changelog', False, _('open changelog')), |
|
2375 | [('c', 'changelog', False, _('open changelog')), | |
2376 | ('m', 'manifest', False, _('open manifest')), |
|
2376 | ('m', 'manifest', False, _('open manifest')), | |
2377 | ('d', 'dump', False, _('dump index data'))], |
|
2377 | ('d', 'dump', False, _('dump index data'))], | |
2378 | _('-c|-m|FILE')) |
|
2378 | _('-c|-m|FILE')) | |
2379 | def debugrevlog(ui, repo, file_=None, **opts): |
|
2379 | def debugrevlog(ui, repo, file_=None, **opts): | |
2380 | """show data and statistics about a revlog""" |
|
2380 | """show data and statistics about a revlog""" | |
2381 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) |
|
2381 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) | |
2382 |
|
2382 | |||
2383 | if opts.get("dump"): |
|
2383 | if opts.get("dump"): | |
2384 | numrevs = len(r) |
|
2384 | numrevs = len(r) | |
2385 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" |
|
2385 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" | |
2386 | " rawsize totalsize compression heads\n") |
|
2386 | " rawsize totalsize compression heads\n") | |
2387 | ts = 0 |
|
2387 | ts = 0 | |
2388 | heads = set() |
|
2388 | heads = set() | |
2389 | for rev in xrange(numrevs): |
|
2389 | for rev in xrange(numrevs): | |
2390 | dbase = r.deltaparent(rev) |
|
2390 | dbase = r.deltaparent(rev) | |
2391 | if dbase == -1: |
|
2391 | if dbase == -1: | |
2392 | dbase = rev |
|
2392 | dbase = rev | |
2393 | cbase = r.chainbase(rev) |
|
2393 | cbase = r.chainbase(rev) | |
2394 | p1, p2 = r.parentrevs(rev) |
|
2394 | p1, p2 = r.parentrevs(rev) | |
2395 | rs = r.rawsize(rev) |
|
2395 | rs = r.rawsize(rev) | |
2396 | ts = ts + rs |
|
2396 | ts = ts + rs | |
2397 | heads -= set(r.parentrevs(rev)) |
|
2397 | heads -= set(r.parentrevs(rev)) | |
2398 | heads.add(rev) |
|
2398 | heads.add(rev) | |
2399 | ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" % |
|
2399 | ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" % | |
2400 | (rev, p1, p2, r.start(rev), r.end(rev), |
|
2400 | (rev, p1, p2, r.start(rev), r.end(rev), | |
2401 | r.start(dbase), r.start(cbase), |
|
2401 | r.start(dbase), r.start(cbase), | |
2402 | r.start(p1), r.start(p2), |
|
2402 | r.start(p1), r.start(p2), | |
2403 | rs, ts, ts / r.end(rev), len(heads))) |
|
2403 | rs, ts, ts / r.end(rev), len(heads))) | |
2404 | return 0 |
|
2404 | return 0 | |
2405 |
|
2405 | |||
2406 | v = r.version |
|
2406 | v = r.version | |
2407 | format = v & 0xFFFF |
|
2407 | format = v & 0xFFFF | |
2408 | flags = [] |
|
2408 | flags = [] | |
2409 | gdelta = False |
|
2409 | gdelta = False | |
2410 | if v & revlog.REVLOGNGINLINEDATA: |
|
2410 | if v & revlog.REVLOGNGINLINEDATA: | |
2411 | flags.append('inline') |
|
2411 | flags.append('inline') | |
2412 | if v & revlog.REVLOGGENERALDELTA: |
|
2412 | if v & revlog.REVLOGGENERALDELTA: | |
2413 | gdelta = True |
|
2413 | gdelta = True | |
2414 | flags.append('generaldelta') |
|
2414 | flags.append('generaldelta') | |
2415 | if not flags: |
|
2415 | if not flags: | |
2416 | flags = ['(none)'] |
|
2416 | flags = ['(none)'] | |
2417 |
|
2417 | |||
2418 | nummerges = 0 |
|
2418 | nummerges = 0 | |
2419 | numfull = 0 |
|
2419 | numfull = 0 | |
2420 | numprev = 0 |
|
2420 | numprev = 0 | |
2421 | nump1 = 0 |
|
2421 | nump1 = 0 | |
2422 | nump2 = 0 |
|
2422 | nump2 = 0 | |
2423 | numother = 0 |
|
2423 | numother = 0 | |
2424 | nump1prev = 0 |
|
2424 | nump1prev = 0 | |
2425 | nump2prev = 0 |
|
2425 | nump2prev = 0 | |
2426 | chainlengths = [] |
|
2426 | chainlengths = [] | |
2427 |
|
2427 | |||
2428 | datasize = [None, 0, 0L] |
|
2428 | datasize = [None, 0, 0L] | |
2429 | fullsize = [None, 0, 0L] |
|
2429 | fullsize = [None, 0, 0L] | |
2430 | deltasize = [None, 0, 0L] |
|
2430 | deltasize = [None, 0, 0L] | |
2431 |
|
2431 | |||
2432 | def addsize(size, l): |
|
2432 | def addsize(size, l): | |
2433 | if l[0] is None or size < l[0]: |
|
2433 | if l[0] is None or size < l[0]: | |
2434 | l[0] = size |
|
2434 | l[0] = size | |
2435 | if size > l[1]: |
|
2435 | if size > l[1]: | |
2436 | l[1] = size |
|
2436 | l[1] = size | |
2437 | l[2] += size |
|
2437 | l[2] += size | |
2438 |
|
2438 | |||
2439 | numrevs = len(r) |
|
2439 | numrevs = len(r) | |
2440 | for rev in xrange(numrevs): |
|
2440 | for rev in xrange(numrevs): | |
2441 | p1, p2 = r.parentrevs(rev) |
|
2441 | p1, p2 = r.parentrevs(rev) | |
2442 | delta = r.deltaparent(rev) |
|
2442 | delta = r.deltaparent(rev) | |
2443 | if format > 0: |
|
2443 | if format > 0: | |
2444 | addsize(r.rawsize(rev), datasize) |
|
2444 | addsize(r.rawsize(rev), datasize) | |
2445 | if p2 != nullrev: |
|
2445 | if p2 != nullrev: | |
2446 | nummerges += 1 |
|
2446 | nummerges += 1 | |
2447 | size = r.length(rev) |
|
2447 | size = r.length(rev) | |
2448 | if delta == nullrev: |
|
2448 | if delta == nullrev: | |
2449 | chainlengths.append(0) |
|
2449 | chainlengths.append(0) | |
2450 | numfull += 1 |
|
2450 | numfull += 1 | |
2451 | addsize(size, fullsize) |
|
2451 | addsize(size, fullsize) | |
2452 | else: |
|
2452 | else: | |
2453 | chainlengths.append(chainlengths[delta] + 1) |
|
2453 | chainlengths.append(chainlengths[delta] + 1) | |
2454 | addsize(size, deltasize) |
|
2454 | addsize(size, deltasize) | |
2455 | if delta == rev - 1: |
|
2455 | if delta == rev - 1: | |
2456 | numprev += 1 |
|
2456 | numprev += 1 | |
2457 | if delta == p1: |
|
2457 | if delta == p1: | |
2458 | nump1prev += 1 |
|
2458 | nump1prev += 1 | |
2459 | elif delta == p2: |
|
2459 | elif delta == p2: | |
2460 | nump2prev += 1 |
|
2460 | nump2prev += 1 | |
2461 | elif delta == p1: |
|
2461 | elif delta == p1: | |
2462 | nump1 += 1 |
|
2462 | nump1 += 1 | |
2463 | elif delta == p2: |
|
2463 | elif delta == p2: | |
2464 | nump2 += 1 |
|
2464 | nump2 += 1 | |
2465 | elif delta != nullrev: |
|
2465 | elif delta != nullrev: | |
2466 | numother += 1 |
|
2466 | numother += 1 | |
2467 |
|
2467 | |||
2468 | # Adjust size min value for empty cases |
|
2468 | # Adjust size min value for empty cases | |
2469 | for size in (datasize, fullsize, deltasize): |
|
2469 | for size in (datasize, fullsize, deltasize): | |
2470 | if size[0] is None: |
|
2470 | if size[0] is None: | |
2471 | size[0] = 0 |
|
2471 | size[0] = 0 | |
2472 |
|
2472 | |||
2473 | numdeltas = numrevs - numfull |
|
2473 | numdeltas = numrevs - numfull | |
2474 | numoprev = numprev - nump1prev - nump2prev |
|
2474 | numoprev = numprev - nump1prev - nump2prev | |
2475 | totalrawsize = datasize[2] |
|
2475 | totalrawsize = datasize[2] | |
2476 | datasize[2] /= numrevs |
|
2476 | datasize[2] /= numrevs | |
2477 | fulltotal = fullsize[2] |
|
2477 | fulltotal = fullsize[2] | |
2478 | fullsize[2] /= numfull |
|
2478 | fullsize[2] /= numfull | |
2479 | deltatotal = deltasize[2] |
|
2479 | deltatotal = deltasize[2] | |
2480 | if numrevs - numfull > 0: |
|
2480 | if numrevs - numfull > 0: | |
2481 | deltasize[2] /= numrevs - numfull |
|
2481 | deltasize[2] /= numrevs - numfull | |
2482 | totalsize = fulltotal + deltatotal |
|
2482 | totalsize = fulltotal + deltatotal | |
2483 | avgchainlen = sum(chainlengths) / numrevs |
|
2483 | avgchainlen = sum(chainlengths) / numrevs | |
2484 | compratio = totalrawsize / totalsize |
|
2484 | compratio = totalrawsize / totalsize | |
2485 |
|
2485 | |||
2486 | basedfmtstr = '%%%dd\n' |
|
2486 | basedfmtstr = '%%%dd\n' | |
2487 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' |
|
2487 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' | |
2488 |
|
2488 | |||
2489 | def dfmtstr(max): |
|
2489 | def dfmtstr(max): | |
2490 | return basedfmtstr % len(str(max)) |
|
2490 | return basedfmtstr % len(str(max)) | |
2491 | def pcfmtstr(max, padding=0): |
|
2491 | def pcfmtstr(max, padding=0): | |
2492 | return basepcfmtstr % (len(str(max)), ' ' * padding) |
|
2492 | return basepcfmtstr % (len(str(max)), ' ' * padding) | |
2493 |
|
2493 | |||
2494 | def pcfmt(value, total): |
|
2494 | def pcfmt(value, total): | |
2495 | return (value, 100 * float(value) / total) |
|
2495 | return (value, 100 * float(value) / total) | |
2496 |
|
2496 | |||
2497 | ui.write(('format : %d\n') % format) |
|
2497 | ui.write(('format : %d\n') % format) | |
2498 | ui.write(('flags : %s\n') % ', '.join(flags)) |
|
2498 | ui.write(('flags : %s\n') % ', '.join(flags)) | |
2499 |
|
2499 | |||
2500 | ui.write('\n') |
|
2500 | ui.write('\n') | |
2501 | fmt = pcfmtstr(totalsize) |
|
2501 | fmt = pcfmtstr(totalsize) | |
2502 | fmt2 = dfmtstr(totalsize) |
|
2502 | fmt2 = dfmtstr(totalsize) | |
2503 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
2503 | ui.write(('revisions : ') + fmt2 % numrevs) | |
2504 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) |
|
2504 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) | |
2505 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) |
|
2505 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) | |
2506 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
2506 | ui.write(('revisions : ') + fmt2 % numrevs) | |
2507 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) |
|
2507 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) | |
2508 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) |
|
2508 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) | |
2509 | ui.write(('revision size : ') + fmt2 % totalsize) |
|
2509 | ui.write(('revision size : ') + fmt2 % totalsize) | |
2510 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) |
|
2510 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) | |
2511 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) |
|
2511 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) | |
2512 |
|
2512 | |||
2513 | ui.write('\n') |
|
2513 | ui.write('\n') | |
2514 | fmt = dfmtstr(max(avgchainlen, compratio)) |
|
2514 | fmt = dfmtstr(max(avgchainlen, compratio)) | |
2515 | ui.write(('avg chain length : ') + fmt % avgchainlen) |
|
2515 | ui.write(('avg chain length : ') + fmt % avgchainlen) | |
2516 | ui.write(('compression ratio : ') + fmt % compratio) |
|
2516 | ui.write(('compression ratio : ') + fmt % compratio) | |
2517 |
|
2517 | |||
2518 | if format > 0: |
|
2518 | if format > 0: | |
2519 | ui.write('\n') |
|
2519 | ui.write('\n') | |
2520 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') |
|
2520 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') | |
2521 | % tuple(datasize)) |
|
2521 | % tuple(datasize)) | |
2522 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') |
|
2522 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') | |
2523 | % tuple(fullsize)) |
|
2523 | % tuple(fullsize)) | |
2524 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') |
|
2524 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') | |
2525 | % tuple(deltasize)) |
|
2525 | % tuple(deltasize)) | |
2526 |
|
2526 | |||
2527 | if numdeltas > 0: |
|
2527 | if numdeltas > 0: | |
2528 | ui.write('\n') |
|
2528 | ui.write('\n') | |
2529 | fmt = pcfmtstr(numdeltas) |
|
2529 | fmt = pcfmtstr(numdeltas) | |
2530 | fmt2 = pcfmtstr(numdeltas, 4) |
|
2530 | fmt2 = pcfmtstr(numdeltas, 4) | |
2531 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) |
|
2531 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) | |
2532 | if numprev > 0: |
|
2532 | if numprev > 0: | |
2533 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, |
|
2533 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, | |
2534 | numprev)) |
|
2534 | numprev)) | |
2535 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, |
|
2535 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, | |
2536 | numprev)) |
|
2536 | numprev)) | |
2537 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, |
|
2537 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, | |
2538 | numprev)) |
|
2538 | numprev)) | |
2539 | if gdelta: |
|
2539 | if gdelta: | |
2540 | ui.write(('deltas against p1 : ') |
|
2540 | ui.write(('deltas against p1 : ') | |
2541 | + fmt % pcfmt(nump1, numdeltas)) |
|
2541 | + fmt % pcfmt(nump1, numdeltas)) | |
2542 | ui.write(('deltas against p2 : ') |
|
2542 | ui.write(('deltas against p2 : ') | |
2543 | + fmt % pcfmt(nump2, numdeltas)) |
|
2543 | + fmt % pcfmt(nump2, numdeltas)) | |
2544 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, |
|
2544 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, | |
2545 | numdeltas)) |
|
2545 | numdeltas)) | |
2546 |
|
2546 | |||
2547 | @command('debugrevspec', [], ('REVSPEC')) |
|
2547 | @command('debugrevspec', [], ('REVSPEC')) | |
2548 | def debugrevspec(ui, repo, expr): |
|
2548 | def debugrevspec(ui, repo, expr): | |
2549 | """parse and apply a revision specification |
|
2549 | """parse and apply a revision specification | |
2550 |
|
2550 | |||
2551 | Use --verbose to print the parsed tree before and after aliases |
|
2551 | Use --verbose to print the parsed tree before and after aliases | |
2552 | expansion. |
|
2552 | expansion. | |
2553 | """ |
|
2553 | """ | |
2554 | if ui.verbose: |
|
2554 | if ui.verbose: | |
2555 | tree = revset.parse(expr)[0] |
|
2555 | tree = revset.parse(expr)[0] | |
2556 | ui.note(revset.prettyformat(tree), "\n") |
|
2556 | ui.note(revset.prettyformat(tree), "\n") | |
2557 | newtree = revset.findaliases(ui, tree) |
|
2557 | newtree = revset.findaliases(ui, tree) | |
2558 | if newtree != tree: |
|
2558 | if newtree != tree: | |
2559 | ui.note(revset.prettyformat(newtree), "\n") |
|
2559 | ui.note(revset.prettyformat(newtree), "\n") | |
2560 | func = revset.match(ui, expr) |
|
2560 | func = revset.match(ui, expr) | |
2561 | for c in func(repo, range(len(repo))): |
|
2561 | for c in func(repo, range(len(repo))): | |
2562 | ui.write("%s\n" % c) |
|
2562 | ui.write("%s\n" % c) | |
2563 |
|
2563 | |||
2564 | @command('debugsetparents', [], _('REV1 [REV2]')) |
|
2564 | @command('debugsetparents', [], _('REV1 [REV2]')) | |
2565 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
2565 | def debugsetparents(ui, repo, rev1, rev2=None): | |
2566 | """manually set the parents of the current working directory |
|
2566 | """manually set the parents of the current working directory | |
2567 |
|
2567 | |||
2568 | This is useful for writing repository conversion tools, but should |
|
2568 | This is useful for writing repository conversion tools, but should | |
2569 | be used with care. |
|
2569 | be used with care. | |
2570 |
|
2570 | |||
2571 | Returns 0 on success. |
|
2571 | Returns 0 on success. | |
2572 | """ |
|
2572 | """ | |
2573 |
|
2573 | |||
2574 | r1 = scmutil.revsingle(repo, rev1).node() |
|
2574 | r1 = scmutil.revsingle(repo, rev1).node() | |
2575 | r2 = scmutil.revsingle(repo, rev2, 'null').node() |
|
2575 | r2 = scmutil.revsingle(repo, rev2, 'null').node() | |
2576 |
|
2576 | |||
2577 | wlock = repo.wlock() |
|
2577 | wlock = repo.wlock() | |
2578 | try: |
|
2578 | try: | |
2579 | repo.setparents(r1, r2) |
|
2579 | repo.setparents(r1, r2) | |
2580 | finally: |
|
2580 | finally: | |
2581 | wlock.release() |
|
2581 | wlock.release() | |
2582 |
|
2582 | |||
2583 | @command('debugdirstate|debugstate', |
|
2583 | @command('debugdirstate|debugstate', | |
2584 | [('', 'nodates', None, _('do not display the saved mtime')), |
|
2584 | [('', 'nodates', None, _('do not display the saved mtime')), | |
2585 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
2585 | ('', 'datesort', None, _('sort by saved mtime'))], | |
2586 | _('[OPTION]...')) |
|
2586 | _('[OPTION]...')) | |
2587 | def debugstate(ui, repo, nodates=None, datesort=None): |
|
2587 | def debugstate(ui, repo, nodates=None, datesort=None): | |
2588 | """show the contents of the current dirstate""" |
|
2588 | """show the contents of the current dirstate""" | |
2589 | timestr = "" |
|
2589 | timestr = "" | |
2590 | showdate = not nodates |
|
2590 | showdate = not nodates | |
2591 | if datesort: |
|
2591 | if datesort: | |
2592 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
|
2592 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename | |
2593 | else: |
|
2593 | else: | |
2594 | keyfunc = None # sort by filename |
|
2594 | keyfunc = None # sort by filename | |
2595 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): |
|
2595 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | |
2596 | if showdate: |
|
2596 | if showdate: | |
2597 | if ent[3] == -1: |
|
2597 | if ent[3] == -1: | |
2598 | # Pad or slice to locale representation |
|
2598 | # Pad or slice to locale representation | |
2599 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2599 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", | |
2600 | time.localtime(0))) |
|
2600 | time.localtime(0))) | |
2601 | timestr = 'unset' |
|
2601 | timestr = 'unset' | |
2602 | timestr = (timestr[:locale_len] + |
|
2602 | timestr = (timestr[:locale_len] + | |
2603 | ' ' * (locale_len - len(timestr))) |
|
2603 | ' ' * (locale_len - len(timestr))) | |
2604 | else: |
|
2604 | else: | |
2605 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2605 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", | |
2606 | time.localtime(ent[3])) |
|
2606 | time.localtime(ent[3])) | |
2607 | if ent[1] & 020000: |
|
2607 | if ent[1] & 020000: | |
2608 | mode = 'lnk' |
|
2608 | mode = 'lnk' | |
2609 | else: |
|
2609 | else: | |
2610 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) |
|
2610 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) | |
2611 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
2611 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) | |
2612 | for f in repo.dirstate.copies(): |
|
2612 | for f in repo.dirstate.copies(): | |
2613 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
2613 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | |
2614 |
|
2614 | |||
2615 | @command('debugsub', |
|
2615 | @command('debugsub', | |
2616 | [('r', 'rev', '', |
|
2616 | [('r', 'rev', '', | |
2617 | _('revision to check'), _('REV'))], |
|
2617 | _('revision to check'), _('REV'))], | |
2618 | _('[-r REV] [REV]')) |
|
2618 | _('[-r REV] [REV]')) | |
2619 | def debugsub(ui, repo, rev=None): |
|
2619 | def debugsub(ui, repo, rev=None): | |
2620 | ctx = scmutil.revsingle(repo, rev, None) |
|
2620 | ctx = scmutil.revsingle(repo, rev, None) | |
2621 | for k, v in sorted(ctx.substate.items()): |
|
2621 | for k, v in sorted(ctx.substate.items()): | |
2622 | ui.write(('path %s\n') % k) |
|
2622 | ui.write(('path %s\n') % k) | |
2623 | ui.write((' source %s\n') % v[0]) |
|
2623 | ui.write((' source %s\n') % v[0]) | |
2624 | ui.write((' revision %s\n') % v[1]) |
|
2624 | ui.write((' revision %s\n') % v[1]) | |
2625 |
|
2625 | |||
2626 | @command('debugsuccessorssets', |
|
2626 | @command('debugsuccessorssets', | |
2627 | [], |
|
2627 | [], | |
2628 | _('[REV]')) |
|
2628 | _('[REV]')) | |
2629 | def debugsuccessorssets(ui, repo, *revs): |
|
2629 | def debugsuccessorssets(ui, repo, *revs): | |
2630 | """show set of successors for revision |
|
2630 | """show set of successors for revision | |
2631 |
|
2631 | |||
2632 | A successors set of changeset A is a consistent group of revisions that |
|
2632 | A successors set of changeset A is a consistent group of revisions that | |
2633 | succeed A. It contains non-obsolete changesets only. |
|
2633 | succeed A. It contains non-obsolete changesets only. | |
2634 |
|
2634 | |||
2635 | In most cases a changeset A has a single successors set containing a single |
|
2635 | In most cases a changeset A has a single successors set containing a single | |
2636 | successor (changeset A replaced by A'). |
|
2636 | successor (changeset A replaced by A'). | |
2637 |
|
2637 | |||
2638 | A changeset that is made obsolete with no successors are called "pruned". |
|
2638 | A changeset that is made obsolete with no successors are called "pruned". | |
2639 | Such changesets have no successors sets at all. |
|
2639 | Such changesets have no successors sets at all. | |
2640 |
|
2640 | |||
2641 | A changeset that has been "split" will have a successors set containing |
|
2641 | A changeset that has been "split" will have a successors set containing | |
2642 | more than one successor. |
|
2642 | more than one successor. | |
2643 |
|
2643 | |||
2644 | A changeset that has been rewritten in multiple different ways is called |
|
2644 | A changeset that has been rewritten in multiple different ways is called | |
2645 | "divergent". Such changesets have multiple successor sets (each of which |
|
2645 | "divergent". Such changesets have multiple successor sets (each of which | |
2646 | may also be split, i.e. have multiple successors). |
|
2646 | may also be split, i.e. have multiple successors). | |
2647 |
|
2647 | |||
2648 | Results are displayed as follows:: |
|
2648 | Results are displayed as follows:: | |
2649 |
|
2649 | |||
2650 | <rev1> |
|
2650 | <rev1> | |
2651 | <successors-1A> |
|
2651 | <successors-1A> | |
2652 | <rev2> |
|
2652 | <rev2> | |
2653 | <successors-2A> |
|
2653 | <successors-2A> | |
2654 | <successors-2B1> <successors-2B2> <successors-2B3> |
|
2654 | <successors-2B1> <successors-2B2> <successors-2B3> | |
2655 |
|
2655 | |||
2656 | Here rev2 has two possible (i.e. divergent) successors sets. The first |
|
2656 | Here rev2 has two possible (i.e. divergent) successors sets. The first | |
2657 | holds one element, whereas the second holds three (i.e. the changeset has |
|
2657 | holds one element, whereas the second holds three (i.e. the changeset has | |
2658 | been split). |
|
2658 | been split). | |
2659 | """ |
|
2659 | """ | |
2660 | # passed to successorssets caching computation from one call to another |
|
2660 | # passed to successorssets caching computation from one call to another | |
2661 | cache = {} |
|
2661 | cache = {} | |
2662 | ctx2str = str |
|
2662 | ctx2str = str | |
2663 | node2str = short |
|
2663 | node2str = short | |
2664 | if ui.debug(): |
|
2664 | if ui.debug(): | |
2665 | def ctx2str(ctx): |
|
2665 | def ctx2str(ctx): | |
2666 | return ctx.hex() |
|
2666 | return ctx.hex() | |
2667 | node2str = hex |
|
2667 | node2str = hex | |
2668 | for rev in scmutil.revrange(repo, revs): |
|
2668 | for rev in scmutil.revrange(repo, revs): | |
2669 | ctx = repo[rev] |
|
2669 | ctx = repo[rev] | |
2670 | ui.write('%s\n'% ctx2str(ctx)) |
|
2670 | ui.write('%s\n'% ctx2str(ctx)) | |
2671 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): |
|
2671 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): | |
2672 | if succsset: |
|
2672 | if succsset: | |
2673 | ui.write(' ') |
|
2673 | ui.write(' ') | |
2674 | ui.write(node2str(succsset[0])) |
|
2674 | ui.write(node2str(succsset[0])) | |
2675 | for node in succsset[1:]: |
|
2675 | for node in succsset[1:]: | |
2676 | ui.write(' ') |
|
2676 | ui.write(' ') | |
2677 | ui.write(node2str(node)) |
|
2677 | ui.write(node2str(node)) | |
2678 | ui.write('\n') |
|
2678 | ui.write('\n') | |
2679 |
|
2679 | |||
2680 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) |
|
2680 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) | |
2681 | def debugwalk(ui, repo, *pats, **opts): |
|
2681 | def debugwalk(ui, repo, *pats, **opts): | |
2682 | """show how files match on given patterns""" |
|
2682 | """show how files match on given patterns""" | |
2683 | m = scmutil.match(repo[None], pats, opts) |
|
2683 | m = scmutil.match(repo[None], pats, opts) | |
2684 | items = list(repo.walk(m)) |
|
2684 | items = list(repo.walk(m)) | |
2685 | if not items: |
|
2685 | if not items: | |
2686 | return |
|
2686 | return | |
2687 | f = lambda fn: fn |
|
2687 | f = lambda fn: fn | |
2688 | if ui.configbool('ui', 'slash') and os.sep != '/': |
|
2688 | if ui.configbool('ui', 'slash') and os.sep != '/': | |
2689 | f = lambda fn: util.normpath(fn) |
|
2689 | f = lambda fn: util.normpath(fn) | |
2690 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
2690 | fmt = 'f %%-%ds %%-%ds %%s' % ( | |
2691 | max([len(abs) for abs in items]), |
|
2691 | max([len(abs) for abs in items]), | |
2692 | max([len(m.rel(abs)) for abs in items])) |
|
2692 | max([len(m.rel(abs)) for abs in items])) | |
2693 | for abs in items: |
|
2693 | for abs in items: | |
2694 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') |
|
2694 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') | |
2695 | ui.write("%s\n" % line.rstrip()) |
|
2695 | ui.write("%s\n" % line.rstrip()) | |
2696 |
|
2696 | |||
2697 | @command('debugwireargs', |
|
2697 | @command('debugwireargs', | |
2698 | [('', 'three', '', 'three'), |
|
2698 | [('', 'three', '', 'three'), | |
2699 | ('', 'four', '', 'four'), |
|
2699 | ('', 'four', '', 'four'), | |
2700 | ('', 'five', '', 'five'), |
|
2700 | ('', 'five', '', 'five'), | |
2701 | ] + remoteopts, |
|
2701 | ] + remoteopts, | |
2702 | _('REPO [OPTIONS]... [ONE [TWO]]')) |
|
2702 | _('REPO [OPTIONS]... [ONE [TWO]]')) | |
2703 | def debugwireargs(ui, repopath, *vals, **opts): |
|
2703 | def debugwireargs(ui, repopath, *vals, **opts): | |
2704 | repo = hg.peer(ui, opts, repopath) |
|
2704 | repo = hg.peer(ui, opts, repopath) | |
2705 | for opt in remoteopts: |
|
2705 | for opt in remoteopts: | |
2706 | del opts[opt[1]] |
|
2706 | del opts[opt[1]] | |
2707 | args = {} |
|
2707 | args = {} | |
2708 | for k, v in opts.iteritems(): |
|
2708 | for k, v in opts.iteritems(): | |
2709 | if v: |
|
2709 | if v: | |
2710 | args[k] = v |
|
2710 | args[k] = v | |
2711 | # run twice to check that we don't mess up the stream for the next command |
|
2711 | # run twice to check that we don't mess up the stream for the next command | |
2712 | res1 = repo.debugwireargs(*vals, **args) |
|
2712 | res1 = repo.debugwireargs(*vals, **args) | |
2713 | res2 = repo.debugwireargs(*vals, **args) |
|
2713 | res2 = repo.debugwireargs(*vals, **args) | |
2714 | ui.write("%s\n" % res1) |
|
2714 | ui.write("%s\n" % res1) | |
2715 | if res1 != res2: |
|
2715 | if res1 != res2: | |
2716 | ui.warn("%s\n" % res2) |
|
2716 | ui.warn("%s\n" % res2) | |
2717 |
|
2717 | |||
2718 | @command('^diff', |
|
2718 | @command('^diff', | |
2719 | [('r', 'rev', [], _('revision'), _('REV')), |
|
2719 | [('r', 'rev', [], _('revision'), _('REV')), | |
2720 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
2720 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
2721 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
2721 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
2722 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) |
|
2722 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) | |
2723 | def diff(ui, repo, *pats, **opts): |
|
2723 | def diff(ui, repo, *pats, **opts): | |
2724 | """diff repository (or selected files) |
|
2724 | """diff repository (or selected files) | |
2725 |
|
2725 | |||
2726 | Show differences between revisions for the specified files. |
|
2726 | Show differences between revisions for the specified files. | |
2727 |
|
2727 | |||
2728 | Differences between files are shown using the unified diff format. |
|
2728 | Differences between files are shown using the unified diff format. | |
2729 |
|
2729 | |||
2730 | .. note:: |
|
2730 | .. note:: | |
2731 |
|
2731 | |||
2732 | diff may generate unexpected results for merges, as it will |
|
2732 | diff may generate unexpected results for merges, as it will | |
2733 | default to comparing against the working directory's first |
|
2733 | default to comparing against the working directory's first | |
2734 | parent changeset if no revisions are specified. |
|
2734 | parent changeset if no revisions are specified. | |
2735 |
|
2735 | |||
2736 | When two revision arguments are given, then changes are shown |
|
2736 | When two revision arguments are given, then changes are shown | |
2737 | between those revisions. If only one revision is specified then |
|
2737 | between those revisions. If only one revision is specified then | |
2738 | that revision is compared to the working directory, and, when no |
|
2738 | that revision is compared to the working directory, and, when no | |
2739 | revisions are specified, the working directory files are compared |
|
2739 | revisions are specified, the working directory files are compared | |
2740 | to its parent. |
|
2740 | to its parent. | |
2741 |
|
2741 | |||
2742 | Alternatively you can specify -c/--change with a revision to see |
|
2742 | Alternatively you can specify -c/--change with a revision to see | |
2743 | the changes in that changeset relative to its first parent. |
|
2743 | the changes in that changeset relative to its first parent. | |
2744 |
|
2744 | |||
2745 | Without the -a/--text option, diff will avoid generating diffs of |
|
2745 | Without the -a/--text option, diff will avoid generating diffs of | |
2746 | files it detects as binary. With -a, diff will generate a diff |
|
2746 | files it detects as binary. With -a, diff will generate a diff | |
2747 | anyway, probably with undesirable results. |
|
2747 | anyway, probably with undesirable results. | |
2748 |
|
2748 | |||
2749 | Use the -g/--git option to generate diffs in the git extended diff |
|
2749 | Use the -g/--git option to generate diffs in the git extended diff | |
2750 | format. For more information, read :hg:`help diffs`. |
|
2750 | format. For more information, read :hg:`help diffs`. | |
2751 |
|
2751 | |||
2752 | .. container:: verbose |
|
2752 | .. container:: verbose | |
2753 |
|
2753 | |||
2754 | Examples: |
|
2754 | Examples: | |
2755 |
|
2755 | |||
2756 | - compare a file in the current working directory to its parent:: |
|
2756 | - compare a file in the current working directory to its parent:: | |
2757 |
|
2757 | |||
2758 | hg diff foo.c |
|
2758 | hg diff foo.c | |
2759 |
|
2759 | |||
2760 | - compare two historical versions of a directory, with rename info:: |
|
2760 | - compare two historical versions of a directory, with rename info:: | |
2761 |
|
2761 | |||
2762 | hg diff --git -r 1.0:1.2 lib/ |
|
2762 | hg diff --git -r 1.0:1.2 lib/ | |
2763 |
|
2763 | |||
2764 | - get change stats relative to the last change on some date:: |
|
2764 | - get change stats relative to the last change on some date:: | |
2765 |
|
2765 | |||
2766 | hg diff --stat -r "date('may 2')" |
|
2766 | hg diff --stat -r "date('may 2')" | |
2767 |
|
2767 | |||
2768 | - diff all newly-added files that contain a keyword:: |
|
2768 | - diff all newly-added files that contain a keyword:: | |
2769 |
|
2769 | |||
2770 | hg diff "set:added() and grep(GNU)" |
|
2770 | hg diff "set:added() and grep(GNU)" | |
2771 |
|
2771 | |||
2772 | - compare a revision and its parents:: |
|
2772 | - compare a revision and its parents:: | |
2773 |
|
2773 | |||
2774 | hg diff -c 9353 # compare against first parent |
|
2774 | hg diff -c 9353 # compare against first parent | |
2775 | hg diff -r 9353^:9353 # same using revset syntax |
|
2775 | hg diff -r 9353^:9353 # same using revset syntax | |
2776 | hg diff -r 9353^2:9353 # compare against the second parent |
|
2776 | hg diff -r 9353^2:9353 # compare against the second parent | |
2777 |
|
2777 | |||
2778 | Returns 0 on success. |
|
2778 | Returns 0 on success. | |
2779 | """ |
|
2779 | """ | |
2780 |
|
2780 | |||
2781 | revs = opts.get('rev') |
|
2781 | revs = opts.get('rev') | |
2782 | change = opts.get('change') |
|
2782 | change = opts.get('change') | |
2783 | stat = opts.get('stat') |
|
2783 | stat = opts.get('stat') | |
2784 | reverse = opts.get('reverse') |
|
2784 | reverse = opts.get('reverse') | |
2785 |
|
2785 | |||
2786 | if revs and change: |
|
2786 | if revs and change: | |
2787 | msg = _('cannot specify --rev and --change at the same time') |
|
2787 | msg = _('cannot specify --rev and --change at the same time') | |
2788 | raise util.Abort(msg) |
|
2788 | raise util.Abort(msg) | |
2789 | elif change: |
|
2789 | elif change: | |
2790 | node2 = scmutil.revsingle(repo, change, None).node() |
|
2790 | node2 = scmutil.revsingle(repo, change, None).node() | |
2791 | node1 = repo[node2].p1().node() |
|
2791 | node1 = repo[node2].p1().node() | |
2792 | else: |
|
2792 | else: | |
2793 | node1, node2 = scmutil.revpair(repo, revs) |
|
2793 | node1, node2 = scmutil.revpair(repo, revs) | |
2794 |
|
2794 | |||
2795 | if reverse: |
|
2795 | if reverse: | |
2796 | node1, node2 = node2, node1 |
|
2796 | node1, node2 = node2, node1 | |
2797 |
|
2797 | |||
2798 | diffopts = patch.diffopts(ui, opts) |
|
2798 | diffopts = patch.diffopts(ui, opts) | |
2799 | m = scmutil.match(repo[node2], pats, opts) |
|
2799 | m = scmutil.match(repo[node2], pats, opts) | |
2800 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
2800 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
2801 | listsubrepos=opts.get('subrepos')) |
|
2801 | listsubrepos=opts.get('subrepos')) | |
2802 |
|
2802 | |||
2803 | @command('^export', |
|
2803 | @command('^export', | |
2804 | [('o', 'output', '', |
|
2804 | [('o', 'output', '', | |
2805 | _('print output to file with formatted name'), _('FORMAT')), |
|
2805 | _('print output to file with formatted name'), _('FORMAT')), | |
2806 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
2806 | ('', 'switch-parent', None, _('diff against the second parent')), | |
2807 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
2807 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
2808 | ] + diffopts, |
|
2808 | ] + diffopts, | |
2809 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) |
|
2809 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) | |
2810 | def export(ui, repo, *changesets, **opts): |
|
2810 | def export(ui, repo, *changesets, **opts): | |
2811 | """dump the header and diffs for one or more changesets |
|
2811 | """dump the header and diffs for one or more changesets | |
2812 |
|
2812 | |||
2813 | Print the changeset header and diffs for one or more revisions. |
|
2813 | Print the changeset header and diffs for one or more revisions. | |
2814 | If no revision is given, the parent of the working directory is used. |
|
2814 | If no revision is given, the parent of the working directory is used. | |
2815 |
|
2815 | |||
2816 | The information shown in the changeset header is: author, date, |
|
2816 | The information shown in the changeset header is: author, date, | |
2817 | branch name (if non-default), changeset hash, parent(s) and commit |
|
2817 | branch name (if non-default), changeset hash, parent(s) and commit | |
2818 | comment. |
|
2818 | comment. | |
2819 |
|
2819 | |||
2820 | .. note:: |
|
2820 | .. note:: | |
2821 |
|
2821 | |||
2822 | export may generate unexpected diff output for merge |
|
2822 | export may generate unexpected diff output for merge | |
2823 | changesets, as it will compare the merge changeset against its |
|
2823 | changesets, as it will compare the merge changeset against its | |
2824 | first parent only. |
|
2824 | first parent only. | |
2825 |
|
2825 | |||
2826 | Output may be to a file, in which case the name of the file is |
|
2826 | Output may be to a file, in which case the name of the file is | |
2827 | given using a format string. The formatting rules are as follows: |
|
2827 | given using a format string. The formatting rules are as follows: | |
2828 |
|
2828 | |||
2829 | :``%%``: literal "%" character |
|
2829 | :``%%``: literal "%" character | |
2830 | :``%H``: changeset hash (40 hexadecimal digits) |
|
2830 | :``%H``: changeset hash (40 hexadecimal digits) | |
2831 | :``%N``: number of patches being generated |
|
2831 | :``%N``: number of patches being generated | |
2832 | :``%R``: changeset revision number |
|
2832 | :``%R``: changeset revision number | |
2833 | :``%b``: basename of the exporting repository |
|
2833 | :``%b``: basename of the exporting repository | |
2834 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
2834 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
2835 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
2835 | :``%m``: first line of the commit message (only alphanumeric characters) | |
2836 | :``%n``: zero-padded sequence number, starting at 1 |
|
2836 | :``%n``: zero-padded sequence number, starting at 1 | |
2837 | :``%r``: zero-padded changeset revision number |
|
2837 | :``%r``: zero-padded changeset revision number | |
2838 |
|
2838 | |||
2839 | Without the -a/--text option, export will avoid generating diffs |
|
2839 | Without the -a/--text option, export will avoid generating diffs | |
2840 | of files it detects as binary. With -a, export will generate a |
|
2840 | of files it detects as binary. With -a, export will generate a | |
2841 | diff anyway, probably with undesirable results. |
|
2841 | diff anyway, probably with undesirable results. | |
2842 |
|
2842 | |||
2843 | Use the -g/--git option to generate diffs in the git extended diff |
|
2843 | Use the -g/--git option to generate diffs in the git extended diff | |
2844 | format. See :hg:`help diffs` for more information. |
|
2844 | format. See :hg:`help diffs` for more information. | |
2845 |
|
2845 | |||
2846 | With the --switch-parent option, the diff will be against the |
|
2846 | With the --switch-parent option, the diff will be against the | |
2847 | second parent. It can be useful to review a merge. |
|
2847 | second parent. It can be useful to review a merge. | |
2848 |
|
2848 | |||
2849 | .. container:: verbose |
|
2849 | .. container:: verbose | |
2850 |
|
2850 | |||
2851 | Examples: |
|
2851 | Examples: | |
2852 |
|
2852 | |||
2853 | - use export and import to transplant a bugfix to the current |
|
2853 | - use export and import to transplant a bugfix to the current | |
2854 | branch:: |
|
2854 | branch:: | |
2855 |
|
2855 | |||
2856 | hg export -r 9353 | hg import - |
|
2856 | hg export -r 9353 | hg import - | |
2857 |
|
2857 | |||
2858 | - export all the changesets between two revisions to a file with |
|
2858 | - export all the changesets between two revisions to a file with | |
2859 | rename information:: |
|
2859 | rename information:: | |
2860 |
|
2860 | |||
2861 | hg export --git -r 123:150 > changes.txt |
|
2861 | hg export --git -r 123:150 > changes.txt | |
2862 |
|
2862 | |||
2863 | - split outgoing changes into a series of patches with |
|
2863 | - split outgoing changes into a series of patches with | |
2864 | descriptive names:: |
|
2864 | descriptive names:: | |
2865 |
|
2865 | |||
2866 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
2866 | hg export -r "outgoing()" -o "%n-%m.patch" | |
2867 |
|
2867 | |||
2868 | Returns 0 on success. |
|
2868 | Returns 0 on success. | |
2869 | """ |
|
2869 | """ | |
2870 | changesets += tuple(opts.get('rev', [])) |
|
2870 | changesets += tuple(opts.get('rev', [])) | |
2871 | if not changesets: |
|
2871 | if not changesets: | |
2872 | changesets = ['.'] |
|
2872 | changesets = ['.'] | |
2873 | revs = scmutil.revrange(repo, changesets) |
|
2873 | revs = scmutil.revrange(repo, changesets) | |
2874 | if not revs: |
|
2874 | if not revs: | |
2875 | raise util.Abort(_("export requires at least one changeset")) |
|
2875 | raise util.Abort(_("export requires at least one changeset")) | |
2876 | if len(revs) > 1: |
|
2876 | if len(revs) > 1: | |
2877 | ui.note(_('exporting patches:\n')) |
|
2877 | ui.note(_('exporting patches:\n')) | |
2878 | else: |
|
2878 | else: | |
2879 | ui.note(_('exporting patch:\n')) |
|
2879 | ui.note(_('exporting patch:\n')) | |
2880 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
2880 | cmdutil.export(repo, revs, template=opts.get('output'), | |
2881 | switch_parent=opts.get('switch_parent'), |
|
2881 | switch_parent=opts.get('switch_parent'), | |
2882 | opts=patch.diffopts(ui, opts)) |
|
2882 | opts=patch.diffopts(ui, opts)) | |
2883 |
|
2883 | |||
2884 | @command('^forget', walkopts, _('[OPTION]... FILE...')) |
|
2884 | @command('^forget', walkopts, _('[OPTION]... FILE...')) | |
2885 | def forget(ui, repo, *pats, **opts): |
|
2885 | def forget(ui, repo, *pats, **opts): | |
2886 | """forget the specified files on the next commit |
|
2886 | """forget the specified files on the next commit | |
2887 |
|
2887 | |||
2888 | Mark the specified files so they will no longer be tracked |
|
2888 | Mark the specified files so they will no longer be tracked | |
2889 | after the next commit. |
|
2889 | after the next commit. | |
2890 |
|
2890 | |||
2891 | This only removes files from the current branch, not from the |
|
2891 | This only removes files from the current branch, not from the | |
2892 | entire project history, and it does not delete them from the |
|
2892 | entire project history, and it does not delete them from the | |
2893 | working directory. |
|
2893 | working directory. | |
2894 |
|
2894 | |||
2895 | To undo a forget before the next commit, see :hg:`add`. |
|
2895 | To undo a forget before the next commit, see :hg:`add`. | |
2896 |
|
2896 | |||
2897 | .. container:: verbose |
|
2897 | .. container:: verbose | |
2898 |
|
2898 | |||
2899 | Examples: |
|
2899 | Examples: | |
2900 |
|
2900 | |||
2901 | - forget newly-added binary files:: |
|
2901 | - forget newly-added binary files:: | |
2902 |
|
2902 | |||
2903 | hg forget "set:added() and binary()" |
|
2903 | hg forget "set:added() and binary()" | |
2904 |
|
2904 | |||
2905 | - forget files that would be excluded by .hgignore:: |
|
2905 | - forget files that would be excluded by .hgignore:: | |
2906 |
|
2906 | |||
2907 | hg forget "set:hgignore()" |
|
2907 | hg forget "set:hgignore()" | |
2908 |
|
2908 | |||
2909 | Returns 0 on success. |
|
2909 | Returns 0 on success. | |
2910 | """ |
|
2910 | """ | |
2911 |
|
2911 | |||
2912 | if not pats: |
|
2912 | if not pats: | |
2913 | raise util.Abort(_('no files specified')) |
|
2913 | raise util.Abort(_('no files specified')) | |
2914 |
|
2914 | |||
2915 | m = scmutil.match(repo[None], pats, opts) |
|
2915 | m = scmutil.match(repo[None], pats, opts) | |
2916 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
2916 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] | |
2917 | return rejected and 1 or 0 |
|
2917 | return rejected and 1 or 0 | |
2918 |
|
2918 | |||
2919 | @command( |
|
2919 | @command( | |
2920 | 'graft', |
|
2920 | 'graft', | |
2921 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
2921 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
2922 | ('c', 'continue', False, _('resume interrupted graft')), |
|
2922 | ('c', 'continue', False, _('resume interrupted graft')), | |
2923 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2923 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2924 | ('', 'log', None, _('append graft info to log message')), |
|
2924 | ('', 'log', None, _('append graft info to log message')), | |
2925 | ('D', 'currentdate', False, |
|
2925 | ('D', 'currentdate', False, | |
2926 | _('record the current date as commit date')), |
|
2926 | _('record the current date as commit date')), | |
2927 | ('U', 'currentuser', False, |
|
2927 | ('U', 'currentuser', False, | |
2928 | _('record the current user as committer'), _('DATE'))] |
|
2928 | _('record the current user as committer'), _('DATE'))] | |
2929 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2929 | + commitopts2 + mergetoolopts + dryrunopts, | |
2930 | _('[OPTION]... [-r] REV...')) |
|
2930 | _('[OPTION]... [-r] REV...')) | |
2931 | def graft(ui, repo, *revs, **opts): |
|
2931 | def graft(ui, repo, *revs, **opts): | |
2932 | '''copy changes from other branches onto the current branch |
|
2932 | '''copy changes from other branches onto the current branch | |
2933 |
|
2933 | |||
2934 | This command uses Mercurial's merge logic to copy individual |
|
2934 | This command uses Mercurial's merge logic to copy individual | |
2935 | changes from other branches without merging branches in the |
|
2935 | changes from other branches without merging branches in the | |
2936 | history graph. This is sometimes known as 'backporting' or |
|
2936 | history graph. This is sometimes known as 'backporting' or | |
2937 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2937 | 'cherry-picking'. By default, graft will copy user, date, and | |
2938 | description from the source changesets. |
|
2938 | description from the source changesets. | |
2939 |
|
2939 | |||
2940 | Changesets that are ancestors of the current revision, that have |
|
2940 | Changesets that are ancestors of the current revision, that have | |
2941 | already been grafted, or that are merges will be skipped. |
|
2941 | already been grafted, or that are merges will be skipped. | |
2942 |
|
2942 | |||
2943 | If --log is specified, log messages will have a comment appended |
|
2943 | If --log is specified, log messages will have a comment appended | |
2944 | of the form:: |
|
2944 | of the form:: | |
2945 |
|
2945 | |||
2946 | (grafted from CHANGESETHASH) |
|
2946 | (grafted from CHANGESETHASH) | |
2947 |
|
2947 | |||
2948 | If a graft merge results in conflicts, the graft process is |
|
2948 | If a graft merge results in conflicts, the graft process is | |
2949 | interrupted so that the current merge can be manually resolved. |
|
2949 | interrupted so that the current merge can be manually resolved. | |
2950 | Once all conflicts are addressed, the graft process can be |
|
2950 | Once all conflicts are addressed, the graft process can be | |
2951 | continued with the -c/--continue option. |
|
2951 | continued with the -c/--continue option. | |
2952 |
|
2952 | |||
2953 | .. note:: |
|
2953 | .. note:: | |
2954 |
|
2954 | |||
2955 | The -c/--continue option does not reapply earlier options. |
|
2955 | The -c/--continue option does not reapply earlier options. | |
2956 |
|
2956 | |||
2957 | .. container:: verbose |
|
2957 | .. container:: verbose | |
2958 |
|
2958 | |||
2959 | Examples: |
|
2959 | Examples: | |
2960 |
|
2960 | |||
2961 | - copy a single change to the stable branch and edit its description:: |
|
2961 | - copy a single change to the stable branch and edit its description:: | |
2962 |
|
2962 | |||
2963 | hg update stable |
|
2963 | hg update stable | |
2964 | hg graft --edit 9393 |
|
2964 | hg graft --edit 9393 | |
2965 |
|
2965 | |||
2966 | - graft a range of changesets with one exception, updating dates:: |
|
2966 | - graft a range of changesets with one exception, updating dates:: | |
2967 |
|
2967 | |||
2968 | hg graft -D "2085::2093 and not 2091" |
|
2968 | hg graft -D "2085::2093 and not 2091" | |
2969 |
|
2969 | |||
2970 | - continue a graft after resolving conflicts:: |
|
2970 | - continue a graft after resolving conflicts:: | |
2971 |
|
2971 | |||
2972 | hg graft -c |
|
2972 | hg graft -c | |
2973 |
|
2973 | |||
2974 | - show the source of a grafted changeset:: |
|
2974 | - show the source of a grafted changeset:: | |
2975 |
|
2975 | |||
2976 | hg log --debug -r . |
|
2976 | hg log --debug -r . | |
2977 |
|
2977 | |||
2978 | Returns 0 on successful completion. |
|
2978 | Returns 0 on successful completion. | |
2979 | ''' |
|
2979 | ''' | |
2980 |
|
2980 | |||
2981 | revs = list(revs) |
|
2981 | revs = list(revs) | |
2982 | revs.extend(opts['rev']) |
|
2982 | revs.extend(opts['rev']) | |
2983 |
|
2983 | |||
2984 | if not opts.get('user') and opts.get('currentuser'): |
|
2984 | if not opts.get('user') and opts.get('currentuser'): | |
2985 | opts['user'] = ui.username() |
|
2985 | opts['user'] = ui.username() | |
2986 | if not opts.get('date') and opts.get('currentdate'): |
|
2986 | if not opts.get('date') and opts.get('currentdate'): | |
2987 | opts['date'] = "%d %d" % util.makedate() |
|
2987 | opts['date'] = "%d %d" % util.makedate() | |
2988 |
|
2988 | |||
2989 | editor = None |
|
2989 | editor = None | |
2990 | if opts.get('edit'): |
|
2990 | if opts.get('edit'): | |
2991 | editor = cmdutil.commitforceeditor |
|
2991 | editor = cmdutil.commitforceeditor | |
2992 |
|
2992 | |||
2993 | cont = False |
|
2993 | cont = False | |
2994 | if opts['continue']: |
|
2994 | if opts['continue']: | |
2995 | cont = True |
|
2995 | cont = True | |
2996 | if revs: |
|
2996 | if revs: | |
2997 | raise util.Abort(_("can't specify --continue and revisions")) |
|
2997 | raise util.Abort(_("can't specify --continue and revisions")) | |
2998 | # read in unfinished revisions |
|
2998 | # read in unfinished revisions | |
2999 | try: |
|
2999 | try: | |
3000 | nodes = repo.opener.read('graftstate').splitlines() |
|
3000 | nodes = repo.opener.read('graftstate').splitlines() | |
3001 | revs = [repo[node].rev() for node in nodes] |
|
3001 | revs = [repo[node].rev() for node in nodes] | |
3002 | except IOError, inst: |
|
3002 | except IOError, inst: | |
3003 | if inst.errno != errno.ENOENT: |
|
3003 | if inst.errno != errno.ENOENT: | |
3004 | raise |
|
3004 | raise | |
3005 | raise util.Abort(_("no graft state found, can't continue")) |
|
3005 | raise util.Abort(_("no graft state found, can't continue")) | |
3006 | else: |
|
3006 | else: | |
3007 | cmdutil.checkunfinished(repo) |
|
3007 | cmdutil.checkunfinished(repo) | |
3008 | cmdutil.bailifchanged(repo) |
|
3008 | cmdutil.bailifchanged(repo) | |
3009 | if not revs: |
|
3009 | if not revs: | |
3010 | raise util.Abort(_('no revisions specified')) |
|
3010 | raise util.Abort(_('no revisions specified')) | |
3011 | revs = scmutil.revrange(repo, revs) |
|
3011 | revs = scmutil.revrange(repo, revs) | |
3012 |
|
3012 | |||
3013 | # check for merges |
|
3013 | # check for merges | |
3014 | for rev in repo.revs('%ld and merge()', revs): |
|
3014 | for rev in repo.revs('%ld and merge()', revs): | |
3015 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) |
|
3015 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) | |
3016 | revs.remove(rev) |
|
3016 | revs.remove(rev) | |
3017 | if not revs: |
|
3017 | if not revs: | |
3018 | return -1 |
|
3018 | return -1 | |
3019 |
|
3019 | |||
3020 | # check for ancestors of dest branch |
|
3020 | # check for ancestors of dest branch | |
3021 | crev = repo['.'].rev() |
|
3021 | crev = repo['.'].rev() | |
3022 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
3022 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
3023 | # don't mutate while iterating, create a copy |
|
3023 | # don't mutate while iterating, create a copy | |
3024 | for rev in list(revs): |
|
3024 | for rev in list(revs): | |
3025 | if rev in ancestors: |
|
3025 | if rev in ancestors: | |
3026 | ui.warn(_('skipping ancestor revision %s\n') % rev) |
|
3026 | ui.warn(_('skipping ancestor revision %s\n') % rev) | |
3027 | revs.remove(rev) |
|
3027 | revs.remove(rev) | |
3028 | if not revs: |
|
3028 | if not revs: | |
3029 | return -1 |
|
3029 | return -1 | |
3030 |
|
3030 | |||
3031 | # analyze revs for earlier grafts |
|
3031 | # analyze revs for earlier grafts | |
3032 | ids = {} |
|
3032 | ids = {} | |
3033 | for ctx in repo.set("%ld", revs): |
|
3033 | for ctx in repo.set("%ld", revs): | |
3034 | ids[ctx.hex()] = ctx.rev() |
|
3034 | ids[ctx.hex()] = ctx.rev() | |
3035 | n = ctx.extra().get('source') |
|
3035 | n = ctx.extra().get('source') | |
3036 | if n: |
|
3036 | if n: | |
3037 | ids[n] = ctx.rev() |
|
3037 | ids[n] = ctx.rev() | |
3038 |
|
3038 | |||
3039 | # check ancestors for earlier grafts |
|
3039 | # check ancestors for earlier grafts | |
3040 | ui.debug('scanning for duplicate grafts\n') |
|
3040 | ui.debug('scanning for duplicate grafts\n') | |
3041 |
|
3041 | |||
3042 | for rev in repo.changelog.findmissingrevs(revs, [crev]): |
|
3042 | for rev in repo.changelog.findmissingrevs(revs, [crev]): | |
3043 | ctx = repo[rev] |
|
3043 | ctx = repo[rev] | |
3044 | n = ctx.extra().get('source') |
|
3044 | n = ctx.extra().get('source') | |
3045 | if n in ids: |
|
3045 | if n in ids: | |
3046 | r = repo[n].rev() |
|
3046 | r = repo[n].rev() | |
3047 | if r in revs: |
|
3047 | if r in revs: | |
3048 | ui.warn(_('skipping revision %s (already grafted to %s)\n') |
|
3048 | ui.warn(_('skipping revision %s (already grafted to %s)\n') | |
3049 | % (r, rev)) |
|
3049 | % (r, rev)) | |
3050 | revs.remove(r) |
|
3050 | revs.remove(r) | |
3051 | elif ids[n] in revs: |
|
3051 | elif ids[n] in revs: | |
3052 | ui.warn(_('skipping already grafted revision %s ' |
|
3052 | ui.warn(_('skipping already grafted revision %s ' | |
3053 | '(%s also has origin %d)\n') % (ids[n], rev, r)) |
|
3053 | '(%s also has origin %d)\n') % (ids[n], rev, r)) | |
3054 | revs.remove(ids[n]) |
|
3054 | revs.remove(ids[n]) | |
3055 | elif ctx.hex() in ids: |
|
3055 | elif ctx.hex() in ids: | |
3056 | r = ids[ctx.hex()] |
|
3056 | r = ids[ctx.hex()] | |
3057 | ui.warn(_('skipping already grafted revision %s ' |
|
3057 | ui.warn(_('skipping already grafted revision %s ' | |
3058 | '(was grafted from %d)\n') % (r, rev)) |
|
3058 | '(was grafted from %d)\n') % (r, rev)) | |
3059 | revs.remove(r) |
|
3059 | revs.remove(r) | |
3060 | if not revs: |
|
3060 | if not revs: | |
3061 | return -1 |
|
3061 | return -1 | |
3062 |
|
3062 | |||
3063 | wlock = repo.wlock() |
|
3063 | wlock = repo.wlock() | |
3064 | try: |
|
3064 | try: | |
3065 | current = repo['.'] |
|
3065 | current = repo['.'] | |
3066 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
3066 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
3067 |
|
3067 | |||
3068 | ui.status(_('grafting revision %s\n') % ctx.rev()) |
|
3068 | ui.status(_('grafting revision %s\n') % ctx.rev()) | |
3069 | if opts.get('dry_run'): |
|
3069 | if opts.get('dry_run'): | |
3070 | continue |
|
3070 | continue | |
3071 |
|
3071 | |||
3072 | source = ctx.extra().get('source') |
|
3072 | source = ctx.extra().get('source') | |
3073 | if not source: |
|
3073 | if not source: | |
3074 | source = ctx.hex() |
|
3074 | source = ctx.hex() | |
3075 | extra = {'source': source} |
|
3075 | extra = {'source': source} | |
3076 | user = ctx.user() |
|
3076 | user = ctx.user() | |
3077 | if opts.get('user'): |
|
3077 | if opts.get('user'): | |
3078 | user = opts['user'] |
|
3078 | user = opts['user'] | |
3079 | date = ctx.date() |
|
3079 | date = ctx.date() | |
3080 | if opts.get('date'): |
|
3080 | if opts.get('date'): | |
3081 | date = opts['date'] |
|
3081 | date = opts['date'] | |
3082 | message = ctx.description() |
|
3082 | message = ctx.description() | |
3083 | if opts.get('log'): |
|
3083 | if opts.get('log'): | |
3084 | message += '\n(grafted from %s)' % ctx.hex() |
|
3084 | message += '\n(grafted from %s)' % ctx.hex() | |
3085 |
|
3085 | |||
3086 | # we don't merge the first commit when continuing |
|
3086 | # we don't merge the first commit when continuing | |
3087 | if not cont: |
|
3087 | if not cont: | |
3088 | # perform the graft merge with p1(rev) as 'ancestor' |
|
3088 | # perform the graft merge with p1(rev) as 'ancestor' | |
3089 | try: |
|
3089 | try: | |
3090 | # ui.forcemerge is an internal variable, do not document |
|
3090 | # ui.forcemerge is an internal variable, do not document | |
3091 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
3091 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
3092 | stats = mergemod.update(repo, ctx.node(), True, True, False, |
|
3092 | stats = mergemod.update(repo, ctx.node(), True, True, False, | |
3093 | ctx.p1().node()) |
|
3093 | ctx.p1().node()) | |
3094 | finally: |
|
3094 | finally: | |
3095 | repo.ui.setconfig('ui', 'forcemerge', '') |
|
3095 | repo.ui.setconfig('ui', 'forcemerge', '') | |
3096 | # report any conflicts |
|
3096 | # report any conflicts | |
3097 | if stats and stats[3] > 0: |
|
3097 | if stats and stats[3] > 0: | |
3098 | # write out state for --continue |
|
3098 | # write out state for --continue | |
3099 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
3099 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
3100 | repo.opener.write('graftstate', ''.join(nodelines)) |
|
3100 | repo.opener.write('graftstate', ''.join(nodelines)) | |
3101 | raise util.Abort( |
|
3101 | raise util.Abort( | |
3102 | _("unresolved conflicts, can't continue"), |
|
3102 | _("unresolved conflicts, can't continue"), | |
3103 | hint=_('use hg resolve and hg graft --continue')) |
|
3103 | hint=_('use hg resolve and hg graft --continue')) | |
3104 | else: |
|
3104 | else: | |
3105 | cont = False |
|
3105 | cont = False | |
3106 |
|
3106 | |||
3107 | # drop the second merge parent |
|
3107 | # drop the second merge parent | |
3108 | repo.setparents(current.node(), nullid) |
|
3108 | repo.setparents(current.node(), nullid) | |
3109 | repo.dirstate.write() |
|
3109 | repo.dirstate.write() | |
3110 | # fix up dirstate for copies and renames |
|
3110 | # fix up dirstate for copies and renames | |
3111 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) |
|
3111 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) | |
3112 |
|
3112 | |||
3113 | # commit |
|
3113 | # commit | |
3114 | node = repo.commit(text=message, user=user, |
|
3114 | node = repo.commit(text=message, user=user, | |
3115 | date=date, extra=extra, editor=editor) |
|
3115 | date=date, extra=extra, editor=editor) | |
3116 | if node is None: |
|
3116 | if node is None: | |
3117 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) |
|
3117 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) | |
3118 | else: |
|
3118 | else: | |
3119 | current = repo[node] |
|
3119 | current = repo[node] | |
3120 | finally: |
|
3120 | finally: | |
3121 | wlock.release() |
|
3121 | wlock.release() | |
3122 |
|
3122 | |||
3123 | # remove state when we complete successfully |
|
3123 | # remove state when we complete successfully | |
3124 | if not opts.get('dry_run'): |
|
3124 | if not opts.get('dry_run'): | |
3125 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
|
3125 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
3126 |
|
3126 | |||
3127 | return 0 |
|
3127 | return 0 | |
3128 |
|
3128 | |||
3129 | @command('grep', |
|
3129 | @command('grep', | |
3130 | [('0', 'print0', None, _('end fields with NUL')), |
|
3130 | [('0', 'print0', None, _('end fields with NUL')), | |
3131 | ('', 'all', None, _('print all revisions that match')), |
|
3131 | ('', 'all', None, _('print all revisions that match')), | |
3132 | ('a', 'text', None, _('treat all files as text')), |
|
3132 | ('a', 'text', None, _('treat all files as text')), | |
3133 | ('f', 'follow', None, |
|
3133 | ('f', 'follow', None, | |
3134 | _('follow changeset history,' |
|
3134 | _('follow changeset history,' | |
3135 | ' or file history across copies and renames')), |
|
3135 | ' or file history across copies and renames')), | |
3136 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
3136 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
3137 | ('l', 'files-with-matches', None, |
|
3137 | ('l', 'files-with-matches', None, | |
3138 | _('print only filenames and revisions that match')), |
|
3138 | _('print only filenames and revisions that match')), | |
3139 | ('n', 'line-number', None, _('print matching line numbers')), |
|
3139 | ('n', 'line-number', None, _('print matching line numbers')), | |
3140 | ('r', 'rev', [], |
|
3140 | ('r', 'rev', [], | |
3141 | _('only search files changed within revision range'), _('REV')), |
|
3141 | _('only search files changed within revision range'), _('REV')), | |
3142 | ('u', 'user', None, _('list the author (long with -v)')), |
|
3142 | ('u', 'user', None, _('list the author (long with -v)')), | |
3143 | ('d', 'date', None, _('list the date (short with -q)')), |
|
3143 | ('d', 'date', None, _('list the date (short with -q)')), | |
3144 | ] + walkopts, |
|
3144 | ] + walkopts, | |
3145 | _('[OPTION]... PATTERN [FILE]...')) |
|
3145 | _('[OPTION]... PATTERN [FILE]...')) | |
3146 | def grep(ui, repo, pattern, *pats, **opts): |
|
3146 | def grep(ui, repo, pattern, *pats, **opts): | |
3147 | """search for a pattern in specified files and revisions |
|
3147 | """search for a pattern in specified files and revisions | |
3148 |
|
3148 | |||
3149 | Search revisions of files for a regular expression. |
|
3149 | Search revisions of files for a regular expression. | |
3150 |
|
3150 | |||
3151 | This command behaves differently than Unix grep. It only accepts |
|
3151 | This command behaves differently than Unix grep. It only accepts | |
3152 | Python/Perl regexps. It searches repository history, not the |
|
3152 | Python/Perl regexps. It searches repository history, not the | |
3153 | working directory. It always prints the revision number in which a |
|
3153 | working directory. It always prints the revision number in which a | |
3154 | match appears. |
|
3154 | match appears. | |
3155 |
|
3155 | |||
3156 | By default, grep only prints output for the first revision of a |
|
3156 | By default, grep only prints output for the first revision of a | |
3157 | file in which it finds a match. To get it to print every revision |
|
3157 | file in which it finds a match. To get it to print every revision | |
3158 | that contains a change in match status ("-" for a match that |
|
3158 | that contains a change in match status ("-" for a match that | |
3159 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
3159 | becomes a non-match, or "+" for a non-match that becomes a match), | |
3160 | use the --all flag. |
|
3160 | use the --all flag. | |
3161 |
|
3161 | |||
3162 | Returns 0 if a match is found, 1 otherwise. |
|
3162 | Returns 0 if a match is found, 1 otherwise. | |
3163 | """ |
|
3163 | """ | |
3164 | reflags = re.M |
|
3164 | reflags = re.M | |
3165 | if opts.get('ignore_case'): |
|
3165 | if opts.get('ignore_case'): | |
3166 | reflags |= re.I |
|
3166 | reflags |= re.I | |
3167 | try: |
|
3167 | try: | |
3168 | regexp = util.compilere(pattern, reflags) |
|
3168 | regexp = util.compilere(pattern, reflags) | |
3169 | except re.error, inst: |
|
3169 | except re.error, inst: | |
3170 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
3170 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) | |
3171 | return 1 |
|
3171 | return 1 | |
3172 | sep, eol = ':', '\n' |
|
3172 | sep, eol = ':', '\n' | |
3173 | if opts.get('print0'): |
|
3173 | if opts.get('print0'): | |
3174 | sep = eol = '\0' |
|
3174 | sep = eol = '\0' | |
3175 |
|
3175 | |||
3176 | getfile = util.lrucachefunc(repo.file) |
|
3176 | getfile = util.lrucachefunc(repo.file) | |
3177 |
|
3177 | |||
3178 | def matchlines(body): |
|
3178 | def matchlines(body): | |
3179 | begin = 0 |
|
3179 | begin = 0 | |
3180 | linenum = 0 |
|
3180 | linenum = 0 | |
3181 | while begin < len(body): |
|
3181 | while begin < len(body): | |
3182 | match = regexp.search(body, begin) |
|
3182 | match = regexp.search(body, begin) | |
3183 | if not match: |
|
3183 | if not match: | |
3184 | break |
|
3184 | break | |
3185 | mstart, mend = match.span() |
|
3185 | mstart, mend = match.span() | |
3186 | linenum += body.count('\n', begin, mstart) + 1 |
|
3186 | linenum += body.count('\n', begin, mstart) + 1 | |
3187 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
3187 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
3188 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
3188 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
3189 | lend = begin - 1 |
|
3189 | lend = begin - 1 | |
3190 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
3190 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
3191 |
|
3191 | |||
3192 | class linestate(object): |
|
3192 | class linestate(object): | |
3193 | def __init__(self, line, linenum, colstart, colend): |
|
3193 | def __init__(self, line, linenum, colstart, colend): | |
3194 | self.line = line |
|
3194 | self.line = line | |
3195 | self.linenum = linenum |
|
3195 | self.linenum = linenum | |
3196 | self.colstart = colstart |
|
3196 | self.colstart = colstart | |
3197 | self.colend = colend |
|
3197 | self.colend = colend | |
3198 |
|
3198 | |||
3199 | def __hash__(self): |
|
3199 | def __hash__(self): | |
3200 | return hash((self.linenum, self.line)) |
|
3200 | return hash((self.linenum, self.line)) | |
3201 |
|
3201 | |||
3202 | def __eq__(self, other): |
|
3202 | def __eq__(self, other): | |
3203 | return self.line == other.line |
|
3203 | return self.line == other.line | |
3204 |
|
3204 | |||
3205 | matches = {} |
|
3205 | matches = {} | |
3206 | copies = {} |
|
3206 | copies = {} | |
3207 | def grepbody(fn, rev, body): |
|
3207 | def grepbody(fn, rev, body): | |
3208 | matches[rev].setdefault(fn, []) |
|
3208 | matches[rev].setdefault(fn, []) | |
3209 | m = matches[rev][fn] |
|
3209 | m = matches[rev][fn] | |
3210 | for lnum, cstart, cend, line in matchlines(body): |
|
3210 | for lnum, cstart, cend, line in matchlines(body): | |
3211 | s = linestate(line, lnum, cstart, cend) |
|
3211 | s = linestate(line, lnum, cstart, cend) | |
3212 | m.append(s) |
|
3212 | m.append(s) | |
3213 |
|
3213 | |||
3214 | def difflinestates(a, b): |
|
3214 | def difflinestates(a, b): | |
3215 | sm = difflib.SequenceMatcher(None, a, b) |
|
3215 | sm = difflib.SequenceMatcher(None, a, b) | |
3216 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
3216 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
3217 | if tag == 'insert': |
|
3217 | if tag == 'insert': | |
3218 | for i in xrange(blo, bhi): |
|
3218 | for i in xrange(blo, bhi): | |
3219 | yield ('+', b[i]) |
|
3219 | yield ('+', b[i]) | |
3220 | elif tag == 'delete': |
|
3220 | elif tag == 'delete': | |
3221 | for i in xrange(alo, ahi): |
|
3221 | for i in xrange(alo, ahi): | |
3222 | yield ('-', a[i]) |
|
3222 | yield ('-', a[i]) | |
3223 | elif tag == 'replace': |
|
3223 | elif tag == 'replace': | |
3224 | for i in xrange(alo, ahi): |
|
3224 | for i in xrange(alo, ahi): | |
3225 | yield ('-', a[i]) |
|
3225 | yield ('-', a[i]) | |
3226 | for i in xrange(blo, bhi): |
|
3226 | for i in xrange(blo, bhi): | |
3227 | yield ('+', b[i]) |
|
3227 | yield ('+', b[i]) | |
3228 |
|
3228 | |||
3229 | def display(fn, ctx, pstates, states): |
|
3229 | def display(fn, ctx, pstates, states): | |
3230 | rev = ctx.rev() |
|
3230 | rev = ctx.rev() | |
3231 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
3231 | datefunc = ui.quiet and util.shortdate or util.datestr | |
3232 | found = False |
|
3232 | found = False | |
3233 | filerevmatches = {} |
|
3233 | filerevmatches = {} | |
3234 | def binary(): |
|
3234 | def binary(): | |
3235 | flog = getfile(fn) |
|
3235 | flog = getfile(fn) | |
3236 | return util.binary(flog.read(ctx.filenode(fn))) |
|
3236 | return util.binary(flog.read(ctx.filenode(fn))) | |
3237 |
|
3237 | |||
3238 | if opts.get('all'): |
|
3238 | if opts.get('all'): | |
3239 | iter = difflinestates(pstates, states) |
|
3239 | iter = difflinestates(pstates, states) | |
3240 | else: |
|
3240 | else: | |
3241 | iter = [('', l) for l in states] |
|
3241 | iter = [('', l) for l in states] | |
3242 | for change, l in iter: |
|
3242 | for change, l in iter: | |
3243 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] |
|
3243 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] | |
3244 | before, match, after = None, None, None |
|
3244 | before, match, after = None, None, None | |
3245 |
|
3245 | |||
3246 | if opts.get('line_number'): |
|
3246 | if opts.get('line_number'): | |
3247 | cols.append((str(l.linenum), 'grep.linenumber')) |
|
3247 | cols.append((str(l.linenum), 'grep.linenumber')) | |
3248 | if opts.get('all'): |
|
3248 | if opts.get('all'): | |
3249 | cols.append((change, 'grep.change')) |
|
3249 | cols.append((change, 'grep.change')) | |
3250 | if opts.get('user'): |
|
3250 | if opts.get('user'): | |
3251 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) |
|
3251 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) | |
3252 | if opts.get('date'): |
|
3252 | if opts.get('date'): | |
3253 | cols.append((datefunc(ctx.date()), 'grep.date')) |
|
3253 | cols.append((datefunc(ctx.date()), 'grep.date')) | |
3254 | if opts.get('files_with_matches'): |
|
3254 | if opts.get('files_with_matches'): | |
3255 | c = (fn, rev) |
|
3255 | c = (fn, rev) | |
3256 | if c in filerevmatches: |
|
3256 | if c in filerevmatches: | |
3257 | continue |
|
3257 | continue | |
3258 | filerevmatches[c] = 1 |
|
3258 | filerevmatches[c] = 1 | |
3259 | else: |
|
3259 | else: | |
3260 | before = l.line[:l.colstart] |
|
3260 | before = l.line[:l.colstart] | |
3261 | match = l.line[l.colstart:l.colend] |
|
3261 | match = l.line[l.colstart:l.colend] | |
3262 | after = l.line[l.colend:] |
|
3262 | after = l.line[l.colend:] | |
3263 | for col, label in cols[:-1]: |
|
3263 | for col, label in cols[:-1]: | |
3264 | ui.write(col, label=label) |
|
3264 | ui.write(col, label=label) | |
3265 | ui.write(sep, label='grep.sep') |
|
3265 | ui.write(sep, label='grep.sep') | |
3266 | ui.write(cols[-1][0], label=cols[-1][1]) |
|
3266 | ui.write(cols[-1][0], label=cols[-1][1]) | |
3267 | if before is not None: |
|
3267 | if before is not None: | |
3268 | ui.write(sep, label='grep.sep') |
|
3268 | ui.write(sep, label='grep.sep') | |
3269 | if not opts.get('text') and binary(): |
|
3269 | if not opts.get('text') and binary(): | |
3270 | ui.write(" Binary file matches") |
|
3270 | ui.write(" Binary file matches") | |
3271 | else: |
|
3271 | else: | |
3272 | ui.write(before) |
|
3272 | ui.write(before) | |
3273 | ui.write(match, label='grep.match') |
|
3273 | ui.write(match, label='grep.match') | |
3274 | ui.write(after) |
|
3274 | ui.write(after) | |
3275 | ui.write(eol) |
|
3275 | ui.write(eol) | |
3276 | found = True |
|
3276 | found = True | |
3277 | return found |
|
3277 | return found | |
3278 |
|
3278 | |||
3279 | skip = {} |
|
3279 | skip = {} | |
3280 | revfiles = {} |
|
3280 | revfiles = {} | |
3281 | matchfn = scmutil.match(repo[None], pats, opts) |
|
3281 | matchfn = scmutil.match(repo[None], pats, opts) | |
3282 | found = False |
|
3282 | found = False | |
3283 | follow = opts.get('follow') |
|
3283 | follow = opts.get('follow') | |
3284 |
|
3284 | |||
3285 | def prep(ctx, fns): |
|
3285 | def prep(ctx, fns): | |
3286 | rev = ctx.rev() |
|
3286 | rev = ctx.rev() | |
3287 | pctx = ctx.p1() |
|
3287 | pctx = ctx.p1() | |
3288 | parent = pctx.rev() |
|
3288 | parent = pctx.rev() | |
3289 | matches.setdefault(rev, {}) |
|
3289 | matches.setdefault(rev, {}) | |
3290 | matches.setdefault(parent, {}) |
|
3290 | matches.setdefault(parent, {}) | |
3291 | files = revfiles.setdefault(rev, []) |
|
3291 | files = revfiles.setdefault(rev, []) | |
3292 | for fn in fns: |
|
3292 | for fn in fns: | |
3293 | flog = getfile(fn) |
|
3293 | flog = getfile(fn) | |
3294 | try: |
|
3294 | try: | |
3295 | fnode = ctx.filenode(fn) |
|
3295 | fnode = ctx.filenode(fn) | |
3296 | except error.LookupError: |
|
3296 | except error.LookupError: | |
3297 | continue |
|
3297 | continue | |
3298 |
|
3298 | |||
3299 | copied = flog.renamed(fnode) |
|
3299 | copied = flog.renamed(fnode) | |
3300 | copy = follow and copied and copied[0] |
|
3300 | copy = follow and copied and copied[0] | |
3301 | if copy: |
|
3301 | if copy: | |
3302 | copies.setdefault(rev, {})[fn] = copy |
|
3302 | copies.setdefault(rev, {})[fn] = copy | |
3303 | if fn in skip: |
|
3303 | if fn in skip: | |
3304 | if copy: |
|
3304 | if copy: | |
3305 | skip[copy] = True |
|
3305 | skip[copy] = True | |
3306 | continue |
|
3306 | continue | |
3307 | files.append(fn) |
|
3307 | files.append(fn) | |
3308 |
|
3308 | |||
3309 | if fn not in matches[rev]: |
|
3309 | if fn not in matches[rev]: | |
3310 | grepbody(fn, rev, flog.read(fnode)) |
|
3310 | grepbody(fn, rev, flog.read(fnode)) | |
3311 |
|
3311 | |||
3312 | pfn = copy or fn |
|
3312 | pfn = copy or fn | |
3313 | if pfn not in matches[parent]: |
|
3313 | if pfn not in matches[parent]: | |
3314 | try: |
|
3314 | try: | |
3315 | fnode = pctx.filenode(pfn) |
|
3315 | fnode = pctx.filenode(pfn) | |
3316 | grepbody(pfn, parent, flog.read(fnode)) |
|
3316 | grepbody(pfn, parent, flog.read(fnode)) | |
3317 | except error.LookupError: |
|
3317 | except error.LookupError: | |
3318 | pass |
|
3318 | pass | |
3319 |
|
3319 | |||
3320 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
3320 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
3321 | rev = ctx.rev() |
|
3321 | rev = ctx.rev() | |
3322 | parent = ctx.p1().rev() |
|
3322 | parent = ctx.p1().rev() | |
3323 | for fn in sorted(revfiles.get(rev, [])): |
|
3323 | for fn in sorted(revfiles.get(rev, [])): | |
3324 | states = matches[rev][fn] |
|
3324 | states = matches[rev][fn] | |
3325 | copy = copies.get(rev, {}).get(fn) |
|
3325 | copy = copies.get(rev, {}).get(fn) | |
3326 | if fn in skip: |
|
3326 | if fn in skip: | |
3327 | if copy: |
|
3327 | if copy: | |
3328 | skip[copy] = True |
|
3328 | skip[copy] = True | |
3329 | continue |
|
3329 | continue | |
3330 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
3330 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
3331 | if pstates or states: |
|
3331 | if pstates or states: | |
3332 | r = display(fn, ctx, pstates, states) |
|
3332 | r = display(fn, ctx, pstates, states) | |
3333 | found = found or r |
|
3333 | found = found or r | |
3334 | if r and not opts.get('all'): |
|
3334 | if r and not opts.get('all'): | |
3335 | skip[fn] = True |
|
3335 | skip[fn] = True | |
3336 | if copy: |
|
3336 | if copy: | |
3337 | skip[copy] = True |
|
3337 | skip[copy] = True | |
3338 | del matches[rev] |
|
3338 | del matches[rev] | |
3339 | del revfiles[rev] |
|
3339 | del revfiles[rev] | |
3340 |
|
3340 | |||
3341 | return not found |
|
3341 | return not found | |
3342 |
|
3342 | |||
3343 | @command('heads', |
|
3343 | @command('heads', | |
3344 | [('r', 'rev', '', |
|
3344 | [('r', 'rev', '', | |
3345 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
3345 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
3346 | ('t', 'topo', False, _('show topological heads only')), |
|
3346 | ('t', 'topo', False, _('show topological heads only')), | |
3347 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
3347 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
3348 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
3348 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
3349 | ] + templateopts, |
|
3349 | ] + templateopts, | |
3350 | _('[-ct] [-r STARTREV] [REV]...')) |
|
3350 | _('[-ct] [-r STARTREV] [REV]...')) | |
3351 | def heads(ui, repo, *branchrevs, **opts): |
|
3351 | def heads(ui, repo, *branchrevs, **opts): | |
3352 | """show branch heads |
|
3352 | """show branch heads | |
3353 |
|
3353 | |||
3354 | With no arguments, show all open branch heads in the repository. |
|
3354 | With no arguments, show all open branch heads in the repository. | |
3355 | Branch heads are changesets that have no descendants on the |
|
3355 | Branch heads are changesets that have no descendants on the | |
3356 | same branch. They are where development generally takes place and |
|
3356 | same branch. They are where development generally takes place and | |
3357 | are the usual targets for update and merge operations. |
|
3357 | are the usual targets for update and merge operations. | |
3358 |
|
3358 | |||
3359 | If one or more REVs are given, only open branch heads on the |
|
3359 | If one or more REVs are given, only open branch heads on the | |
3360 | branches associated with the specified changesets are shown. This |
|
3360 | branches associated with the specified changesets are shown. This | |
3361 | means that you can use :hg:`heads .` to see the heads on the |
|
3361 | means that you can use :hg:`heads .` to see the heads on the | |
3362 | currently checked-out branch. |
|
3362 | currently checked-out branch. | |
3363 |
|
3363 | |||
3364 | If -c/--closed is specified, also show branch heads marked closed |
|
3364 | If -c/--closed is specified, also show branch heads marked closed | |
3365 | (see :hg:`commit --close-branch`). |
|
3365 | (see :hg:`commit --close-branch`). | |
3366 |
|
3366 | |||
3367 | If STARTREV is specified, only those heads that are descendants of |
|
3367 | If STARTREV is specified, only those heads that are descendants of | |
3368 | STARTREV will be displayed. |
|
3368 | STARTREV will be displayed. | |
3369 |
|
3369 | |||
3370 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
3370 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
3371 | topological heads (changesets with no children) will be shown. |
|
3371 | topological heads (changesets with no children) will be shown. | |
3372 |
|
3372 | |||
3373 | Returns 0 if matching heads are found, 1 if not. |
|
3373 | Returns 0 if matching heads are found, 1 if not. | |
3374 | """ |
|
3374 | """ | |
3375 |
|
3375 | |||
3376 | start = None |
|
3376 | start = None | |
3377 | if 'rev' in opts: |
|
3377 | if 'rev' in opts: | |
3378 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
3378 | start = scmutil.revsingle(repo, opts['rev'], None).node() | |
3379 |
|
3379 | |||
3380 | if opts.get('topo'): |
|
3380 | if opts.get('topo'): | |
3381 | heads = [repo[h] for h in repo.heads(start)] |
|
3381 | heads = [repo[h] for h in repo.heads(start)] | |
3382 | else: |
|
3382 | else: | |
3383 | heads = [] |
|
3383 | heads = [] | |
3384 | for branch in repo.branchmap(): |
|
3384 | for branch in repo.branchmap(): | |
3385 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
3385 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
3386 | heads = [repo[h] for h in heads] |
|
3386 | heads = [repo[h] for h in heads] | |
3387 |
|
3387 | |||
3388 | if branchrevs: |
|
3388 | if branchrevs: | |
3389 | branches = set(repo[br].branch() for br in branchrevs) |
|
3389 | branches = set(repo[br].branch() for br in branchrevs) | |
3390 | heads = [h for h in heads if h.branch() in branches] |
|
3390 | heads = [h for h in heads if h.branch() in branches] | |
3391 |
|
3391 | |||
3392 | if opts.get('active') and branchrevs: |
|
3392 | if opts.get('active') and branchrevs: | |
3393 | dagheads = repo.heads(start) |
|
3393 | dagheads = repo.heads(start) | |
3394 | heads = [h for h in heads if h.node() in dagheads] |
|
3394 | heads = [h for h in heads if h.node() in dagheads] | |
3395 |
|
3395 | |||
3396 | if branchrevs: |
|
3396 | if branchrevs: | |
3397 | haveheads = set(h.branch() for h in heads) |
|
3397 | haveheads = set(h.branch() for h in heads) | |
3398 | if branches - haveheads: |
|
3398 | if branches - haveheads: | |
3399 | headless = ', '.join(b for b in branches - haveheads) |
|
3399 | headless = ', '.join(b for b in branches - haveheads) | |
3400 | msg = _('no open branch heads found on branches %s') |
|
3400 | msg = _('no open branch heads found on branches %s') | |
3401 | if opts.get('rev'): |
|
3401 | if opts.get('rev'): | |
3402 | msg += _(' (started at %s)') % opts['rev'] |
|
3402 | msg += _(' (started at %s)') % opts['rev'] | |
3403 | ui.warn((msg + '\n') % headless) |
|
3403 | ui.warn((msg + '\n') % headless) | |
3404 |
|
3404 | |||
3405 | if not heads: |
|
3405 | if not heads: | |
3406 | return 1 |
|
3406 | return 1 | |
3407 |
|
3407 | |||
3408 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
3408 | heads = sorted(heads, key=lambda x: -x.rev()) | |
3409 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3409 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3410 | for ctx in heads: |
|
3410 | for ctx in heads: | |
3411 | displayer.show(ctx) |
|
3411 | displayer.show(ctx) | |
3412 | displayer.close() |
|
3412 | displayer.close() | |
3413 |
|
3413 | |||
3414 | @command('help', |
|
3414 | @command('help', | |
3415 | [('e', 'extension', None, _('show only help for extensions')), |
|
3415 | [('e', 'extension', None, _('show only help for extensions')), | |
3416 | ('c', 'command', None, _('show only help for commands')), |
|
3416 | ('c', 'command', None, _('show only help for commands')), | |
3417 | ('k', 'keyword', '', _('show topics matching keyword')), |
|
3417 | ('k', 'keyword', '', _('show topics matching keyword')), | |
3418 | ], |
|
3418 | ], | |
3419 | _('[-ec] [TOPIC]')) |
|
3419 | _('[-ec] [TOPIC]')) | |
3420 | def help_(ui, name=None, **opts): |
|
3420 | def help_(ui, name=None, **opts): | |
3421 | """show help for a given topic or a help overview |
|
3421 | """show help for a given topic or a help overview | |
3422 |
|
3422 | |||
3423 | With no arguments, print a list of commands with short help messages. |
|
3423 | With no arguments, print a list of commands with short help messages. | |
3424 |
|
3424 | |||
3425 | Given a topic, extension, or command name, print help for that |
|
3425 | Given a topic, extension, or command name, print help for that | |
3426 | topic. |
|
3426 | topic. | |
3427 |
|
3427 | |||
3428 | Returns 0 if successful. |
|
3428 | Returns 0 if successful. | |
3429 | """ |
|
3429 | """ | |
3430 |
|
3430 | |||
3431 | textwidth = min(ui.termwidth(), 80) - 2 |
|
3431 | textwidth = min(ui.termwidth(), 80) - 2 | |
3432 |
|
3432 | |||
3433 | keep = ui.verbose and ['verbose'] or [] |
|
3433 | keep = ui.verbose and ['verbose'] or [] | |
3434 | text = help.help_(ui, name, **opts) |
|
3434 | text = help.help_(ui, name, **opts) | |
3435 |
|
3435 | |||
3436 | formatted, pruned = minirst.format(text, textwidth, keep=keep) |
|
3436 | formatted, pruned = minirst.format(text, textwidth, keep=keep) | |
3437 | if 'verbose' in pruned: |
|
3437 | if 'verbose' in pruned: | |
3438 | keep.append('omitted') |
|
3438 | keep.append('omitted') | |
3439 | else: |
|
3439 | else: | |
3440 | keep.append('notomitted') |
|
3440 | keep.append('notomitted') | |
3441 | formatted, pruned = minirst.format(text, textwidth, keep=keep) |
|
3441 | formatted, pruned = minirst.format(text, textwidth, keep=keep) | |
3442 | ui.write(formatted) |
|
3442 | ui.write(formatted) | |
3443 |
|
3443 | |||
3444 |
|
3444 | |||
3445 | @command('identify|id', |
|
3445 | @command('identify|id', | |
3446 | [('r', 'rev', '', |
|
3446 | [('r', 'rev', '', | |
3447 | _('identify the specified revision'), _('REV')), |
|
3447 | _('identify the specified revision'), _('REV')), | |
3448 | ('n', 'num', None, _('show local revision number')), |
|
3448 | ('n', 'num', None, _('show local revision number')), | |
3449 | ('i', 'id', None, _('show global revision id')), |
|
3449 | ('i', 'id', None, _('show global revision id')), | |
3450 | ('b', 'branch', None, _('show branch')), |
|
3450 | ('b', 'branch', None, _('show branch')), | |
3451 | ('t', 'tags', None, _('show tags')), |
|
3451 | ('t', 'tags', None, _('show tags')), | |
3452 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
3452 | ('B', 'bookmarks', None, _('show bookmarks')), | |
3453 | ] + remoteopts, |
|
3453 | ] + remoteopts, | |
3454 | _('[-nibtB] [-r REV] [SOURCE]')) |
|
3454 | _('[-nibtB] [-r REV] [SOURCE]')) | |
3455 | def identify(ui, repo, source=None, rev=None, |
|
3455 | def identify(ui, repo, source=None, rev=None, | |
3456 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
3456 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
3457 | """identify the working copy or specified revision |
|
3457 | """identify the working copy or specified revision | |
3458 |
|
3458 | |||
3459 | Print a summary identifying the repository state at REV using one or |
|
3459 | Print a summary identifying the repository state at REV using one or | |
3460 | two parent hash identifiers, followed by a "+" if the working |
|
3460 | two parent hash identifiers, followed by a "+" if the working | |
3461 | directory has uncommitted changes, the branch name (if not default), |
|
3461 | directory has uncommitted changes, the branch name (if not default), | |
3462 | a list of tags, and a list of bookmarks. |
|
3462 | a list of tags, and a list of bookmarks. | |
3463 |
|
3463 | |||
3464 | When REV is not given, print a summary of the current state of the |
|
3464 | When REV is not given, print a summary of the current state of the | |
3465 | repository. |
|
3465 | repository. | |
3466 |
|
3466 | |||
3467 | Specifying a path to a repository root or Mercurial bundle will |
|
3467 | Specifying a path to a repository root or Mercurial bundle will | |
3468 | cause lookup to operate on that repository/bundle. |
|
3468 | cause lookup to operate on that repository/bundle. | |
3469 |
|
3469 | |||
3470 | .. container:: verbose |
|
3470 | .. container:: verbose | |
3471 |
|
3471 | |||
3472 | Examples: |
|
3472 | Examples: | |
3473 |
|
3473 | |||
3474 | - generate a build identifier for the working directory:: |
|
3474 | - generate a build identifier for the working directory:: | |
3475 |
|
3475 | |||
3476 | hg id --id > build-id.dat |
|
3476 | hg id --id > build-id.dat | |
3477 |
|
3477 | |||
3478 | - find the revision corresponding to a tag:: |
|
3478 | - find the revision corresponding to a tag:: | |
3479 |
|
3479 | |||
3480 | hg id -n -r 1.3 |
|
3480 | hg id -n -r 1.3 | |
3481 |
|
3481 | |||
3482 | - check the most recent revision of a remote repository:: |
|
3482 | - check the most recent revision of a remote repository:: | |
3483 |
|
3483 | |||
3484 | hg id -r tip http://selenic.com/hg/ |
|
3484 | hg id -r tip http://selenic.com/hg/ | |
3485 |
|
3485 | |||
3486 | Returns 0 if successful. |
|
3486 | Returns 0 if successful. | |
3487 | """ |
|
3487 | """ | |
3488 |
|
3488 | |||
3489 | if not repo and not source: |
|
3489 | if not repo and not source: | |
3490 | raise util.Abort(_("there is no Mercurial repository here " |
|
3490 | raise util.Abort(_("there is no Mercurial repository here " | |
3491 | "(.hg not found)")) |
|
3491 | "(.hg not found)")) | |
3492 |
|
3492 | |||
3493 | hexfunc = ui.debugflag and hex or short |
|
3493 | hexfunc = ui.debugflag and hex or short | |
3494 | default = not (num or id or branch or tags or bookmarks) |
|
3494 | default = not (num or id or branch or tags or bookmarks) | |
3495 | output = [] |
|
3495 | output = [] | |
3496 | revs = [] |
|
3496 | revs = [] | |
3497 |
|
3497 | |||
3498 | if source: |
|
3498 | if source: | |
3499 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
3499 | source, branches = hg.parseurl(ui.expandpath(source)) | |
3500 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
3500 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
3501 | repo = peer.local() |
|
3501 | repo = peer.local() | |
3502 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
3502 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
3503 |
|
3503 | |||
3504 | if not repo: |
|
3504 | if not repo: | |
3505 | if num or branch or tags: |
|
3505 | if num or branch or tags: | |
3506 | raise util.Abort( |
|
3506 | raise util.Abort( | |
3507 | _("can't query remote revision number, branch, or tags")) |
|
3507 | _("can't query remote revision number, branch, or tags")) | |
3508 | if not rev and revs: |
|
3508 | if not rev and revs: | |
3509 | rev = revs[0] |
|
3509 | rev = revs[0] | |
3510 | if not rev: |
|
3510 | if not rev: | |
3511 | rev = "tip" |
|
3511 | rev = "tip" | |
3512 |
|
3512 | |||
3513 | remoterev = peer.lookup(rev) |
|
3513 | remoterev = peer.lookup(rev) | |
3514 | if default or id: |
|
3514 | if default or id: | |
3515 | output = [hexfunc(remoterev)] |
|
3515 | output = [hexfunc(remoterev)] | |
3516 |
|
3516 | |||
3517 | def getbms(): |
|
3517 | def getbms(): | |
3518 | bms = [] |
|
3518 | bms = [] | |
3519 |
|
3519 | |||
3520 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
3520 | if 'bookmarks' in peer.listkeys('namespaces'): | |
3521 | hexremoterev = hex(remoterev) |
|
3521 | hexremoterev = hex(remoterev) | |
3522 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
3522 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
3523 | if bmr == hexremoterev] |
|
3523 | if bmr == hexremoterev] | |
3524 |
|
3524 | |||
3525 | return sorted(bms) |
|
3525 | return sorted(bms) | |
3526 |
|
3526 | |||
3527 | if bookmarks: |
|
3527 | if bookmarks: | |
3528 | output.extend(getbms()) |
|
3528 | output.extend(getbms()) | |
3529 | elif default and not ui.quiet: |
|
3529 | elif default and not ui.quiet: | |
3530 | # multiple bookmarks for a single parent separated by '/' |
|
3530 | # multiple bookmarks for a single parent separated by '/' | |
3531 | bm = '/'.join(getbms()) |
|
3531 | bm = '/'.join(getbms()) | |
3532 | if bm: |
|
3532 | if bm: | |
3533 | output.append(bm) |
|
3533 | output.append(bm) | |
3534 | else: |
|
3534 | else: | |
3535 | if not rev: |
|
3535 | if not rev: | |
3536 | ctx = repo[None] |
|
3536 | ctx = repo[None] | |
3537 | parents = ctx.parents() |
|
3537 | parents = ctx.parents() | |
3538 | changed = "" |
|
3538 | changed = "" | |
3539 | if default or id or num: |
|
3539 | if default or id or num: | |
3540 | if (util.any(repo.status()) |
|
3540 | if (util.any(repo.status()) | |
3541 | or util.any(ctx.sub(s).dirty() for s in ctx.substate)): |
|
3541 | or util.any(ctx.sub(s).dirty() for s in ctx.substate)): | |
3542 | changed = '+' |
|
3542 | changed = '+' | |
3543 | if default or id: |
|
3543 | if default or id: | |
3544 | output = ["%s%s" % |
|
3544 | output = ["%s%s" % | |
3545 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
|
3545 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] | |
3546 | if num: |
|
3546 | if num: | |
3547 | output.append("%s%s" % |
|
3547 | output.append("%s%s" % | |
3548 | ('+'.join([str(p.rev()) for p in parents]), changed)) |
|
3548 | ('+'.join([str(p.rev()) for p in parents]), changed)) | |
3549 | else: |
|
3549 | else: | |
3550 | ctx = scmutil.revsingle(repo, rev) |
|
3550 | ctx = scmutil.revsingle(repo, rev) | |
3551 | if default or id: |
|
3551 | if default or id: | |
3552 | output = [hexfunc(ctx.node())] |
|
3552 | output = [hexfunc(ctx.node())] | |
3553 | if num: |
|
3553 | if num: | |
3554 | output.append(str(ctx.rev())) |
|
3554 | output.append(str(ctx.rev())) | |
3555 |
|
3555 | |||
3556 | if default and not ui.quiet: |
|
3556 | if default and not ui.quiet: | |
3557 | b = ctx.branch() |
|
3557 | b = ctx.branch() | |
3558 | if b != 'default': |
|
3558 | if b != 'default': | |
3559 | output.append("(%s)" % b) |
|
3559 | output.append("(%s)" % b) | |
3560 |
|
3560 | |||
3561 | # multiple tags for a single parent separated by '/' |
|
3561 | # multiple tags for a single parent separated by '/' | |
3562 | t = '/'.join(ctx.tags()) |
|
3562 | t = '/'.join(ctx.tags()) | |
3563 | if t: |
|
3563 | if t: | |
3564 | output.append(t) |
|
3564 | output.append(t) | |
3565 |
|
3565 | |||
3566 | # multiple bookmarks for a single parent separated by '/' |
|
3566 | # multiple bookmarks for a single parent separated by '/' | |
3567 | bm = '/'.join(ctx.bookmarks()) |
|
3567 | bm = '/'.join(ctx.bookmarks()) | |
3568 | if bm: |
|
3568 | if bm: | |
3569 | output.append(bm) |
|
3569 | output.append(bm) | |
3570 | else: |
|
3570 | else: | |
3571 | if branch: |
|
3571 | if branch: | |
3572 | output.append(ctx.branch()) |
|
3572 | output.append(ctx.branch()) | |
3573 |
|
3573 | |||
3574 | if tags: |
|
3574 | if tags: | |
3575 | output.extend(ctx.tags()) |
|
3575 | output.extend(ctx.tags()) | |
3576 |
|
3576 | |||
3577 | if bookmarks: |
|
3577 | if bookmarks: | |
3578 | output.extend(ctx.bookmarks()) |
|
3578 | output.extend(ctx.bookmarks()) | |
3579 |
|
3579 | |||
3580 | ui.write("%s\n" % ' '.join(output)) |
|
3580 | ui.write("%s\n" % ' '.join(output)) | |
3581 |
|
3581 | |||
3582 | @command('import|patch', |
|
3582 | @command('import|patch', | |
3583 | [('p', 'strip', 1, |
|
3583 | [('p', 'strip', 1, | |
3584 | _('directory strip option for patch. This has the same ' |
|
3584 | _('directory strip option for patch. This has the same ' | |
3585 | 'meaning as the corresponding patch option'), _('NUM')), |
|
3585 | 'meaning as the corresponding patch option'), _('NUM')), | |
3586 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
3586 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
3587 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3587 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
3588 | ('f', 'force', None, |
|
3588 | ('f', 'force', None, | |
3589 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
3589 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
3590 | ('', 'no-commit', None, |
|
3590 | ('', 'no-commit', None, | |
3591 | _("don't commit, just update the working directory")), |
|
3591 | _("don't commit, just update the working directory")), | |
3592 | ('', 'bypass', None, |
|
3592 | ('', 'bypass', None, | |
3593 | _("apply patch without touching the working directory")), |
|
3593 | _("apply patch without touching the working directory")), | |
3594 | ('', 'exact', None, |
|
3594 | ('', 'exact', None, | |
3595 | _('apply patch to the nodes from which it was generated')), |
|
3595 | _('apply patch to the nodes from which it was generated')), | |
3596 | ('', 'import-branch', None, |
|
3596 | ('', 'import-branch', None, | |
3597 | _('use any branch information in patch (implied by --exact)'))] + |
|
3597 | _('use any branch information in patch (implied by --exact)'))] + | |
3598 | commitopts + commitopts2 + similarityopts, |
|
3598 | commitopts + commitopts2 + similarityopts, | |
3599 | _('[OPTION]... PATCH...')) |
|
3599 | _('[OPTION]... PATCH...')) | |
3600 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
3600 | def import_(ui, repo, patch1=None, *patches, **opts): | |
3601 | """import an ordered set of patches |
|
3601 | """import an ordered set of patches | |
3602 |
|
3602 | |||
3603 | Import a list of patches and commit them individually (unless |
|
3603 | Import a list of patches and commit them individually (unless | |
3604 | --no-commit is specified). |
|
3604 | --no-commit is specified). | |
3605 |
|
3605 | |||
3606 | Because import first applies changes to the working directory, |
|
3606 | Because import first applies changes to the working directory, | |
3607 | import will abort if there are outstanding changes. |
|
3607 | import will abort if there are outstanding changes. | |
3608 |
|
3608 | |||
3609 | You can import a patch straight from a mail message. Even patches |
|
3609 | You can import a patch straight from a mail message. Even patches | |
3610 | as attachments work (to use the body part, it must have type |
|
3610 | as attachments work (to use the body part, it must have type | |
3611 | text/plain or text/x-patch). From and Subject headers of email |
|
3611 | text/plain or text/x-patch). From and Subject headers of email | |
3612 | message are used as default committer and commit message. All |
|
3612 | message are used as default committer and commit message. All | |
3613 | text/plain body parts before first diff are added to commit |
|
3613 | text/plain body parts before first diff are added to commit | |
3614 | message. |
|
3614 | message. | |
3615 |
|
3615 | |||
3616 | If the imported patch was generated by :hg:`export`, user and |
|
3616 | If the imported patch was generated by :hg:`export`, user and | |
3617 | description from patch override values from message headers and |
|
3617 | description from patch override values from message headers and | |
3618 | body. Values given on command line with -m/--message and -u/--user |
|
3618 | body. Values given on command line with -m/--message and -u/--user | |
3619 | override these. |
|
3619 | override these. | |
3620 |
|
3620 | |||
3621 | If --exact is specified, import will set the working directory to |
|
3621 | If --exact is specified, import will set the working directory to | |
3622 | the parent of each patch before applying it, and will abort if the |
|
3622 | the parent of each patch before applying it, and will abort if the | |
3623 | resulting changeset has a different ID than the one recorded in |
|
3623 | resulting changeset has a different ID than the one recorded in | |
3624 | the patch. This may happen due to character set problems or other |
|
3624 | the patch. This may happen due to character set problems or other | |
3625 | deficiencies in the text patch format. |
|
3625 | deficiencies in the text patch format. | |
3626 |
|
3626 | |||
3627 | Use --bypass to apply and commit patches directly to the |
|
3627 | Use --bypass to apply and commit patches directly to the | |
3628 | repository, not touching the working directory. Without --exact, |
|
3628 | repository, not touching the working directory. Without --exact, | |
3629 | patches will be applied on top of the working directory parent |
|
3629 | patches will be applied on top of the working directory parent | |
3630 | revision. |
|
3630 | revision. | |
3631 |
|
3631 | |||
3632 | With -s/--similarity, hg will attempt to discover renames and |
|
3632 | With -s/--similarity, hg will attempt to discover renames and | |
3633 | copies in the patch in the same way as :hg:`addremove`. |
|
3633 | copies in the patch in the same way as :hg:`addremove`. | |
3634 |
|
3634 | |||
3635 | To read a patch from standard input, use "-" as the patch name. If |
|
3635 | To read a patch from standard input, use "-" as the patch name. If | |
3636 | a URL is specified, the patch will be downloaded from it. |
|
3636 | a URL is specified, the patch will be downloaded from it. | |
3637 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3637 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3638 |
|
3638 | |||
3639 | .. container:: verbose |
|
3639 | .. container:: verbose | |
3640 |
|
3640 | |||
3641 | Examples: |
|
3641 | Examples: | |
3642 |
|
3642 | |||
3643 | - import a traditional patch from a website and detect renames:: |
|
3643 | - import a traditional patch from a website and detect renames:: | |
3644 |
|
3644 | |||
3645 | hg import -s 80 http://example.com/bugfix.patch |
|
3645 | hg import -s 80 http://example.com/bugfix.patch | |
3646 |
|
3646 | |||
3647 | - import a changeset from an hgweb server:: |
|
3647 | - import a changeset from an hgweb server:: | |
3648 |
|
3648 | |||
3649 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa |
|
3649 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa | |
3650 |
|
3650 | |||
3651 | - import all the patches in an Unix-style mbox:: |
|
3651 | - import all the patches in an Unix-style mbox:: | |
3652 |
|
3652 | |||
3653 | hg import incoming-patches.mbox |
|
3653 | hg import incoming-patches.mbox | |
3654 |
|
3654 | |||
3655 | - attempt to exactly restore an exported changeset (not always |
|
3655 | - attempt to exactly restore an exported changeset (not always | |
3656 | possible):: |
|
3656 | possible):: | |
3657 |
|
3657 | |||
3658 | hg import --exact proposed-fix.patch |
|
3658 | hg import --exact proposed-fix.patch | |
3659 |
|
3659 | |||
3660 | Returns 0 on success. |
|
3660 | Returns 0 on success. | |
3661 | """ |
|
3661 | """ | |
3662 |
|
3662 | |||
3663 | if not patch1: |
|
3663 | if not patch1: | |
3664 | raise util.Abort(_('need at least one patch to import')) |
|
3664 | raise util.Abort(_('need at least one patch to import')) | |
3665 |
|
3665 | |||
3666 | patches = (patch1,) + patches |
|
3666 | patches = (patch1,) + patches | |
3667 |
|
3667 | |||
3668 | date = opts.get('date') |
|
3668 | date = opts.get('date') | |
3669 | if date: |
|
3669 | if date: | |
3670 | opts['date'] = util.parsedate(date) |
|
3670 | opts['date'] = util.parsedate(date) | |
3671 |
|
3671 | |||
3672 | editor = cmdutil.commiteditor |
|
3672 | editor = cmdutil.commiteditor | |
3673 | if opts.get('edit'): |
|
3673 | if opts.get('edit'): | |
3674 | editor = cmdutil.commitforceeditor |
|
3674 | editor = cmdutil.commitforceeditor | |
3675 |
|
3675 | |||
3676 | update = not opts.get('bypass') |
|
3676 | update = not opts.get('bypass') | |
3677 | if not update and opts.get('no_commit'): |
|
3677 | if not update and opts.get('no_commit'): | |
3678 | raise util.Abort(_('cannot use --no-commit with --bypass')) |
|
3678 | raise util.Abort(_('cannot use --no-commit with --bypass')) | |
3679 | try: |
|
3679 | try: | |
3680 | sim = float(opts.get('similarity') or 0) |
|
3680 | sim = float(opts.get('similarity') or 0) | |
3681 | except ValueError: |
|
3681 | except ValueError: | |
3682 | raise util.Abort(_('similarity must be a number')) |
|
3682 | raise util.Abort(_('similarity must be a number')) | |
3683 | if sim < 0 or sim > 100: |
|
3683 | if sim < 0 or sim > 100: | |
3684 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
3684 | raise util.Abort(_('similarity must be between 0 and 100')) | |
3685 | if sim and not update: |
|
3685 | if sim and not update: | |
3686 | raise util.Abort(_('cannot use --similarity with --bypass')) |
|
3686 | raise util.Abort(_('cannot use --similarity with --bypass')) | |
3687 |
|
3687 | |||
3688 | if update: |
|
3688 | if update: | |
3689 | cmdutil.checkunfinished(repo) |
|
3689 | cmdutil.checkunfinished(repo) | |
3690 | if (opts.get('exact') or not opts.get('force')) and update: |
|
3690 | if (opts.get('exact') or not opts.get('force')) and update: | |
3691 | cmdutil.bailifchanged(repo) |
|
3691 | cmdutil.bailifchanged(repo) | |
3692 |
|
3692 | |||
3693 | base = opts["base"] |
|
3693 | base = opts["base"] | |
3694 | strip = opts["strip"] |
|
3694 | strip = opts["strip"] | |
3695 | wlock = lock = tr = None |
|
3695 | wlock = lock = tr = None | |
3696 | msgs = [] |
|
3696 | msgs = [] | |
3697 |
|
3697 | |||
3698 | def tryone(ui, hunk, parents): |
|
3698 | def tryone(ui, hunk, parents): | |
3699 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
3699 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
3700 | patch.extract(ui, hunk) |
|
3700 | patch.extract(ui, hunk) | |
3701 |
|
3701 | |||
3702 | if not tmpname: |
|
3702 | if not tmpname: | |
3703 | return (None, None) |
|
3703 | return (None, None) | |
3704 | msg = _('applied to working directory') |
|
3704 | msg = _('applied to working directory') | |
3705 |
|
3705 | |||
3706 | try: |
|
3706 | try: | |
3707 | cmdline_message = cmdutil.logmessage(ui, opts) |
|
3707 | cmdline_message = cmdutil.logmessage(ui, opts) | |
3708 | if cmdline_message: |
|
3708 | if cmdline_message: | |
3709 | # pickup the cmdline msg |
|
3709 | # pickup the cmdline msg | |
3710 | message = cmdline_message |
|
3710 | message = cmdline_message | |
3711 | elif message: |
|
3711 | elif message: | |
3712 | # pickup the patch msg |
|
3712 | # pickup the patch msg | |
3713 | message = message.strip() |
|
3713 | message = message.strip() | |
3714 | else: |
|
3714 | else: | |
3715 | # launch the editor |
|
3715 | # launch the editor | |
3716 | message = None |
|
3716 | message = None | |
3717 | ui.debug('message:\n%s\n' % message) |
|
3717 | ui.debug('message:\n%s\n' % message) | |
3718 |
|
3718 | |||
3719 | if len(parents) == 1: |
|
3719 | if len(parents) == 1: | |
3720 | parents.append(repo[nullid]) |
|
3720 | parents.append(repo[nullid]) | |
3721 | if opts.get('exact'): |
|
3721 | if opts.get('exact'): | |
3722 | if not nodeid or not p1: |
|
3722 | if not nodeid or not p1: | |
3723 | raise util.Abort(_('not a Mercurial patch')) |
|
3723 | raise util.Abort(_('not a Mercurial patch')) | |
3724 | p1 = repo[p1] |
|
3724 | p1 = repo[p1] | |
3725 | p2 = repo[p2 or nullid] |
|
3725 | p2 = repo[p2 or nullid] | |
3726 | elif p2: |
|
3726 | elif p2: | |
3727 | try: |
|
3727 | try: | |
3728 | p1 = repo[p1] |
|
3728 | p1 = repo[p1] | |
3729 | p2 = repo[p2] |
|
3729 | p2 = repo[p2] | |
3730 | # Without any options, consider p2 only if the |
|
3730 | # Without any options, consider p2 only if the | |
3731 | # patch is being applied on top of the recorded |
|
3731 | # patch is being applied on top of the recorded | |
3732 | # first parent. |
|
3732 | # first parent. | |
3733 | if p1 != parents[0]: |
|
3733 | if p1 != parents[0]: | |
3734 | p1 = parents[0] |
|
3734 | p1 = parents[0] | |
3735 | p2 = repo[nullid] |
|
3735 | p2 = repo[nullid] | |
3736 | except error.RepoError: |
|
3736 | except error.RepoError: | |
3737 | p1, p2 = parents |
|
3737 | p1, p2 = parents | |
3738 | else: |
|
3738 | else: | |
3739 | p1, p2 = parents |
|
3739 | p1, p2 = parents | |
3740 |
|
3740 | |||
3741 | n = None |
|
3741 | n = None | |
3742 | if update: |
|
3742 | if update: | |
3743 | if p1 != parents[0]: |
|
3743 | if p1 != parents[0]: | |
3744 | hg.clean(repo, p1.node()) |
|
3744 | hg.clean(repo, p1.node()) | |
3745 | if p2 != parents[1]: |
|
3745 | if p2 != parents[1]: | |
3746 | repo.setparents(p1.node(), p2.node()) |
|
3746 | repo.setparents(p1.node(), p2.node()) | |
3747 |
|
3747 | |||
3748 | if opts.get('exact') or opts.get('import_branch'): |
|
3748 | if opts.get('exact') or opts.get('import_branch'): | |
3749 | repo.dirstate.setbranch(branch or 'default') |
|
3749 | repo.dirstate.setbranch(branch or 'default') | |
3750 |
|
3750 | |||
3751 | files = set() |
|
3751 | files = set() | |
3752 | patch.patch(ui, repo, tmpname, strip=strip, files=files, |
|
3752 | patch.patch(ui, repo, tmpname, strip=strip, files=files, | |
3753 | eolmode=None, similarity=sim / 100.0) |
|
3753 | eolmode=None, similarity=sim / 100.0) | |
3754 | files = list(files) |
|
3754 | files = list(files) | |
3755 | if opts.get('no_commit'): |
|
3755 | if opts.get('no_commit'): | |
3756 | if message: |
|
3756 | if message: | |
3757 | msgs.append(message) |
|
3757 | msgs.append(message) | |
3758 | else: |
|
3758 | else: | |
3759 | if opts.get('exact') or p2: |
|
3759 | if opts.get('exact') or p2: | |
3760 | # If you got here, you either use --force and know what |
|
3760 | # If you got here, you either use --force and know what | |
3761 | # you are doing or used --exact or a merge patch while |
|
3761 | # you are doing or used --exact or a merge patch while | |
3762 | # being updated to its first parent. |
|
3762 | # being updated to its first parent. | |
3763 | m = None |
|
3763 | m = None | |
3764 | else: |
|
3764 | else: | |
3765 | m = scmutil.matchfiles(repo, files or []) |
|
3765 | m = scmutil.matchfiles(repo, files or []) | |
3766 | n = repo.commit(message, opts.get('user') or user, |
|
3766 | n = repo.commit(message, opts.get('user') or user, | |
3767 | opts.get('date') or date, match=m, |
|
3767 | opts.get('date') or date, match=m, | |
3768 | editor=editor) |
|
3768 | editor=editor) | |
3769 | else: |
|
3769 | else: | |
3770 | if opts.get('exact') or opts.get('import_branch'): |
|
3770 | if opts.get('exact') or opts.get('import_branch'): | |
3771 | branch = branch or 'default' |
|
3771 | branch = branch or 'default' | |
3772 | else: |
|
3772 | else: | |
3773 | branch = p1.branch() |
|
3773 | branch = p1.branch() | |
3774 | store = patch.filestore() |
|
3774 | store = patch.filestore() | |
3775 | try: |
|
3775 | try: | |
3776 | files = set() |
|
3776 | files = set() | |
3777 | try: |
|
3777 | try: | |
3778 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, |
|
3778 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, | |
3779 | files, eolmode=None) |
|
3779 | files, eolmode=None) | |
3780 | except patch.PatchError, e: |
|
3780 | except patch.PatchError, e: | |
3781 | raise util.Abort(str(e)) |
|
3781 | raise util.Abort(str(e)) | |
3782 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
3782 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | |
3783 | message, |
|
3783 | message, | |
3784 | opts.get('user') or user, |
|
3784 | opts.get('user') or user, | |
3785 | opts.get('date') or date, |
|
3785 | opts.get('date') or date, | |
3786 | branch, files, store, |
|
3786 | branch, files, store, | |
3787 | editor=cmdutil.commiteditor) |
|
3787 | editor=cmdutil.commiteditor) | |
3788 | repo.savecommitmessage(memctx.description()) |
|
3788 | repo.savecommitmessage(memctx.description()) | |
3789 | n = memctx.commit() |
|
3789 | n = memctx.commit() | |
3790 | finally: |
|
3790 | finally: | |
3791 | store.close() |
|
3791 | store.close() | |
3792 | if opts.get('exact') and hex(n) != nodeid: |
|
3792 | if opts.get('exact') and hex(n) != nodeid: | |
3793 | raise util.Abort(_('patch is damaged or loses information')) |
|
3793 | raise util.Abort(_('patch is damaged or loses information')) | |
3794 | if n: |
|
3794 | if n: | |
3795 | # i18n: refers to a short changeset id |
|
3795 | # i18n: refers to a short changeset id | |
3796 | msg = _('created %s') % short(n) |
|
3796 | msg = _('created %s') % short(n) | |
3797 | return (msg, n) |
|
3797 | return (msg, n) | |
3798 | finally: |
|
3798 | finally: | |
3799 | os.unlink(tmpname) |
|
3799 | os.unlink(tmpname) | |
3800 |
|
3800 | |||
3801 | try: |
|
3801 | try: | |
3802 | try: |
|
3802 | try: | |
3803 | wlock = repo.wlock() |
|
3803 | wlock = repo.wlock() | |
3804 | if not opts.get('no_commit'): |
|
3804 | if not opts.get('no_commit'): | |
3805 | lock = repo.lock() |
|
3805 | lock = repo.lock() | |
3806 | tr = repo.transaction('import') |
|
3806 | tr = repo.transaction('import') | |
3807 | parents = repo.parents() |
|
3807 | parents = repo.parents() | |
3808 | for patchurl in patches: |
|
3808 | for patchurl in patches: | |
3809 | if patchurl == '-': |
|
3809 | if patchurl == '-': | |
3810 | ui.status(_('applying patch from stdin\n')) |
|
3810 | ui.status(_('applying patch from stdin\n')) | |
3811 | patchfile = ui.fin |
|
3811 | patchfile = ui.fin | |
3812 | patchurl = 'stdin' # for error message |
|
3812 | patchurl = 'stdin' # for error message | |
3813 | else: |
|
3813 | else: | |
3814 | patchurl = os.path.join(base, patchurl) |
|
3814 | patchurl = os.path.join(base, patchurl) | |
3815 | ui.status(_('applying %s\n') % patchurl) |
|
3815 | ui.status(_('applying %s\n') % patchurl) | |
3816 | patchfile = hg.openpath(ui, patchurl) |
|
3816 | patchfile = hg.openpath(ui, patchurl) | |
3817 |
|
3817 | |||
3818 | haspatch = False |
|
3818 | haspatch = False | |
3819 | for hunk in patch.split(patchfile): |
|
3819 | for hunk in patch.split(patchfile): | |
3820 | (msg, node) = tryone(ui, hunk, parents) |
|
3820 | (msg, node) = tryone(ui, hunk, parents) | |
3821 | if msg: |
|
3821 | if msg: | |
3822 | haspatch = True |
|
3822 | haspatch = True | |
3823 | ui.note(msg + '\n') |
|
3823 | ui.note(msg + '\n') | |
3824 | if update or opts.get('exact'): |
|
3824 | if update or opts.get('exact'): | |
3825 | parents = repo.parents() |
|
3825 | parents = repo.parents() | |
3826 | else: |
|
3826 | else: | |
3827 | parents = [repo[node]] |
|
3827 | parents = [repo[node]] | |
3828 |
|
3828 | |||
3829 | if not haspatch: |
|
3829 | if not haspatch: | |
3830 | raise util.Abort(_('%s: no diffs found') % patchurl) |
|
3830 | raise util.Abort(_('%s: no diffs found') % patchurl) | |
3831 |
|
3831 | |||
3832 | if tr: |
|
3832 | if tr: | |
3833 | tr.close() |
|
3833 | tr.close() | |
3834 | if msgs: |
|
3834 | if msgs: | |
3835 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3835 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
3836 | except: # re-raises |
|
3836 | except: # re-raises | |
3837 | # wlock.release() indirectly calls dirstate.write(): since |
|
3837 | # wlock.release() indirectly calls dirstate.write(): since | |
3838 | # we're crashing, we do not want to change the working dir |
|
3838 | # we're crashing, we do not want to change the working dir | |
3839 | # parent after all, so make sure it writes nothing |
|
3839 | # parent after all, so make sure it writes nothing | |
3840 | repo.dirstate.invalidate() |
|
3840 | repo.dirstate.invalidate() | |
3841 | raise |
|
3841 | raise | |
3842 | finally: |
|
3842 | finally: | |
3843 | if tr: |
|
3843 | if tr: | |
3844 | tr.release() |
|
3844 | tr.release() | |
3845 | release(lock, wlock) |
|
3845 | release(lock, wlock) | |
3846 |
|
3846 | |||
3847 | @command('incoming|in', |
|
3847 | @command('incoming|in', | |
3848 | [('f', 'force', None, |
|
3848 | [('f', 'force', None, | |
3849 | _('run even if remote repository is unrelated')), |
|
3849 | _('run even if remote repository is unrelated')), | |
3850 | ('n', 'newest-first', None, _('show newest record first')), |
|
3850 | ('n', 'newest-first', None, _('show newest record first')), | |
3851 | ('', 'bundle', '', |
|
3851 | ('', 'bundle', '', | |
3852 | _('file to store the bundles into'), _('FILE')), |
|
3852 | _('file to store the bundles into'), _('FILE')), | |
3853 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3853 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3854 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3854 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
3855 | ('b', 'branch', [], |
|
3855 | ('b', 'branch', [], | |
3856 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3856 | _('a specific branch you would like to pull'), _('BRANCH')), | |
3857 | ] + logopts + remoteopts + subrepoopts, |
|
3857 | ] + logopts + remoteopts + subrepoopts, | |
3858 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3858 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
3859 | def incoming(ui, repo, source="default", **opts): |
|
3859 | def incoming(ui, repo, source="default", **opts): | |
3860 | """show new changesets found in source |
|
3860 | """show new changesets found in source | |
3861 |
|
3861 | |||
3862 | Show new changesets found in the specified path/URL or the default |
|
3862 | Show new changesets found in the specified path/URL or the default | |
3863 | pull location. These are the changesets that would have been pulled |
|
3863 | pull location. These are the changesets that would have been pulled | |
3864 | if a pull at the time you issued this command. |
|
3864 | if a pull at the time you issued this command. | |
3865 |
|
3865 | |||
3866 | For remote repository, using --bundle avoids downloading the |
|
3866 | For remote repository, using --bundle avoids downloading the | |
3867 | changesets twice if the incoming is followed by a pull. |
|
3867 | changesets twice if the incoming is followed by a pull. | |
3868 |
|
3868 | |||
3869 | See pull for valid source format details. |
|
3869 | See pull for valid source format details. | |
3870 |
|
3870 | |||
3871 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3871 | Returns 0 if there are incoming changes, 1 otherwise. | |
3872 | """ |
|
3872 | """ | |
3873 | if opts.get('graph'): |
|
3873 | if opts.get('graph'): | |
3874 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3874 | cmdutil.checkunsupportedgraphflags([], opts) | |
3875 | def display(other, chlist, displayer): |
|
3875 | def display(other, chlist, displayer): | |
3876 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
3876 | revdag = cmdutil.graphrevs(other, chlist, opts) | |
3877 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
3877 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
3878 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
3878 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
3879 | graphmod.asciiedges) |
|
3879 | graphmod.asciiedges) | |
3880 |
|
3880 | |||
3881 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3881 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
3882 | return 0 |
|
3882 | return 0 | |
3883 |
|
3883 | |||
3884 | if opts.get('bundle') and opts.get('subrepos'): |
|
3884 | if opts.get('bundle') and opts.get('subrepos'): | |
3885 | raise util.Abort(_('cannot combine --bundle and --subrepos')) |
|
3885 | raise util.Abort(_('cannot combine --bundle and --subrepos')) | |
3886 |
|
3886 | |||
3887 | if opts.get('bookmarks'): |
|
3887 | if opts.get('bookmarks'): | |
3888 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3888 | source, branches = hg.parseurl(ui.expandpath(source), | |
3889 | opts.get('branch')) |
|
3889 | opts.get('branch')) | |
3890 | other = hg.peer(repo, opts, source) |
|
3890 | other = hg.peer(repo, opts, source) | |
3891 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3891 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3892 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3892 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3893 | return 0 |
|
3893 | return 0 | |
3894 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3894 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
3895 | return bookmarks.diff(ui, repo, other) |
|
3895 | return bookmarks.diff(ui, repo, other) | |
3896 |
|
3896 | |||
3897 | repo._subtoppath = ui.expandpath(source) |
|
3897 | repo._subtoppath = ui.expandpath(source) | |
3898 | try: |
|
3898 | try: | |
3899 | return hg.incoming(ui, repo, source, opts) |
|
3899 | return hg.incoming(ui, repo, source, opts) | |
3900 | finally: |
|
3900 | finally: | |
3901 | del repo._subtoppath |
|
3901 | del repo._subtoppath | |
3902 |
|
3902 | |||
3903 |
|
3903 | |||
3904 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) |
|
3904 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) | |
3905 | def init(ui, dest=".", **opts): |
|
3905 | def init(ui, dest=".", **opts): | |
3906 | """create a new repository in the given directory |
|
3906 | """create a new repository in the given directory | |
3907 |
|
3907 | |||
3908 | Initialize a new repository in the given directory. If the given |
|
3908 | Initialize a new repository in the given directory. If the given | |
3909 | directory does not exist, it will be created. |
|
3909 | directory does not exist, it will be created. | |
3910 |
|
3910 | |||
3911 | If no directory is given, the current directory is used. |
|
3911 | If no directory is given, the current directory is used. | |
3912 |
|
3912 | |||
3913 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3913 | It is possible to specify an ``ssh://`` URL as the destination. | |
3914 | See :hg:`help urls` for more information. |
|
3914 | See :hg:`help urls` for more information. | |
3915 |
|
3915 | |||
3916 | Returns 0 on success. |
|
3916 | Returns 0 on success. | |
3917 | """ |
|
3917 | """ | |
3918 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3918 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
3919 |
|
3919 | |||
3920 | @command('locate', |
|
3920 | @command('locate', | |
3921 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3921 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3922 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3922 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3923 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3923 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
3924 | ] + walkopts, |
|
3924 | ] + walkopts, | |
3925 | _('[OPTION]... [PATTERN]...')) |
|
3925 | _('[OPTION]... [PATTERN]...')) | |
3926 | def locate(ui, repo, *pats, **opts): |
|
3926 | def locate(ui, repo, *pats, **opts): | |
3927 | """locate files matching specific patterns |
|
3927 | """locate files matching specific patterns | |
3928 |
|
3928 | |||
3929 | Print files under Mercurial control in the working directory whose |
|
3929 | Print files under Mercurial control in the working directory whose | |
3930 | names match the given patterns. |
|
3930 | names match the given patterns. | |
3931 |
|
3931 | |||
3932 | By default, this command searches all directories in the working |
|
3932 | By default, this command searches all directories in the working | |
3933 | directory. To search just the current directory and its |
|
3933 | directory. To search just the current directory and its | |
3934 | subdirectories, use "--include .". |
|
3934 | subdirectories, use "--include .". | |
3935 |
|
3935 | |||
3936 | If no patterns are given to match, this command prints the names |
|
3936 | If no patterns are given to match, this command prints the names | |
3937 | of all files under Mercurial control in the working directory. |
|
3937 | of all files under Mercurial control in the working directory. | |
3938 |
|
3938 | |||
3939 | If you want to feed the output of this command into the "xargs" |
|
3939 | If you want to feed the output of this command into the "xargs" | |
3940 | command, use the -0 option to both this command and "xargs". This |
|
3940 | command, use the -0 option to both this command and "xargs". This | |
3941 | will avoid the problem of "xargs" treating single filenames that |
|
3941 | will avoid the problem of "xargs" treating single filenames that | |
3942 | contain whitespace as multiple filenames. |
|
3942 | contain whitespace as multiple filenames. | |
3943 |
|
3943 | |||
3944 | Returns 0 if a match is found, 1 otherwise. |
|
3944 | Returns 0 if a match is found, 1 otherwise. | |
3945 | """ |
|
3945 | """ | |
3946 | end = opts.get('print0') and '\0' or '\n' |
|
3946 | end = opts.get('print0') and '\0' or '\n' | |
3947 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3947 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() | |
3948 |
|
3948 | |||
3949 | ret = 1 |
|
3949 | ret = 1 | |
3950 | m = scmutil.match(repo[rev], pats, opts, default='relglob') |
|
3950 | m = scmutil.match(repo[rev], pats, opts, default='relglob') | |
3951 | m.bad = lambda x, y: False |
|
3951 | m.bad = lambda x, y: False | |
3952 | for abs in repo[rev].walk(m): |
|
3952 | for abs in repo[rev].walk(m): | |
3953 | if not rev and abs not in repo.dirstate: |
|
3953 | if not rev and abs not in repo.dirstate: | |
3954 | continue |
|
3954 | continue | |
3955 | if opts.get('fullpath'): |
|
3955 | if opts.get('fullpath'): | |
3956 | ui.write(repo.wjoin(abs), end) |
|
3956 | ui.write(repo.wjoin(abs), end) | |
3957 | else: |
|
3957 | else: | |
3958 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3958 | ui.write(((pats and m.rel(abs)) or abs), end) | |
3959 | ret = 0 |
|
3959 | ret = 0 | |
3960 |
|
3960 | |||
3961 | return ret |
|
3961 | return ret | |
3962 |
|
3962 | |||
3963 | @command('^log|history', |
|
3963 | @command('^log|history', | |
3964 | [('f', 'follow', None, |
|
3964 | [('f', 'follow', None, | |
3965 | _('follow changeset history, or file history across copies and renames')), |
|
3965 | _('follow changeset history, or file history across copies and renames')), | |
3966 | ('', 'follow-first', None, |
|
3966 | ('', 'follow-first', None, | |
3967 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3967 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
3968 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3968 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
3969 | ('C', 'copies', None, _('show copied files')), |
|
3969 | ('C', 'copies', None, _('show copied files')), | |
3970 | ('k', 'keyword', [], |
|
3970 | ('k', 'keyword', [], | |
3971 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3971 | _('do case-insensitive search for a given text'), _('TEXT')), | |
3972 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), |
|
3972 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), | |
3973 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3973 | ('', 'removed', None, _('include revisions where files were removed')), | |
3974 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3974 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
3975 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3975 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
3976 | ('', 'only-branch', [], |
|
3976 | ('', 'only-branch', [], | |
3977 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3977 | _('show only changesets within the given named branch (DEPRECATED)'), | |
3978 | _('BRANCH')), |
|
3978 | _('BRANCH')), | |
3979 | ('b', 'branch', [], |
|
3979 | ('b', 'branch', [], | |
3980 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3980 | _('show changesets within the given named branch'), _('BRANCH')), | |
3981 | ('P', 'prune', [], |
|
3981 | ('P', 'prune', [], | |
3982 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3982 | _('do not display revision or any of its ancestors'), _('REV')), | |
3983 | ] + logopts + walkopts, |
|
3983 | ] + logopts + walkopts, | |
3984 | _('[OPTION]... [FILE]')) |
|
3984 | _('[OPTION]... [FILE]')) | |
3985 | def log(ui, repo, *pats, **opts): |
|
3985 | def log(ui, repo, *pats, **opts): | |
3986 | """show revision history of entire repository or files |
|
3986 | """show revision history of entire repository or files | |
3987 |
|
3987 | |||
3988 | Print the revision history of the specified files or the entire |
|
3988 | Print the revision history of the specified files or the entire | |
3989 | project. |
|
3989 | project. | |
3990 |
|
3990 | |||
3991 | If no revision range is specified, the default is ``tip:0`` unless |
|
3991 | If no revision range is specified, the default is ``tip:0`` unless | |
3992 | --follow is set, in which case the working directory parent is |
|
3992 | --follow is set, in which case the working directory parent is | |
3993 | used as the starting revision. |
|
3993 | used as the starting revision. | |
3994 |
|
3994 | |||
3995 | File history is shown without following rename or copy history of |
|
3995 | File history is shown without following rename or copy history of | |
3996 | files. Use -f/--follow with a filename to follow history across |
|
3996 | files. Use -f/--follow with a filename to follow history across | |
3997 | renames and copies. --follow without a filename will only show |
|
3997 | renames and copies. --follow without a filename will only show | |
3998 | ancestors or descendants of the starting revision. |
|
3998 | ancestors or descendants of the starting revision. | |
3999 |
|
3999 | |||
4000 | By default this command prints revision number and changeset id, |
|
4000 | By default this command prints revision number and changeset id, | |
4001 | tags, non-trivial parents, user, date and time, and a summary for |
|
4001 | tags, non-trivial parents, user, date and time, and a summary for | |
4002 | each commit. When the -v/--verbose switch is used, the list of |
|
4002 | each commit. When the -v/--verbose switch is used, the list of | |
4003 | changed files and full commit message are shown. |
|
4003 | changed files and full commit message are shown. | |
4004 |
|
4004 | |||
4005 | .. note:: |
|
4005 | .. note:: | |
4006 |
|
4006 | |||
4007 | log -p/--patch may generate unexpected diff output for merge |
|
4007 | log -p/--patch may generate unexpected diff output for merge | |
4008 | changesets, as it will only compare the merge changeset against |
|
4008 | changesets, as it will only compare the merge changeset against | |
4009 | its first parent. Also, only files different from BOTH parents |
|
4009 | its first parent. Also, only files different from BOTH parents | |
4010 | will appear in files:. |
|
4010 | will appear in files:. | |
4011 |
|
4011 | |||
4012 | .. note:: |
|
4012 | .. note:: | |
4013 |
|
4013 | |||
4014 | for performance reasons, log FILE may omit duplicate changes |
|
4014 | for performance reasons, log FILE may omit duplicate changes | |
4015 | made on branches and will not show deletions. To see all |
|
4015 | made on branches and will not show deletions. To see all | |
4016 | changes including duplicates and deletions, use the --removed |
|
4016 | changes including duplicates and deletions, use the --removed | |
4017 | switch. |
|
4017 | switch. | |
4018 |
|
4018 | |||
4019 | .. container:: verbose |
|
4019 | .. container:: verbose | |
4020 |
|
4020 | |||
4021 | Some examples: |
|
4021 | Some examples: | |
4022 |
|
4022 | |||
4023 | - changesets with full descriptions and file lists:: |
|
4023 | - changesets with full descriptions and file lists:: | |
4024 |
|
4024 | |||
4025 | hg log -v |
|
4025 | hg log -v | |
4026 |
|
4026 | |||
4027 | - changesets ancestral to the working directory:: |
|
4027 | - changesets ancestral to the working directory:: | |
4028 |
|
4028 | |||
4029 | hg log -f |
|
4029 | hg log -f | |
4030 |
|
4030 | |||
4031 | - last 10 commits on the current branch:: |
|
4031 | - last 10 commits on the current branch:: | |
4032 |
|
4032 | |||
4033 | hg log -l 10 -b . |
|
4033 | hg log -l 10 -b . | |
4034 |
|
4034 | |||
4035 | - changesets showing all modifications of a file, including removals:: |
|
4035 | - changesets showing all modifications of a file, including removals:: | |
4036 |
|
4036 | |||
4037 | hg log --removed file.c |
|
4037 | hg log --removed file.c | |
4038 |
|
4038 | |||
4039 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
4039 | - all changesets that touch a directory, with diffs, excluding merges:: | |
4040 |
|
4040 | |||
4041 | hg log -Mp lib/ |
|
4041 | hg log -Mp lib/ | |
4042 |
|
4042 | |||
4043 | - all revision numbers that match a keyword:: |
|
4043 | - all revision numbers that match a keyword:: | |
4044 |
|
4044 | |||
4045 | hg log -k bug --template "{rev}\\n" |
|
4045 | hg log -k bug --template "{rev}\\n" | |
4046 |
|
4046 | |||
4047 | - check if a given changeset is included is a tagged release:: |
|
4047 | - check if a given changeset is included is a tagged release:: | |
4048 |
|
4048 | |||
4049 | hg log -r "a21ccf and ancestor(1.9)" |
|
4049 | hg log -r "a21ccf and ancestor(1.9)" | |
4050 |
|
4050 | |||
4051 | - find all changesets by some user in a date range:: |
|
4051 | - find all changesets by some user in a date range:: | |
4052 |
|
4052 | |||
4053 | hg log -k alice -d "may 2008 to jul 2008" |
|
4053 | hg log -k alice -d "may 2008 to jul 2008" | |
4054 |
|
4054 | |||
4055 | - summary of all changesets after the last tag:: |
|
4055 | - summary of all changesets after the last tag:: | |
4056 |
|
4056 | |||
4057 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
4057 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
4058 |
|
4058 | |||
4059 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4059 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4060 |
|
4060 | |||
4061 | See :hg:`help revisions` and :hg:`help revsets` for more about |
|
4061 | See :hg:`help revisions` and :hg:`help revsets` for more about | |
4062 | specifying revisions. |
|
4062 | specifying revisions. | |
4063 |
|
4063 | |||
4064 | See :hg:`help templates` for more about pre-packaged styles and |
|
4064 | See :hg:`help templates` for more about pre-packaged styles and | |
4065 | specifying custom templates. |
|
4065 | specifying custom templates. | |
4066 |
|
4066 | |||
4067 | Returns 0 on success. |
|
4067 | Returns 0 on success. | |
4068 | """ |
|
4068 | """ | |
4069 | if opts.get('graph'): |
|
4069 | if opts.get('graph'): | |
4070 | return cmdutil.graphlog(ui, repo, *pats, **opts) |
|
4070 | return cmdutil.graphlog(ui, repo, *pats, **opts) | |
4071 |
|
4071 | |||
4072 | matchfn = scmutil.match(repo[None], pats, opts) |
|
4072 | matchfn = scmutil.match(repo[None], pats, opts) | |
4073 | limit = cmdutil.loglimit(opts) |
|
4073 | limit = cmdutil.loglimit(opts) | |
4074 | count = 0 |
|
4074 | count = 0 | |
4075 |
|
4075 | |||
4076 | getrenamed, endrev = None, None |
|
4076 | getrenamed, endrev = None, None | |
4077 | if opts.get('copies'): |
|
4077 | if opts.get('copies'): | |
4078 | if opts.get('rev'): |
|
4078 | if opts.get('rev'): | |
4079 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 |
|
4079 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 | |
4080 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
4080 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
4081 |
|
4081 | |||
4082 | df = False |
|
4082 | df = False | |
4083 | if opts.get("date"): |
|
4083 | if opts.get("date"): | |
4084 | df = util.matchdate(opts["date"]) |
|
4084 | df = util.matchdate(opts["date"]) | |
4085 |
|
4085 | |||
4086 | branches = opts.get('branch', []) + opts.get('only_branch', []) |
|
4086 | branches = opts.get('branch', []) + opts.get('only_branch', []) | |
4087 | opts['branch'] = [repo.lookupbranch(b) for b in branches] |
|
4087 | opts['branch'] = [repo.lookupbranch(b) for b in branches] | |
4088 |
|
4088 | |||
4089 | displayer = cmdutil.show_changeset(ui, repo, opts, True) |
|
4089 | displayer = cmdutil.show_changeset(ui, repo, opts, True) | |
4090 | def prep(ctx, fns): |
|
4090 | def prep(ctx, fns): | |
4091 | rev = ctx.rev() |
|
4091 | rev = ctx.rev() | |
4092 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
4092 | parents = [p for p in repo.changelog.parentrevs(rev) | |
4093 | if p != nullrev] |
|
4093 | if p != nullrev] | |
4094 | if opts.get('no_merges') and len(parents) == 2: |
|
4094 | if opts.get('no_merges') and len(parents) == 2: | |
4095 | return |
|
4095 | return | |
4096 | if opts.get('only_merges') and len(parents) != 2: |
|
4096 | if opts.get('only_merges') and len(parents) != 2: | |
4097 | return |
|
4097 | return | |
4098 | if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
4098 | if opts.get('branch') and ctx.branch() not in opts['branch']: | |
4099 | return |
|
4099 | return | |
4100 | if df and not df(ctx.date()[0]): |
|
4100 | if df and not df(ctx.date()[0]): | |
4101 | return |
|
4101 | return | |
4102 |
|
4102 | |||
4103 | lower = encoding.lower |
|
4103 | lower = encoding.lower | |
4104 | if opts.get('user'): |
|
4104 | if opts.get('user'): | |
4105 | luser = lower(ctx.user()) |
|
4105 | luser = lower(ctx.user()) | |
4106 | for k in [lower(x) for x in opts['user']]: |
|
4106 | for k in [lower(x) for x in opts['user']]: | |
4107 | if (k in luser): |
|
4107 | if (k in luser): | |
4108 | break |
|
4108 | break | |
4109 | else: |
|
4109 | else: | |
4110 | return |
|
4110 | return | |
4111 | if opts.get('keyword'): |
|
4111 | if opts.get('keyword'): | |
4112 | luser = lower(ctx.user()) |
|
4112 | luser = lower(ctx.user()) | |
4113 | ldesc = lower(ctx.description()) |
|
4113 | ldesc = lower(ctx.description()) | |
4114 | lfiles = lower(" ".join(ctx.files())) |
|
4114 | lfiles = lower(" ".join(ctx.files())) | |
4115 | for k in [lower(x) for x in opts['keyword']]: |
|
4115 | for k in [lower(x) for x in opts['keyword']]: | |
4116 | if (k in luser or k in ldesc or k in lfiles): |
|
4116 | if (k in luser or k in ldesc or k in lfiles): | |
4117 | break |
|
4117 | break | |
4118 | else: |
|
4118 | else: | |
4119 | return |
|
4119 | return | |
4120 |
|
4120 | |||
4121 | copies = None |
|
4121 | copies = None | |
4122 | if getrenamed is not None and rev: |
|
4122 | if getrenamed is not None and rev: | |
4123 | copies = [] |
|
4123 | copies = [] | |
4124 | for fn in ctx.files(): |
|
4124 | for fn in ctx.files(): | |
4125 | rename = getrenamed(fn, rev) |
|
4125 | rename = getrenamed(fn, rev) | |
4126 | if rename: |
|
4126 | if rename: | |
4127 | copies.append((fn, rename[0])) |
|
4127 | copies.append((fn, rename[0])) | |
4128 |
|
4128 | |||
4129 | revmatchfn = None |
|
4129 | revmatchfn = None | |
4130 | if opts.get('patch') or opts.get('stat'): |
|
4130 | if opts.get('patch') or opts.get('stat'): | |
4131 | if opts.get('follow') or opts.get('follow_first'): |
|
4131 | if opts.get('follow') or opts.get('follow_first'): | |
4132 | # note: this might be wrong when following through merges |
|
4132 | # note: this might be wrong when following through merges | |
4133 | revmatchfn = scmutil.match(repo[None], fns, default='path') |
|
4133 | revmatchfn = scmutil.match(repo[None], fns, default='path') | |
4134 | else: |
|
4134 | else: | |
4135 | revmatchfn = matchfn |
|
4135 | revmatchfn = matchfn | |
4136 |
|
4136 | |||
4137 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
4137 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
4138 |
|
4138 | |||
4139 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
4139 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
4140 | if displayer.flush(ctx.rev()): |
|
4140 | if displayer.flush(ctx.rev()): | |
4141 | count += 1 |
|
4141 | count += 1 | |
4142 | if count == limit: |
|
4142 | if count == limit: | |
4143 | break |
|
4143 | break | |
4144 | displayer.close() |
|
4144 | displayer.close() | |
4145 |
|
4145 | |||
4146 | @command('manifest', |
|
4146 | @command('manifest', | |
4147 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
4147 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
4148 | ('', 'all', False, _("list files from all revisions"))], |
|
4148 | ('', 'all', False, _("list files from all revisions"))], | |
4149 | _('[-r REV]')) |
|
4149 | _('[-r REV]')) | |
4150 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
4150 | def manifest(ui, repo, node=None, rev=None, **opts): | |
4151 | """output the current or given revision of the project manifest |
|
4151 | """output the current or given revision of the project manifest | |
4152 |
|
4152 | |||
4153 | Print a list of version controlled files for the given revision. |
|
4153 | Print a list of version controlled files for the given revision. | |
4154 | If no revision is given, the first parent of the working directory |
|
4154 | If no revision is given, the first parent of the working directory | |
4155 | is used, or the null revision if no revision is checked out. |
|
4155 | is used, or the null revision if no revision is checked out. | |
4156 |
|
4156 | |||
4157 | With -v, print file permissions, symlink and executable bits. |
|
4157 | With -v, print file permissions, symlink and executable bits. | |
4158 | With --debug, print file revision hashes. |
|
4158 | With --debug, print file revision hashes. | |
4159 |
|
4159 | |||
4160 | If option --all is specified, the list of all files from all revisions |
|
4160 | If option --all is specified, the list of all files from all revisions | |
4161 | is printed. This includes deleted and renamed files. |
|
4161 | is printed. This includes deleted and renamed files. | |
4162 |
|
4162 | |||
4163 | Returns 0 on success. |
|
4163 | Returns 0 on success. | |
4164 | """ |
|
4164 | """ | |
4165 |
|
4165 | |||
4166 | fm = ui.formatter('manifest', opts) |
|
4166 | fm = ui.formatter('manifest', opts) | |
4167 |
|
4167 | |||
4168 | if opts.get('all'): |
|
4168 | if opts.get('all'): | |
4169 | if rev or node: |
|
4169 | if rev or node: | |
4170 | raise util.Abort(_("can't specify a revision with --all")) |
|
4170 | raise util.Abort(_("can't specify a revision with --all")) | |
4171 |
|
4171 | |||
4172 | res = [] |
|
4172 | res = [] | |
4173 | prefix = "data/" |
|
4173 | prefix = "data/" | |
4174 | suffix = ".i" |
|
4174 | suffix = ".i" | |
4175 | plen = len(prefix) |
|
4175 | plen = len(prefix) | |
4176 | slen = len(suffix) |
|
4176 | slen = len(suffix) | |
4177 | lock = repo.lock() |
|
4177 | lock = repo.lock() | |
4178 | try: |
|
4178 | try: | |
4179 | for fn, b, size in repo.store.datafiles(): |
|
4179 | for fn, b, size in repo.store.datafiles(): | |
4180 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
4180 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
4181 | res.append(fn[plen:-slen]) |
|
4181 | res.append(fn[plen:-slen]) | |
4182 | finally: |
|
4182 | finally: | |
4183 | lock.release() |
|
4183 | lock.release() | |
4184 | for f in res: |
|
4184 | for f in res: | |
4185 | fm.startitem() |
|
4185 | fm.startitem() | |
4186 | fm.write("path", '%s\n', f) |
|
4186 | fm.write("path", '%s\n', f) | |
4187 | fm.end() |
|
4187 | fm.end() | |
4188 | return |
|
4188 | return | |
4189 |
|
4189 | |||
4190 | if rev and node: |
|
4190 | if rev and node: | |
4191 | raise util.Abort(_("please specify just one revision")) |
|
4191 | raise util.Abort(_("please specify just one revision")) | |
4192 |
|
4192 | |||
4193 | if not node: |
|
4193 | if not node: | |
4194 | node = rev |
|
4194 | node = rev | |
4195 |
|
4195 | |||
4196 | char = {'l': '@', 'x': '*', '': ''} |
|
4196 | char = {'l': '@', 'x': '*', '': ''} | |
4197 | mode = {'l': '644', 'x': '755', '': '644'} |
|
4197 | mode = {'l': '644', 'x': '755', '': '644'} | |
4198 | ctx = scmutil.revsingle(repo, node) |
|
4198 | ctx = scmutil.revsingle(repo, node) | |
4199 | mf = ctx.manifest() |
|
4199 | mf = ctx.manifest() | |
4200 | for f in ctx: |
|
4200 | for f in ctx: | |
4201 | fm.startitem() |
|
4201 | fm.startitem() | |
4202 | fl = ctx[f].flags() |
|
4202 | fl = ctx[f].flags() | |
4203 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
4203 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
4204 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
4204 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
4205 | fm.write('path', '%s\n', f) |
|
4205 | fm.write('path', '%s\n', f) | |
4206 | fm.end() |
|
4206 | fm.end() | |
4207 |
|
4207 | |||
4208 | @command('^merge', |
|
4208 | @command('^merge', | |
4209 | [('f', 'force', None, |
|
4209 | [('f', 'force', None, | |
4210 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
4210 | _('force a merge including outstanding changes (DEPRECATED)')), | |
4211 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
4211 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
4212 | ('P', 'preview', None, |
|
4212 | ('P', 'preview', None, | |
4213 | _('review revisions to merge (no merge is performed)')) |
|
4213 | _('review revisions to merge (no merge is performed)')) | |
4214 | ] + mergetoolopts, |
|
4214 | ] + mergetoolopts, | |
4215 | _('[-P] [-f] [[-r] REV]')) |
|
4215 | _('[-P] [-f] [[-r] REV]')) | |
4216 | def merge(ui, repo, node=None, **opts): |
|
4216 | def merge(ui, repo, node=None, **opts): | |
4217 | """merge working directory with another revision |
|
4217 | """merge working directory with another revision | |
4218 |
|
4218 | |||
4219 | The current working directory is updated with all changes made in |
|
4219 | The current working directory is updated with all changes made in | |
4220 | the requested revision since the last common predecessor revision. |
|
4220 | the requested revision since the last common predecessor revision. | |
4221 |
|
4221 | |||
4222 | Files that changed between either parent are marked as changed for |
|
4222 | Files that changed between either parent are marked as changed for | |
4223 | the next commit and a commit must be performed before any further |
|
4223 | the next commit and a commit must be performed before any further | |
4224 | updates to the repository are allowed. The next commit will have |
|
4224 | updates to the repository are allowed. The next commit will have | |
4225 | two parents. |
|
4225 | two parents. | |
4226 |
|
4226 | |||
4227 | ``--tool`` can be used to specify the merge tool used for file |
|
4227 | ``--tool`` can be used to specify the merge tool used for file | |
4228 | merges. It overrides the HGMERGE environment variable and your |
|
4228 | merges. It overrides the HGMERGE environment variable and your | |
4229 | configuration files. See :hg:`help merge-tools` for options. |
|
4229 | configuration files. See :hg:`help merge-tools` for options. | |
4230 |
|
4230 | |||
4231 | If no revision is specified, the working directory's parent is a |
|
4231 | If no revision is specified, the working directory's parent is a | |
4232 | head revision, and the current branch contains exactly one other |
|
4232 | head revision, and the current branch contains exactly one other | |
4233 | head, the other head is merged with by default. Otherwise, an |
|
4233 | head, the other head is merged with by default. Otherwise, an | |
4234 | explicit revision with which to merge with must be provided. |
|
4234 | explicit revision with which to merge with must be provided. | |
4235 |
|
4235 | |||
4236 | :hg:`resolve` must be used to resolve unresolved files. |
|
4236 | :hg:`resolve` must be used to resolve unresolved files. | |
4237 |
|
4237 | |||
4238 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
4238 | To undo an uncommitted merge, use :hg:`update --clean .` which | |
4239 | will check out a clean copy of the original merge parent, losing |
|
4239 | will check out a clean copy of the original merge parent, losing | |
4240 | all changes. |
|
4240 | all changes. | |
4241 |
|
4241 | |||
4242 | Returns 0 on success, 1 if there are unresolved files. |
|
4242 | Returns 0 on success, 1 if there are unresolved files. | |
4243 | """ |
|
4243 | """ | |
4244 |
|
4244 | |||
4245 | if opts.get('rev') and node: |
|
4245 | if opts.get('rev') and node: | |
4246 | raise util.Abort(_("please specify just one revision")) |
|
4246 | raise util.Abort(_("please specify just one revision")) | |
4247 | if not node: |
|
4247 | if not node: | |
4248 | node = opts.get('rev') |
|
4248 | node = opts.get('rev') | |
4249 |
|
4249 | |||
4250 | if node: |
|
4250 | if node: | |
4251 | node = scmutil.revsingle(repo, node).node() |
|
4251 | node = scmutil.revsingle(repo, node).node() | |
4252 |
|
4252 | |||
4253 | if not node and repo._bookmarkcurrent: |
|
4253 | if not node and repo._bookmarkcurrent: | |
4254 | bmheads = repo.bookmarkheads(repo._bookmarkcurrent) |
|
4254 | bmheads = repo.bookmarkheads(repo._bookmarkcurrent) | |
4255 | curhead = repo[repo._bookmarkcurrent].node() |
|
4255 | curhead = repo[repo._bookmarkcurrent].node() | |
4256 | if len(bmheads) == 2: |
|
4256 | if len(bmheads) == 2: | |
4257 | if curhead == bmheads[0]: |
|
4257 | if curhead == bmheads[0]: | |
4258 | node = bmheads[1] |
|
4258 | node = bmheads[1] | |
4259 | else: |
|
4259 | else: | |
4260 | node = bmheads[0] |
|
4260 | node = bmheads[0] | |
4261 | elif len(bmheads) > 2: |
|
4261 | elif len(bmheads) > 2: | |
4262 | raise util.Abort(_("multiple matching bookmarks to merge - " |
|
4262 | raise util.Abort(_("multiple matching bookmarks to merge - " | |
4263 | "please merge with an explicit rev or bookmark"), |
|
4263 | "please merge with an explicit rev or bookmark"), | |
4264 | hint=_("run 'hg heads' to see all heads")) |
|
4264 | hint=_("run 'hg heads' to see all heads")) | |
4265 | elif len(bmheads) <= 1: |
|
4265 | elif len(bmheads) <= 1: | |
4266 | raise util.Abort(_("no matching bookmark to merge - " |
|
4266 | raise util.Abort(_("no matching bookmark to merge - " | |
4267 | "please merge with an explicit rev or bookmark"), |
|
4267 | "please merge with an explicit rev or bookmark"), | |
4268 | hint=_("run 'hg heads' to see all heads")) |
|
4268 | hint=_("run 'hg heads' to see all heads")) | |
4269 |
|
4269 | |||
4270 | if not node and not repo._bookmarkcurrent: |
|
4270 | if not node and not repo._bookmarkcurrent: | |
4271 | branch = repo[None].branch() |
|
4271 | branch = repo[None].branch() | |
4272 | bheads = repo.branchheads(branch) |
|
4272 | bheads = repo.branchheads(branch) | |
4273 | nbhs = [bh for bh in bheads if not repo[bh].bookmarks()] |
|
4273 | nbhs = [bh for bh in bheads if not repo[bh].bookmarks()] | |
4274 |
|
4274 | |||
4275 | if len(nbhs) > 2: |
|
4275 | if len(nbhs) > 2: | |
4276 | raise util.Abort(_("branch '%s' has %d heads - " |
|
4276 | raise util.Abort(_("branch '%s' has %d heads - " | |
4277 | "please merge with an explicit rev") |
|
4277 | "please merge with an explicit rev") | |
4278 | % (branch, len(bheads)), |
|
4278 | % (branch, len(bheads)), | |
4279 | hint=_("run 'hg heads .' to see heads")) |
|
4279 | hint=_("run 'hg heads .' to see heads")) | |
4280 |
|
4280 | |||
4281 | parent = repo.dirstate.p1() |
|
4281 | parent = repo.dirstate.p1() | |
4282 | if len(nbhs) <= 1: |
|
4282 | if len(nbhs) <= 1: | |
4283 | if len(bheads) > 1: |
|
4283 | if len(bheads) > 1: | |
4284 | raise util.Abort(_("heads are bookmarked - " |
|
4284 | raise util.Abort(_("heads are bookmarked - " | |
4285 | "please merge with an explicit rev"), |
|
4285 | "please merge with an explicit rev"), | |
4286 | hint=_("run 'hg heads' to see all heads")) |
|
4286 | hint=_("run 'hg heads' to see all heads")) | |
4287 | if len(repo.heads()) > 1: |
|
4287 | if len(repo.heads()) > 1: | |
4288 | raise util.Abort(_("branch '%s' has one head - " |
|
4288 | raise util.Abort(_("branch '%s' has one head - " | |
4289 | "please merge with an explicit rev") |
|
4289 | "please merge with an explicit rev") | |
4290 | % branch, |
|
4290 | % branch, | |
4291 | hint=_("run 'hg heads' to see all heads")) |
|
4291 | hint=_("run 'hg heads' to see all heads")) | |
4292 | msg, hint = _('nothing to merge'), None |
|
4292 | msg, hint = _('nothing to merge'), None | |
4293 | if parent != repo.lookup(branch): |
|
4293 | if parent != repo.lookup(branch): | |
4294 | hint = _("use 'hg update' instead") |
|
4294 | hint = _("use 'hg update' instead") | |
4295 | raise util.Abort(msg, hint=hint) |
|
4295 | raise util.Abort(msg, hint=hint) | |
4296 |
|
4296 | |||
4297 | if parent not in bheads: |
|
4297 | if parent not in bheads: | |
4298 | raise util.Abort(_('working directory not at a head revision'), |
|
4298 | raise util.Abort(_('working directory not at a head revision'), | |
4299 | hint=_("use 'hg update' or merge with an " |
|
4299 | hint=_("use 'hg update' or merge with an " | |
4300 | "explicit revision")) |
|
4300 | "explicit revision")) | |
4301 | if parent == nbhs[0]: |
|
4301 | if parent == nbhs[0]: | |
4302 | node = nbhs[-1] |
|
4302 | node = nbhs[-1] | |
4303 | else: |
|
4303 | else: | |
4304 | node = nbhs[0] |
|
4304 | node = nbhs[0] | |
4305 |
|
4305 | |||
4306 | if opts.get('preview'): |
|
4306 | if opts.get('preview'): | |
4307 | # find nodes that are ancestors of p2 but not of p1 |
|
4307 | # find nodes that are ancestors of p2 but not of p1 | |
4308 | p1 = repo.lookup('.') |
|
4308 | p1 = repo.lookup('.') | |
4309 | p2 = repo.lookup(node) |
|
4309 | p2 = repo.lookup(node) | |
4310 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
4310 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
4311 |
|
4311 | |||
4312 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4312 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4313 | for node in nodes: |
|
4313 | for node in nodes: | |
4314 | displayer.show(repo[node]) |
|
4314 | displayer.show(repo[node]) | |
4315 | displayer.close() |
|
4315 | displayer.close() | |
4316 | return 0 |
|
4316 | return 0 | |
4317 |
|
4317 | |||
4318 | try: |
|
4318 | try: | |
4319 | # ui.forcemerge is an internal variable, do not document |
|
4319 | # ui.forcemerge is an internal variable, do not document | |
4320 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
4320 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
4321 | return hg.merge(repo, node, force=opts.get('force')) |
|
4321 | return hg.merge(repo, node, force=opts.get('force')) | |
4322 | finally: |
|
4322 | finally: | |
4323 | ui.setconfig('ui', 'forcemerge', '') |
|
4323 | ui.setconfig('ui', 'forcemerge', '') | |
4324 |
|
4324 | |||
4325 | @command('outgoing|out', |
|
4325 | @command('outgoing|out', | |
4326 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
4326 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
4327 | ('r', 'rev', [], |
|
4327 | ('r', 'rev', [], | |
4328 | _('a changeset intended to be included in the destination'), _('REV')), |
|
4328 | _('a changeset intended to be included in the destination'), _('REV')), | |
4329 | ('n', 'newest-first', None, _('show newest record first')), |
|
4329 | ('n', 'newest-first', None, _('show newest record first')), | |
4330 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
4330 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
4331 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
4331 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
4332 | _('BRANCH')), |
|
4332 | _('BRANCH')), | |
4333 | ] + logopts + remoteopts + subrepoopts, |
|
4333 | ] + logopts + remoteopts + subrepoopts, | |
4334 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
4334 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
4335 | def outgoing(ui, repo, dest=None, **opts): |
|
4335 | def outgoing(ui, repo, dest=None, **opts): | |
4336 | """show changesets not found in the destination |
|
4336 | """show changesets not found in the destination | |
4337 |
|
4337 | |||
4338 | Show changesets not found in the specified destination repository |
|
4338 | Show changesets not found in the specified destination repository | |
4339 | or the default push location. These are the changesets that would |
|
4339 | or the default push location. These are the changesets that would | |
4340 | be pushed if a push was requested. |
|
4340 | be pushed if a push was requested. | |
4341 |
|
4341 | |||
4342 | See pull for details of valid destination formats. |
|
4342 | See pull for details of valid destination formats. | |
4343 |
|
4343 | |||
4344 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
4344 | Returns 0 if there are outgoing changes, 1 otherwise. | |
4345 | """ |
|
4345 | """ | |
4346 | if opts.get('graph'): |
|
4346 | if opts.get('graph'): | |
4347 | cmdutil.checkunsupportedgraphflags([], opts) |
|
4347 | cmdutil.checkunsupportedgraphflags([], opts) | |
4348 | o = hg._outgoing(ui, repo, dest, opts) |
|
4348 | o = hg._outgoing(ui, repo, dest, opts) | |
4349 | if o is None: |
|
4349 | if o is None: | |
4350 | return |
|
4350 | return | |
4351 |
|
4351 | |||
4352 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
4352 | revdag = cmdutil.graphrevs(repo, o, opts) | |
4353 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
4353 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
4354 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
4354 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
4355 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
4355 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
4356 | graphmod.asciiedges) |
|
4356 | graphmod.asciiedges) | |
4357 | return 0 |
|
4357 | return 0 | |
4358 |
|
4358 | |||
4359 | if opts.get('bookmarks'): |
|
4359 | if opts.get('bookmarks'): | |
4360 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4360 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
4361 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4361 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
4362 | other = hg.peer(repo, opts, dest) |
|
4362 | other = hg.peer(repo, opts, dest) | |
4363 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
4363 | if 'bookmarks' not in other.listkeys('namespaces'): | |
4364 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
4364 | ui.warn(_("remote doesn't support bookmarks\n")) | |
4365 | return 0 |
|
4365 | return 0 | |
4366 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
4366 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
4367 | return bookmarks.diff(ui, other, repo) |
|
4367 | return bookmarks.diff(ui, other, repo) | |
4368 |
|
4368 | |||
4369 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4369 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
4370 | try: |
|
4370 | try: | |
4371 | return hg.outgoing(ui, repo, dest, opts) |
|
4371 | return hg.outgoing(ui, repo, dest, opts) | |
4372 | finally: |
|
4372 | finally: | |
4373 | del repo._subtoppath |
|
4373 | del repo._subtoppath | |
4374 |
|
4374 | |||
4375 | @command('parents', |
|
4375 | @command('parents', | |
4376 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
4376 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
4377 | ] + templateopts, |
|
4377 | ] + templateopts, | |
4378 | _('[-r REV] [FILE]')) |
|
4378 | _('[-r REV] [FILE]')) | |
4379 | def parents(ui, repo, file_=None, **opts): |
|
4379 | def parents(ui, repo, file_=None, **opts): | |
4380 | """show the parents of the working directory or revision |
|
4380 | """show the parents of the working directory or revision | |
4381 |
|
4381 | |||
4382 | Print the working directory's parent revisions. If a revision is |
|
4382 | Print the working directory's parent revisions. If a revision is | |
4383 | given via -r/--rev, the parent of that revision will be printed. |
|
4383 | given via -r/--rev, the parent of that revision will be printed. | |
4384 | If a file argument is given, the revision in which the file was |
|
4384 | If a file argument is given, the revision in which the file was | |
4385 | last changed (before the working directory revision or the |
|
4385 | last changed (before the working directory revision or the | |
4386 | argument to --rev if given) is printed. |
|
4386 | argument to --rev if given) is printed. | |
4387 |
|
4387 | |||
4388 | Returns 0 on success. |
|
4388 | Returns 0 on success. | |
4389 | """ |
|
4389 | """ | |
4390 |
|
4390 | |||
4391 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
4391 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
4392 |
|
4392 | |||
4393 | if file_: |
|
4393 | if file_: | |
4394 | m = scmutil.match(ctx, (file_,), opts) |
|
4394 | m = scmutil.match(ctx, (file_,), opts) | |
4395 | if m.anypats() or len(m.files()) != 1: |
|
4395 | if m.anypats() or len(m.files()) != 1: | |
4396 | raise util.Abort(_('can only specify an explicit filename')) |
|
4396 | raise util.Abort(_('can only specify an explicit filename')) | |
4397 | file_ = m.files()[0] |
|
4397 | file_ = m.files()[0] | |
4398 | filenodes = [] |
|
4398 | filenodes = [] | |
4399 | for cp in ctx.parents(): |
|
4399 | for cp in ctx.parents(): | |
4400 | if not cp: |
|
4400 | if not cp: | |
4401 | continue |
|
4401 | continue | |
4402 | try: |
|
4402 | try: | |
4403 | filenodes.append(cp.filenode(file_)) |
|
4403 | filenodes.append(cp.filenode(file_)) | |
4404 | except error.LookupError: |
|
4404 | except error.LookupError: | |
4405 | pass |
|
4405 | pass | |
4406 | if not filenodes: |
|
4406 | if not filenodes: | |
4407 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
4407 | raise util.Abort(_("'%s' not found in manifest!") % file_) | |
4408 | p = [] |
|
4408 | p = [] | |
4409 | for fn in filenodes: |
|
4409 | for fn in filenodes: | |
4410 | fctx = repo.filectx(file_, fileid=fn) |
|
4410 | fctx = repo.filectx(file_, fileid=fn) | |
4411 | p.append(fctx.node()) |
|
4411 | p.append(fctx.node()) | |
4412 | else: |
|
4412 | else: | |
4413 | p = [cp.node() for cp in ctx.parents()] |
|
4413 | p = [cp.node() for cp in ctx.parents()] | |
4414 |
|
4414 | |||
4415 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4415 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4416 | for n in p: |
|
4416 | for n in p: | |
4417 | if n != nullid: |
|
4417 | if n != nullid: | |
4418 | displayer.show(repo[n]) |
|
4418 | displayer.show(repo[n]) | |
4419 | displayer.close() |
|
4419 | displayer.close() | |
4420 |
|
4420 | |||
4421 | @command('paths', [], _('[NAME]')) |
|
4421 | @command('paths', [], _('[NAME]')) | |
4422 | def paths(ui, repo, search=None): |
|
4422 | def paths(ui, repo, search=None): | |
4423 | """show aliases for remote repositories |
|
4423 | """show aliases for remote repositories | |
4424 |
|
4424 | |||
4425 | Show definition of symbolic path name NAME. If no name is given, |
|
4425 | Show definition of symbolic path name NAME. If no name is given, | |
4426 | show definition of all available names. |
|
4426 | show definition of all available names. | |
4427 |
|
4427 | |||
4428 | Option -q/--quiet suppresses all output when searching for NAME |
|
4428 | Option -q/--quiet suppresses all output when searching for NAME | |
4429 | and shows only the path names when listing all definitions. |
|
4429 | and shows only the path names when listing all definitions. | |
4430 |
|
4430 | |||
4431 | Path names are defined in the [paths] section of your |
|
4431 | Path names are defined in the [paths] section of your | |
4432 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
4432 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
4433 | repository, ``.hg/hgrc`` is used, too. |
|
4433 | repository, ``.hg/hgrc`` is used, too. | |
4434 |
|
4434 | |||
4435 | The path names ``default`` and ``default-push`` have a special |
|
4435 | The path names ``default`` and ``default-push`` have a special | |
4436 | meaning. When performing a push or pull operation, they are used |
|
4436 | meaning. When performing a push or pull operation, they are used | |
4437 | as fallbacks if no location is specified on the command-line. |
|
4437 | as fallbacks if no location is specified on the command-line. | |
4438 | When ``default-push`` is set, it will be used for push and |
|
4438 | When ``default-push`` is set, it will be used for push and | |
4439 | ``default`` will be used for pull; otherwise ``default`` is used |
|
4439 | ``default`` will be used for pull; otherwise ``default`` is used | |
4440 | as the fallback for both. When cloning a repository, the clone |
|
4440 | as the fallback for both. When cloning a repository, the clone | |
4441 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
4441 | source is written as ``default`` in ``.hg/hgrc``. Note that | |
4442 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
4442 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
4443 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
4443 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and | |
4444 | :hg:`bundle`) operations. |
|
4444 | :hg:`bundle`) operations. | |
4445 |
|
4445 | |||
4446 | See :hg:`help urls` for more information. |
|
4446 | See :hg:`help urls` for more information. | |
4447 |
|
4447 | |||
4448 | Returns 0 on success. |
|
4448 | Returns 0 on success. | |
4449 | """ |
|
4449 | """ | |
4450 | if search: |
|
4450 | if search: | |
4451 | for name, path in ui.configitems("paths"): |
|
4451 | for name, path in ui.configitems("paths"): | |
4452 | if name == search: |
|
4452 | if name == search: | |
4453 | ui.status("%s\n" % util.hidepassword(path)) |
|
4453 | ui.status("%s\n" % util.hidepassword(path)) | |
4454 | return |
|
4454 | return | |
4455 | if not ui.quiet: |
|
4455 | if not ui.quiet: | |
4456 | ui.warn(_("not found!\n")) |
|
4456 | ui.warn(_("not found!\n")) | |
4457 | return 1 |
|
4457 | return 1 | |
4458 | else: |
|
4458 | else: | |
4459 | for name, path in ui.configitems("paths"): |
|
4459 | for name, path in ui.configitems("paths"): | |
4460 | if ui.quiet: |
|
4460 | if ui.quiet: | |
4461 | ui.write("%s\n" % name) |
|
4461 | ui.write("%s\n" % name) | |
4462 | else: |
|
4462 | else: | |
4463 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) |
|
4463 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) | |
4464 |
|
4464 | |||
4465 | @command('phase', |
|
4465 | @command('phase', | |
4466 | [('p', 'public', False, _('set changeset phase to public')), |
|
4466 | [('p', 'public', False, _('set changeset phase to public')), | |
4467 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
4467 | ('d', 'draft', False, _('set changeset phase to draft')), | |
4468 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
4468 | ('s', 'secret', False, _('set changeset phase to secret')), | |
4469 | ('f', 'force', False, _('allow to move boundary backward')), |
|
4469 | ('f', 'force', False, _('allow to move boundary backward')), | |
4470 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
4470 | ('r', 'rev', [], _('target revision'), _('REV')), | |
4471 | ], |
|
4471 | ], | |
4472 | _('[-p|-d|-s] [-f] [-r] REV...')) |
|
4472 | _('[-p|-d|-s] [-f] [-r] REV...')) | |
4473 | def phase(ui, repo, *revs, **opts): |
|
4473 | def phase(ui, repo, *revs, **opts): | |
4474 | """set or show the current phase name |
|
4474 | """set or show the current phase name | |
4475 |
|
4475 | |||
4476 | With no argument, show the phase name of specified revisions. |
|
4476 | With no argument, show the phase name of specified revisions. | |
4477 |
|
4477 | |||
4478 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
4478 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
4479 | phase value of the specified revisions. |
|
4479 | phase value of the specified revisions. | |
4480 |
|
4480 | |||
4481 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
|
4481 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a | |
4482 | lower phase to an higher phase. Phases are ordered as follows:: |
|
4482 | lower phase to an higher phase. Phases are ordered as follows:: | |
4483 |
|
4483 | |||
4484 | public < draft < secret |
|
4484 | public < draft < secret | |
4485 |
|
4485 | |||
4486 | Return 0 on success, 1 if no phases were changed or some could not |
|
4486 | Return 0 on success, 1 if no phases were changed or some could not | |
4487 | be changed. |
|
4487 | be changed. | |
4488 | """ |
|
4488 | """ | |
4489 | # search for a unique phase argument |
|
4489 | # search for a unique phase argument | |
4490 | targetphase = None |
|
4490 | targetphase = None | |
4491 | for idx, name in enumerate(phases.phasenames): |
|
4491 | for idx, name in enumerate(phases.phasenames): | |
4492 | if opts[name]: |
|
4492 | if opts[name]: | |
4493 | if targetphase is not None: |
|
4493 | if targetphase is not None: | |
4494 | raise util.Abort(_('only one phase can be specified')) |
|
4494 | raise util.Abort(_('only one phase can be specified')) | |
4495 | targetphase = idx |
|
4495 | targetphase = idx | |
4496 |
|
4496 | |||
4497 | # look for specified revision |
|
4497 | # look for specified revision | |
4498 | revs = list(revs) |
|
4498 | revs = list(revs) | |
4499 | revs.extend(opts['rev']) |
|
4499 | revs.extend(opts['rev']) | |
4500 | if not revs: |
|
4500 | if not revs: | |
4501 | raise util.Abort(_('no revisions specified')) |
|
4501 | raise util.Abort(_('no revisions specified')) | |
4502 |
|
4502 | |||
4503 | revs = scmutil.revrange(repo, revs) |
|
4503 | revs = scmutil.revrange(repo, revs) | |
4504 |
|
4504 | |||
4505 | lock = None |
|
4505 | lock = None | |
4506 | ret = 0 |
|
4506 | ret = 0 | |
4507 | if targetphase is None: |
|
4507 | if targetphase is None: | |
4508 | # display |
|
4508 | # display | |
4509 | for r in revs: |
|
4509 | for r in revs: | |
4510 | ctx = repo[r] |
|
4510 | ctx = repo[r] | |
4511 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
4511 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
4512 | else: |
|
4512 | else: | |
4513 | lock = repo.lock() |
|
4513 | lock = repo.lock() | |
4514 | try: |
|
4514 | try: | |
4515 | # set phase |
|
4515 | # set phase | |
4516 | if not revs: |
|
4516 | if not revs: | |
4517 | raise util.Abort(_('empty revision set')) |
|
4517 | raise util.Abort(_('empty revision set')) | |
4518 | nodes = [repo[r].node() for r in revs] |
|
4518 | nodes = [repo[r].node() for r in revs] | |
4519 | olddata = repo._phasecache.getphaserevs(repo)[:] |
|
4519 | olddata = repo._phasecache.getphaserevs(repo)[:] | |
4520 | phases.advanceboundary(repo, targetphase, nodes) |
|
4520 | phases.advanceboundary(repo, targetphase, nodes) | |
4521 | if opts['force']: |
|
4521 | if opts['force']: | |
4522 | phases.retractboundary(repo, targetphase, nodes) |
|
4522 | phases.retractboundary(repo, targetphase, nodes) | |
4523 | finally: |
|
4523 | finally: | |
4524 | lock.release() |
|
4524 | lock.release() | |
4525 | # moving revision from public to draft may hide them |
|
4525 | # moving revision from public to draft may hide them | |
4526 | # We have to check result on an unfiltered repository |
|
4526 | # We have to check result on an unfiltered repository | |
4527 | unfi = repo.unfiltered() |
|
4527 | unfi = repo.unfiltered() | |
4528 | newdata = repo._phasecache.getphaserevs(unfi) |
|
4528 | newdata = repo._phasecache.getphaserevs(unfi) | |
4529 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) |
|
4529 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) | |
4530 | cl = unfi.changelog |
|
4530 | cl = unfi.changelog | |
4531 | rejected = [n for n in nodes |
|
4531 | rejected = [n for n in nodes | |
4532 | if newdata[cl.rev(n)] < targetphase] |
|
4532 | if newdata[cl.rev(n)] < targetphase] | |
4533 | if rejected: |
|
4533 | if rejected: | |
4534 | ui.warn(_('cannot move %i changesets to a higher ' |
|
4534 | ui.warn(_('cannot move %i changesets to a higher ' | |
4535 | 'phase, use --force\n') % len(rejected)) |
|
4535 | 'phase, use --force\n') % len(rejected)) | |
4536 | ret = 1 |
|
4536 | ret = 1 | |
4537 | if changes: |
|
4537 | if changes: | |
4538 | msg = _('phase changed for %i changesets\n') % changes |
|
4538 | msg = _('phase changed for %i changesets\n') % changes | |
4539 | if ret: |
|
4539 | if ret: | |
4540 | ui.status(msg) |
|
4540 | ui.status(msg) | |
4541 | else: |
|
4541 | else: | |
4542 | ui.note(msg) |
|
4542 | ui.note(msg) | |
4543 | else: |
|
4543 | else: | |
4544 | ui.warn(_('no phases changed\n')) |
|
4544 | ui.warn(_('no phases changed\n')) | |
4545 | ret = 1 |
|
4545 | ret = 1 | |
4546 | return ret |
|
4546 | return ret | |
4547 |
|
4547 | |||
4548 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
4548 | def postincoming(ui, repo, modheads, optupdate, checkout): | |
4549 | if modheads == 0: |
|
4549 | if modheads == 0: | |
4550 | return |
|
4550 | return | |
4551 | if optupdate: |
|
4551 | if optupdate: | |
4552 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) |
|
4552 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) | |
4553 | try: |
|
4553 | try: | |
4554 | ret = hg.update(repo, checkout) |
|
4554 | ret = hg.update(repo, checkout) | |
4555 | except util.Abort, inst: |
|
4555 | except util.Abort, inst: | |
4556 | ui.warn(_("not updating: %s\n") % str(inst)) |
|
4556 | ui.warn(_("not updating: %s\n") % str(inst)) | |
4557 | if inst.hint: |
|
4557 | if inst.hint: | |
4558 | ui.warn(_("(%s)\n") % inst.hint) |
|
4558 | ui.warn(_("(%s)\n") % inst.hint) | |
4559 | return 0 |
|
4559 | return 0 | |
4560 | if not ret and not checkout: |
|
4560 | if not ret and not checkout: | |
4561 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
4561 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
4562 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
4562 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |
4563 | return ret |
|
4563 | return ret | |
4564 | if modheads > 1: |
|
4564 | if modheads > 1: | |
4565 | currentbranchheads = len(repo.branchheads()) |
|
4565 | currentbranchheads = len(repo.branchheads()) | |
4566 | if currentbranchheads == modheads: |
|
4566 | if currentbranchheads == modheads: | |
4567 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
4567 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
4568 | elif currentbranchheads > 1: |
|
4568 | elif currentbranchheads > 1: | |
4569 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
4569 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
4570 | "merge)\n")) |
|
4570 | "merge)\n")) | |
4571 | else: |
|
4571 | else: | |
4572 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
4572 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
4573 | else: |
|
4573 | else: | |
4574 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
4574 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
4575 |
|
4575 | |||
4576 | @command('^pull', |
|
4576 | @command('^pull', | |
4577 | [('u', 'update', None, |
|
4577 | [('u', 'update', None, | |
4578 | _('update to new branch head if changesets were pulled')), |
|
4578 | _('update to new branch head if changesets were pulled')), | |
4579 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
4579 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
4580 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
4580 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
4581 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
4581 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
4582 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
4582 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
4583 | _('BRANCH')), |
|
4583 | _('BRANCH')), | |
4584 | ] + remoteopts, |
|
4584 | ] + remoteopts, | |
4585 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
4585 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
4586 | def pull(ui, repo, source="default", **opts): |
|
4586 | def pull(ui, repo, source="default", **opts): | |
4587 | """pull changes from the specified source |
|
4587 | """pull changes from the specified source | |
4588 |
|
4588 | |||
4589 | Pull changes from a remote repository to a local one. |
|
4589 | Pull changes from a remote repository to a local one. | |
4590 |
|
4590 | |||
4591 | This finds all changes from the repository at the specified path |
|
4591 | This finds all changes from the repository at the specified path | |
4592 | or URL and adds them to a local repository (the current one unless |
|
4592 | or URL and adds them to a local repository (the current one unless | |
4593 | -R is specified). By default, this does not update the copy of the |
|
4593 | -R is specified). By default, this does not update the copy of the | |
4594 | project in the working directory. |
|
4594 | project in the working directory. | |
4595 |
|
4595 | |||
4596 | Use :hg:`incoming` if you want to see what would have been added |
|
4596 | Use :hg:`incoming` if you want to see what would have been added | |
4597 | by a pull at the time you issued this command. If you then decide |
|
4597 | by a pull at the time you issued this command. If you then decide | |
4598 | to add those changes to the repository, you should use :hg:`pull |
|
4598 | to add those changes to the repository, you should use :hg:`pull | |
4599 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
4599 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
4600 |
|
4600 | |||
4601 | If SOURCE is omitted, the 'default' path will be used. |
|
4601 | If SOURCE is omitted, the 'default' path will be used. | |
4602 | See :hg:`help urls` for more information. |
|
4602 | See :hg:`help urls` for more information. | |
4603 |
|
4603 | |||
4604 | Returns 0 on success, 1 if an update had unresolved files. |
|
4604 | Returns 0 on success, 1 if an update had unresolved files. | |
4605 | """ |
|
4605 | """ | |
4606 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
4606 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
4607 | other = hg.peer(repo, opts, source) |
|
4607 | other = hg.peer(repo, opts, source) | |
4608 | try: |
|
4608 | try: | |
4609 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
4609 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
4610 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
4610 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
4611 | opts.get('rev')) |
|
4611 | opts.get('rev')) | |
4612 |
|
4612 | |||
4613 | remotebookmarks = other.listkeys('bookmarks') |
|
4613 | remotebookmarks = other.listkeys('bookmarks') | |
4614 |
|
4614 | |||
4615 | if opts.get('bookmark'): |
|
4615 | if opts.get('bookmark'): | |
4616 | if not revs: |
|
4616 | if not revs: | |
4617 | revs = [] |
|
4617 | revs = [] | |
4618 | for b in opts['bookmark']: |
|
4618 | for b in opts['bookmark']: | |
4619 | if b not in remotebookmarks: |
|
4619 | if b not in remotebookmarks: | |
4620 | raise util.Abort(_('remote bookmark %s not found!') % b) |
|
4620 | raise util.Abort(_('remote bookmark %s not found!') % b) | |
4621 | revs.append(remotebookmarks[b]) |
|
4621 | revs.append(remotebookmarks[b]) | |
4622 |
|
4622 | |||
4623 | if revs: |
|
4623 | if revs: | |
4624 | try: |
|
4624 | try: | |
4625 | revs = [other.lookup(rev) for rev in revs] |
|
4625 | revs = [other.lookup(rev) for rev in revs] | |
4626 | except error.CapabilityError: |
|
4626 | except error.CapabilityError: | |
4627 | err = _("other repository doesn't support revision lookup, " |
|
4627 | err = _("other repository doesn't support revision lookup, " | |
4628 | "so a rev cannot be specified.") |
|
4628 | "so a rev cannot be specified.") | |
4629 | raise util.Abort(err) |
|
4629 | raise util.Abort(err) | |
4630 |
|
4630 | |||
4631 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
4631 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) | |
4632 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) |
|
4632 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) | |
4633 | if checkout: |
|
4633 | if checkout: | |
4634 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
4634 | checkout = str(repo.changelog.rev(other.lookup(checkout))) | |
4635 | repo._subtoppath = source |
|
4635 | repo._subtoppath = source | |
4636 | try: |
|
4636 | try: | |
4637 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
4637 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) | |
4638 |
|
4638 | |||
4639 | finally: |
|
4639 | finally: | |
4640 | del repo._subtoppath |
|
4640 | del repo._subtoppath | |
4641 |
|
4641 | |||
4642 | # update specified bookmarks |
|
4642 | # update specified bookmarks | |
4643 | if opts.get('bookmark'): |
|
4643 | if opts.get('bookmark'): | |
4644 | marks = repo._bookmarks |
|
4644 | marks = repo._bookmarks | |
4645 | for b in opts['bookmark']: |
|
4645 | for b in opts['bookmark']: | |
4646 | # explicit pull overrides local bookmark if any |
|
4646 | # explicit pull overrides local bookmark if any | |
4647 | ui.status(_("importing bookmark %s\n") % b) |
|
4647 | ui.status(_("importing bookmark %s\n") % b) | |
4648 | marks[b] = repo[remotebookmarks[b]].node() |
|
4648 | marks[b] = repo[remotebookmarks[b]].node() | |
4649 | marks.write() |
|
4649 | marks.write() | |
4650 | finally: |
|
4650 | finally: | |
4651 | other.close() |
|
4651 | other.close() | |
4652 | return ret |
|
4652 | return ret | |
4653 |
|
4653 | |||
4654 | @command('^push', |
|
4654 | @command('^push', | |
4655 | [('f', 'force', None, _('force push')), |
|
4655 | [('f', 'force', None, _('force push')), | |
4656 | ('r', 'rev', [], |
|
4656 | ('r', 'rev', [], | |
4657 | _('a changeset intended to be included in the destination'), |
|
4657 | _('a changeset intended to be included in the destination'), | |
4658 | _('REV')), |
|
4658 | _('REV')), | |
4659 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4659 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
4660 | ('b', 'branch', [], |
|
4660 | ('b', 'branch', [], | |
4661 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4661 | _('a specific branch you would like to push'), _('BRANCH')), | |
4662 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4662 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
4663 | ] + remoteopts, |
|
4663 | ] + remoteopts, | |
4664 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4664 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
4665 | def push(ui, repo, dest=None, **opts): |
|
4665 | def push(ui, repo, dest=None, **opts): | |
4666 | """push changes to the specified destination |
|
4666 | """push changes to the specified destination | |
4667 |
|
4667 | |||
4668 | Push changesets from the local repository to the specified |
|
4668 | Push changesets from the local repository to the specified | |
4669 | destination. |
|
4669 | destination. | |
4670 |
|
4670 | |||
4671 | This operation is symmetrical to pull: it is identical to a pull |
|
4671 | This operation is symmetrical to pull: it is identical to a pull | |
4672 | in the destination repository from the current one. |
|
4672 | in the destination repository from the current one. | |
4673 |
|
4673 | |||
4674 | By default, push will not allow creation of new heads at the |
|
4674 | By default, push will not allow creation of new heads at the | |
4675 | destination, since multiple heads would make it unclear which head |
|
4675 | destination, since multiple heads would make it unclear which head | |
4676 | to use. In this situation, it is recommended to pull and merge |
|
4676 | to use. In this situation, it is recommended to pull and merge | |
4677 | before pushing. |
|
4677 | before pushing. | |
4678 |
|
4678 | |||
4679 | Use --new-branch if you want to allow push to create a new named |
|
4679 | Use --new-branch if you want to allow push to create a new named | |
4680 | branch that is not present at the destination. This allows you to |
|
4680 | branch that is not present at the destination. This allows you to | |
4681 | only create a new branch without forcing other changes. |
|
4681 | only create a new branch without forcing other changes. | |
4682 |
|
4682 | |||
4683 | .. note:: |
|
4683 | .. note:: | |
4684 |
|
4684 | |||
4685 | Extra care should be taken with the -f/--force option, |
|
4685 | Extra care should be taken with the -f/--force option, | |
4686 | which will push all new heads on all branches, an action which will |
|
4686 | which will push all new heads on all branches, an action which will | |
4687 | almost always cause confusion for collaborators. |
|
4687 | almost always cause confusion for collaborators. | |
4688 |
|
4688 | |||
4689 | If -r/--rev is used, the specified revision and all its ancestors |
|
4689 | If -r/--rev is used, the specified revision and all its ancestors | |
4690 | will be pushed to the remote repository. |
|
4690 | will be pushed to the remote repository. | |
4691 |
|
4691 | |||
4692 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4692 | If -B/--bookmark is used, the specified bookmarked revision, its | |
4693 | ancestors, and the bookmark will be pushed to the remote |
|
4693 | ancestors, and the bookmark will be pushed to the remote | |
4694 | repository. |
|
4694 | repository. | |
4695 |
|
4695 | |||
4696 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4696 | Please see :hg:`help urls` for important details about ``ssh://`` | |
4697 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4697 | URLs. If DESTINATION is omitted, a default path will be used. | |
4698 |
|
4698 | |||
4699 | Returns 0 if push was successful, 1 if nothing to push. |
|
4699 | Returns 0 if push was successful, 1 if nothing to push. | |
4700 | """ |
|
4700 | """ | |
4701 |
|
4701 | |||
4702 | if opts.get('bookmark'): |
|
4702 | if opts.get('bookmark'): | |
4703 | ui.setconfig('bookmarks', 'pushing', opts['bookmark']) |
|
4703 | ui.setconfig('bookmarks', 'pushing', opts['bookmark']) | |
4704 | for b in opts['bookmark']: |
|
4704 | for b in opts['bookmark']: | |
4705 | # translate -B options to -r so changesets get pushed |
|
4705 | # translate -B options to -r so changesets get pushed | |
4706 | if b in repo._bookmarks: |
|
4706 | if b in repo._bookmarks: | |
4707 | opts.setdefault('rev', []).append(b) |
|
4707 | opts.setdefault('rev', []).append(b) | |
4708 | else: |
|
4708 | else: | |
4709 | # if we try to push a deleted bookmark, translate it to null |
|
4709 | # if we try to push a deleted bookmark, translate it to null | |
4710 | # this lets simultaneous -r, -b options continue working |
|
4710 | # this lets simultaneous -r, -b options continue working | |
4711 | opts.setdefault('rev', []).append("null") |
|
4711 | opts.setdefault('rev', []).append("null") | |
4712 |
|
4712 | |||
4713 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4713 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
4714 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4714 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
4715 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4715 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
4716 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4716 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
4717 | other = hg.peer(repo, opts, dest) |
|
4717 | other = hg.peer(repo, opts, dest) | |
4718 | if revs: |
|
4718 | if revs: | |
4719 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4719 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
4720 |
|
4720 | |||
4721 | repo._subtoppath = dest |
|
4721 | repo._subtoppath = dest | |
4722 | try: |
|
4722 | try: | |
4723 | # push subrepos depth-first for coherent ordering |
|
4723 | # push subrepos depth-first for coherent ordering | |
4724 | c = repo[''] |
|
4724 | c = repo[''] | |
4725 | subs = c.substate # only repos that are committed |
|
4725 | subs = c.substate # only repos that are committed | |
4726 | for s in sorted(subs): |
|
4726 | for s in sorted(subs): | |
4727 | if c.sub(s).push(opts) == 0: |
|
4727 | if c.sub(s).push(opts) == 0: | |
4728 | return False |
|
4728 | return False | |
4729 | finally: |
|
4729 | finally: | |
4730 | del repo._subtoppath |
|
4730 | del repo._subtoppath | |
4731 | result = repo.push(other, opts.get('force'), revs=revs, |
|
4731 | result = repo.push(other, opts.get('force'), revs=revs, | |
4732 | newbranch=opts.get('new_branch')) |
|
4732 | newbranch=opts.get('new_branch')) | |
4733 |
|
4733 | |||
4734 | result = not result |
|
4734 | result = not result | |
4735 |
|
4735 | |||
4736 | if opts.get('bookmark'): |
|
4736 | if opts.get('bookmark'): | |
4737 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) |
|
4737 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) | |
4738 | if bresult == 2: |
|
4738 | if bresult == 2: | |
4739 | return 2 |
|
4739 | return 2 | |
4740 | if not result and bresult: |
|
4740 | if not result and bresult: | |
4741 | result = 2 |
|
4741 | result = 2 | |
4742 |
|
4742 | |||
4743 | return result |
|
4743 | return result | |
4744 |
|
4744 | |||
4745 | @command('recover', []) |
|
4745 | @command('recover', []) | |
4746 | def recover(ui, repo): |
|
4746 | def recover(ui, repo): | |
4747 | """roll back an interrupted transaction |
|
4747 | """roll back an interrupted transaction | |
4748 |
|
4748 | |||
4749 | Recover from an interrupted commit or pull. |
|
4749 | Recover from an interrupted commit or pull. | |
4750 |
|
4750 | |||
4751 | This command tries to fix the repository status after an |
|
4751 | This command tries to fix the repository status after an | |
4752 | interrupted operation. It should only be necessary when Mercurial |
|
4752 | interrupted operation. It should only be necessary when Mercurial | |
4753 | suggests it. |
|
4753 | suggests it. | |
4754 |
|
4754 | |||
4755 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4755 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
4756 | """ |
|
4756 | """ | |
4757 | if repo.recover(): |
|
4757 | if repo.recover(): | |
4758 | return hg.verify(repo) |
|
4758 | return hg.verify(repo) | |
4759 | return 1 |
|
4759 | return 1 | |
4760 |
|
4760 | |||
4761 | @command('^remove|rm', |
|
4761 | @command('^remove|rm', | |
4762 | [('A', 'after', None, _('record delete for missing files')), |
|
4762 | [('A', 'after', None, _('record delete for missing files')), | |
4763 | ('f', 'force', None, |
|
4763 | ('f', 'force', None, | |
4764 | _('remove (and delete) file even if added or modified')), |
|
4764 | _('remove (and delete) file even if added or modified')), | |
4765 | ] + walkopts, |
|
4765 | ] + walkopts, | |
4766 | _('[OPTION]... FILE...')) |
|
4766 | _('[OPTION]... FILE...')) | |
4767 | def remove(ui, repo, *pats, **opts): |
|
4767 | def remove(ui, repo, *pats, **opts): | |
4768 | """remove the specified files on the next commit |
|
4768 | """remove the specified files on the next commit | |
4769 |
|
4769 | |||
4770 | Schedule the indicated files for removal from the current branch. |
|
4770 | Schedule the indicated files for removal from the current branch. | |
4771 |
|
4771 | |||
4772 | This command schedules the files to be removed at the next commit. |
|
4772 | This command schedules the files to be removed at the next commit. | |
4773 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4773 | To undo a remove before that, see :hg:`revert`. To undo added | |
4774 | files, see :hg:`forget`. |
|
4774 | files, see :hg:`forget`. | |
4775 |
|
4775 | |||
4776 | .. container:: verbose |
|
4776 | .. container:: verbose | |
4777 |
|
4777 | |||
4778 | -A/--after can be used to remove only files that have already |
|
4778 | -A/--after can be used to remove only files that have already | |
4779 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4779 | been deleted, -f/--force can be used to force deletion, and -Af | |
4780 | can be used to remove files from the next revision without |
|
4780 | can be used to remove files from the next revision without | |
4781 | deleting them from the working directory. |
|
4781 | deleting them from the working directory. | |
4782 |
|
4782 | |||
4783 | The following table details the behavior of remove for different |
|
4783 | The following table details the behavior of remove for different | |
4784 | file states (columns) and option combinations (rows). The file |
|
4784 | file states (columns) and option combinations (rows). The file | |
4785 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4785 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
4786 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4786 | (as reported by :hg:`status`). The actions are Warn, Remove | |
4787 | (from branch) and Delete (from disk): |
|
4787 | (from branch) and Delete (from disk): | |
4788 |
|
4788 | |||
4789 | ========= == == == == |
|
4789 | ========= == == == == | |
4790 | opt/state A C M ! |
|
4790 | opt/state A C M ! | |
4791 | ========= == == == == |
|
4791 | ========= == == == == | |
4792 | none W RD W R |
|
4792 | none W RD W R | |
4793 | -f R RD RD R |
|
4793 | -f R RD RD R | |
4794 | -A W W W R |
|
4794 | -A W W W R | |
4795 | -Af R R R R |
|
4795 | -Af R R R R | |
4796 | ========= == == == == |
|
4796 | ========= == == == == | |
4797 |
|
4797 | |||
4798 | Note that remove never deletes files in Added [A] state from the |
|
4798 | Note that remove never deletes files in Added [A] state from the | |
4799 | working directory, not even if option --force is specified. |
|
4799 | working directory, not even if option --force is specified. | |
4800 |
|
4800 | |||
4801 | Returns 0 on success, 1 if any warnings encountered. |
|
4801 | Returns 0 on success, 1 if any warnings encountered. | |
4802 | """ |
|
4802 | """ | |
4803 |
|
4803 | |||
4804 | ret = 0 |
|
4804 | ret = 0 | |
4805 | after, force = opts.get('after'), opts.get('force') |
|
4805 | after, force = opts.get('after'), opts.get('force') | |
4806 | if not pats and not after: |
|
4806 | if not pats and not after: | |
4807 | raise util.Abort(_('no files specified')) |
|
4807 | raise util.Abort(_('no files specified')) | |
4808 |
|
4808 | |||
4809 | m = scmutil.match(repo[None], pats, opts) |
|
4809 | m = scmutil.match(repo[None], pats, opts) | |
4810 | s = repo.status(match=m, clean=True) |
|
4810 | s = repo.status(match=m, clean=True) | |
4811 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
4811 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] | |
4812 |
|
4812 | |||
4813 | # warn about failure to delete explicit files/dirs |
|
4813 | # warn about failure to delete explicit files/dirs | |
4814 | wctx = repo[None] |
|
4814 | wctx = repo[None] | |
4815 | for f in m.files(): |
|
4815 | for f in m.files(): | |
4816 | if f in repo.dirstate or f in wctx.dirs(): |
|
4816 | if f in repo.dirstate or f in wctx.dirs(): | |
4817 | continue |
|
4817 | continue | |
4818 | if os.path.exists(m.rel(f)): |
|
4818 | if os.path.exists(m.rel(f)): | |
4819 | if os.path.isdir(m.rel(f)): |
|
4819 | if os.path.isdir(m.rel(f)): | |
4820 | ui.warn(_('not removing %s: no tracked files\n') % m.rel(f)) |
|
4820 | ui.warn(_('not removing %s: no tracked files\n') % m.rel(f)) | |
4821 | else: |
|
4821 | else: | |
4822 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
4822 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) | |
4823 | # missing files will generate a warning elsewhere |
|
4823 | # missing files will generate a warning elsewhere | |
4824 | ret = 1 |
|
4824 | ret = 1 | |
4825 |
|
4825 | |||
4826 | if force: |
|
4826 | if force: | |
4827 | list = modified + deleted + clean + added |
|
4827 | list = modified + deleted + clean + added | |
4828 | elif after: |
|
4828 | elif after: | |
4829 | list = deleted |
|
4829 | list = deleted | |
4830 | for f in modified + added + clean: |
|
4830 | for f in modified + added + clean: | |
4831 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) |
|
4831 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) | |
4832 | ret = 1 |
|
4832 | ret = 1 | |
4833 | else: |
|
4833 | else: | |
4834 | list = deleted + clean |
|
4834 | list = deleted + clean | |
4835 | for f in modified: |
|
4835 | for f in modified: | |
4836 | ui.warn(_('not removing %s: file is modified (use -f' |
|
4836 | ui.warn(_('not removing %s: file is modified (use -f' | |
4837 | ' to force removal)\n') % m.rel(f)) |
|
4837 | ' to force removal)\n') % m.rel(f)) | |
4838 | ret = 1 |
|
4838 | ret = 1 | |
4839 | for f in added: |
|
4839 | for f in added: | |
4840 | ui.warn(_('not removing %s: file has been marked for add' |
|
4840 | ui.warn(_('not removing %s: file has been marked for add' | |
4841 | ' (use forget to undo)\n') % m.rel(f)) |
|
4841 | ' (use forget to undo)\n') % m.rel(f)) | |
4842 | ret = 1 |
|
4842 | ret = 1 | |
4843 |
|
4843 | |||
4844 | for f in sorted(list): |
|
4844 | for f in sorted(list): | |
4845 | if ui.verbose or not m.exact(f): |
|
4845 | if ui.verbose or not m.exact(f): | |
4846 | ui.status(_('removing %s\n') % m.rel(f)) |
|
4846 | ui.status(_('removing %s\n') % m.rel(f)) | |
4847 |
|
4847 | |||
4848 | wlock = repo.wlock() |
|
4848 | wlock = repo.wlock() | |
4849 | try: |
|
4849 | try: | |
4850 | if not after: |
|
4850 | if not after: | |
4851 | for f in list: |
|
4851 | for f in list: | |
4852 | if f in added: |
|
4852 | if f in added: | |
4853 | continue # we never unlink added files on remove |
|
4853 | continue # we never unlink added files on remove | |
4854 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
|
4854 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) | |
4855 | repo[None].forget(list) |
|
4855 | repo[None].forget(list) | |
4856 | finally: |
|
4856 | finally: | |
4857 | wlock.release() |
|
4857 | wlock.release() | |
4858 |
|
4858 | |||
4859 | return ret |
|
4859 | return ret | |
4860 |
|
4860 | |||
4861 | @command('rename|move|mv', |
|
4861 | @command('rename|move|mv', | |
4862 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4862 | [('A', 'after', None, _('record a rename that has already occurred')), | |
4863 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4863 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
4864 | ] + walkopts + dryrunopts, |
|
4864 | ] + walkopts + dryrunopts, | |
4865 | _('[OPTION]... SOURCE... DEST')) |
|
4865 | _('[OPTION]... SOURCE... DEST')) | |
4866 | def rename(ui, repo, *pats, **opts): |
|
4866 | def rename(ui, repo, *pats, **opts): | |
4867 | """rename files; equivalent of copy + remove |
|
4867 | """rename files; equivalent of copy + remove | |
4868 |
|
4868 | |||
4869 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4869 | Mark dest as copies of sources; mark sources for deletion. If dest | |
4870 | is a directory, copies are put in that directory. If dest is a |
|
4870 | is a directory, copies are put in that directory. If dest is a | |
4871 | file, there can only be one source. |
|
4871 | file, there can only be one source. | |
4872 |
|
4872 | |||
4873 | By default, this command copies the contents of files as they |
|
4873 | By default, this command copies the contents of files as they | |
4874 | exist in the working directory. If invoked with -A/--after, the |
|
4874 | exist in the working directory. If invoked with -A/--after, the | |
4875 | operation is recorded, but no copying is performed. |
|
4875 | operation is recorded, but no copying is performed. | |
4876 |
|
4876 | |||
4877 | This command takes effect at the next commit. To undo a rename |
|
4877 | This command takes effect at the next commit. To undo a rename | |
4878 | before that, see :hg:`revert`. |
|
4878 | before that, see :hg:`revert`. | |
4879 |
|
4879 | |||
4880 | Returns 0 on success, 1 if errors are encountered. |
|
4880 | Returns 0 on success, 1 if errors are encountered. | |
4881 | """ |
|
4881 | """ | |
4882 | wlock = repo.wlock(False) |
|
4882 | wlock = repo.wlock(False) | |
4883 | try: |
|
4883 | try: | |
4884 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4884 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
4885 | finally: |
|
4885 | finally: | |
4886 | wlock.release() |
|
4886 | wlock.release() | |
4887 |
|
4887 | |||
4888 | @command('resolve', |
|
4888 | @command('resolve', | |
4889 | [('a', 'all', None, _('select all unresolved files')), |
|
4889 | [('a', 'all', None, _('select all unresolved files')), | |
4890 | ('l', 'list', None, _('list state of files needing merge')), |
|
4890 | ('l', 'list', None, _('list state of files needing merge')), | |
4891 | ('m', 'mark', None, _('mark files as resolved')), |
|
4891 | ('m', 'mark', None, _('mark files as resolved')), | |
4892 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4892 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4893 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4893 | ('n', 'no-status', None, _('hide status prefix'))] | |
4894 | + mergetoolopts + walkopts, |
|
4894 | + mergetoolopts + walkopts, | |
4895 | _('[OPTION]... [FILE]...')) |
|
4895 | _('[OPTION]... [FILE]...')) | |
4896 | def resolve(ui, repo, *pats, **opts): |
|
4896 | def resolve(ui, repo, *pats, **opts): | |
4897 | """redo merges or set/view the merge status of files |
|
4897 | """redo merges or set/view the merge status of files | |
4898 |
|
4898 | |||
4899 | Merges with unresolved conflicts are often the result of |
|
4899 | Merges with unresolved conflicts are often the result of | |
4900 | non-interactive merging using the ``internal:merge`` configuration |
|
4900 | non-interactive merging using the ``internal:merge`` configuration | |
4901 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4901 | setting, or a command-line merge tool like ``diff3``. The resolve | |
4902 | command is used to manage the files involved in a merge, after |
|
4902 | command is used to manage the files involved in a merge, after | |
4903 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4903 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
4904 | working directory must have two parents). See :hg:`help |
|
4904 | working directory must have two parents). See :hg:`help | |
4905 | merge-tools` for information on configuring merge tools. |
|
4905 | merge-tools` for information on configuring merge tools. | |
4906 |
|
4906 | |||
4907 | The resolve command can be used in the following ways: |
|
4907 | The resolve command can be used in the following ways: | |
4908 |
|
4908 | |||
4909 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4909 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
4910 | files, discarding any previous merge attempts. Re-merging is not |
|
4910 | files, discarding any previous merge attempts. Re-merging is not | |
4911 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4911 | performed for files already marked as resolved. Use ``--all/-a`` | |
4912 | to select all unresolved files. ``--tool`` can be used to specify |
|
4912 | to select all unresolved files. ``--tool`` can be used to specify | |
4913 | the merge tool used for the given files. It overrides the HGMERGE |
|
4913 | the merge tool used for the given files. It overrides the HGMERGE | |
4914 | environment variable and your configuration files. Previous file |
|
4914 | environment variable and your configuration files. Previous file | |
4915 | contents are saved with a ``.orig`` suffix. |
|
4915 | contents are saved with a ``.orig`` suffix. | |
4916 |
|
4916 | |||
4917 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4917 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
4918 | (e.g. after having manually fixed-up the files). The default is |
|
4918 | (e.g. after having manually fixed-up the files). The default is | |
4919 | to mark all unresolved files. |
|
4919 | to mark all unresolved files. | |
4920 |
|
4920 | |||
4921 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4921 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
4922 | default is to mark all resolved files. |
|
4922 | default is to mark all resolved files. | |
4923 |
|
4923 | |||
4924 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4924 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4925 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4925 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
4926 |
|
4926 | |||
4927 | Note that Mercurial will not let you commit files with unresolved |
|
4927 | Note that Mercurial will not let you commit files with unresolved | |
4928 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
4928 | merge conflicts. You must use :hg:`resolve -m ...` before you can | |
4929 | commit after a conflicting merge. |
|
4929 | commit after a conflicting merge. | |
4930 |
|
4930 | |||
4931 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4931 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
4932 | """ |
|
4932 | """ | |
4933 |
|
4933 | |||
4934 | all, mark, unmark, show, nostatus = \ |
|
4934 | all, mark, unmark, show, nostatus = \ | |
4935 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
4935 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] | |
4936 |
|
4936 | |||
4937 | if (show and (mark or unmark)) or (mark and unmark): |
|
4937 | if (show and (mark or unmark)) or (mark and unmark): | |
4938 | raise util.Abort(_("too many options specified")) |
|
4938 | raise util.Abort(_("too many options specified")) | |
4939 | if pats and all: |
|
4939 | if pats and all: | |
4940 | raise util.Abort(_("can't specify --all and patterns")) |
|
4940 | raise util.Abort(_("can't specify --all and patterns")) | |
4941 | if not (all or pats or show or mark or unmark): |
|
4941 | if not (all or pats or show or mark or unmark): | |
4942 | raise util.Abort(_('no files or directories specified; ' |
|
4942 | raise util.Abort(_('no files or directories specified; ' | |
4943 | 'use --all to remerge all files')) |
|
4943 | 'use --all to remerge all files')) | |
4944 |
|
4944 | |||
4945 | ms = mergemod.mergestate(repo) |
|
4945 | ms = mergemod.mergestate(repo) | |
4946 | m = scmutil.match(repo[None], pats, opts) |
|
4946 | m = scmutil.match(repo[None], pats, opts) | |
4947 | ret = 0 |
|
4947 | ret = 0 | |
4948 |
|
4948 | |||
4949 | for f in ms: |
|
4949 | for f in ms: | |
4950 | if m(f): |
|
4950 | if m(f): | |
4951 | if show: |
|
4951 | if show: | |
4952 | if nostatus: |
|
4952 | if nostatus: | |
4953 | ui.write("%s\n" % f) |
|
4953 | ui.write("%s\n" % f) | |
4954 | else: |
|
4954 | else: | |
4955 | ui.write("%s %s\n" % (ms[f].upper(), f), |
|
4955 | ui.write("%s %s\n" % (ms[f].upper(), f), | |
4956 | label='resolve.' + |
|
4956 | label='resolve.' + | |
4957 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
4957 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) | |
4958 | elif mark: |
|
4958 | elif mark: | |
4959 | ms.mark(f, "r") |
|
4959 | ms.mark(f, "r") | |
4960 | elif unmark: |
|
4960 | elif unmark: | |
4961 | ms.mark(f, "u") |
|
4961 | ms.mark(f, "u") | |
4962 | else: |
|
4962 | else: | |
4963 | wctx = repo[None] |
|
4963 | wctx = repo[None] | |
4964 | mctx = wctx.parents()[-1] |
|
|||
4965 |
|
4964 | |||
4966 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4965 | # backup pre-resolve (merge uses .orig for its own purposes) | |
4967 | a = repo.wjoin(f) |
|
4966 | a = repo.wjoin(f) | |
4968 | util.copyfile(a, a + ".resolve") |
|
4967 | util.copyfile(a, a + ".resolve") | |
4969 |
|
4968 | |||
4970 | try: |
|
4969 | try: | |
4971 | # resolve file |
|
4970 | # resolve file | |
4972 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
4971 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | |
4973 |
if ms.resolve(f, wctx |
|
4972 | if ms.resolve(f, wctx): | |
4974 | ret = 1 |
|
4973 | ret = 1 | |
4975 | finally: |
|
4974 | finally: | |
4976 | ui.setconfig('ui', 'forcemerge', '') |
|
4975 | ui.setconfig('ui', 'forcemerge', '') | |
4977 | ms.commit() |
|
4976 | ms.commit() | |
4978 |
|
4977 | |||
4979 | # replace filemerge's .orig file with our resolve file |
|
4978 | # replace filemerge's .orig file with our resolve file | |
4980 | util.rename(a + ".resolve", a + ".orig") |
|
4979 | util.rename(a + ".resolve", a + ".orig") | |
4981 |
|
4980 | |||
4982 | ms.commit() |
|
4981 | ms.commit() | |
4983 | return ret |
|
4982 | return ret | |
4984 |
|
4983 | |||
4985 | @command('revert', |
|
4984 | @command('revert', | |
4986 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4985 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
4987 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4986 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
4988 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4987 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
4989 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4988 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
4990 | ] + walkopts + dryrunopts, |
|
4989 | ] + walkopts + dryrunopts, | |
4991 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4990 | _('[OPTION]... [-r REV] [NAME]...')) | |
4992 | def revert(ui, repo, *pats, **opts): |
|
4991 | def revert(ui, repo, *pats, **opts): | |
4993 | """restore files to their checkout state |
|
4992 | """restore files to their checkout state | |
4994 |
|
4993 | |||
4995 | .. note:: |
|
4994 | .. note:: | |
4996 |
|
4995 | |||
4997 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4996 | To check out earlier revisions, you should use :hg:`update REV`. | |
4998 | To cancel an uncommitted merge (and lose your changes), |
|
4997 | To cancel an uncommitted merge (and lose your changes), | |
4999 | use :hg:`update --clean .`. |
|
4998 | use :hg:`update --clean .`. | |
5000 |
|
4999 | |||
5001 | With no revision specified, revert the specified files or directories |
|
5000 | With no revision specified, revert the specified files or directories | |
5002 | to the contents they had in the parent of the working directory. |
|
5001 | to the contents they had in the parent of the working directory. | |
5003 | This restores the contents of files to an unmodified |
|
5002 | This restores the contents of files to an unmodified | |
5004 | state and unschedules adds, removes, copies, and renames. If the |
|
5003 | state and unschedules adds, removes, copies, and renames. If the | |
5005 | working directory has two parents, you must explicitly specify a |
|
5004 | working directory has two parents, you must explicitly specify a | |
5006 | revision. |
|
5005 | revision. | |
5007 |
|
5006 | |||
5008 | Using the -r/--rev or -d/--date options, revert the given files or |
|
5007 | Using the -r/--rev or -d/--date options, revert the given files or | |
5009 | directories to their states as of a specific revision. Because |
|
5008 | directories to their states as of a specific revision. Because | |
5010 | revert does not change the working directory parents, this will |
|
5009 | revert does not change the working directory parents, this will | |
5011 | cause these files to appear modified. This can be helpful to "back |
|
5010 | cause these files to appear modified. This can be helpful to "back | |
5012 | out" some or all of an earlier change. See :hg:`backout` for a |
|
5011 | out" some or all of an earlier change. See :hg:`backout` for a | |
5013 | related method. |
|
5012 | related method. | |
5014 |
|
5013 | |||
5015 | Modified files are saved with a .orig suffix before reverting. |
|
5014 | Modified files are saved with a .orig suffix before reverting. | |
5016 | To disable these backups, use --no-backup. |
|
5015 | To disable these backups, use --no-backup. | |
5017 |
|
5016 | |||
5018 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5017 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5019 |
|
5018 | |||
5020 | Returns 0 on success. |
|
5019 | Returns 0 on success. | |
5021 | """ |
|
5020 | """ | |
5022 |
|
5021 | |||
5023 | if opts.get("date"): |
|
5022 | if opts.get("date"): | |
5024 | if opts.get("rev"): |
|
5023 | if opts.get("rev"): | |
5025 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5024 | raise util.Abort(_("you can't specify a revision and a date")) | |
5026 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
5025 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
5027 |
|
5026 | |||
5028 | parent, p2 = repo.dirstate.parents() |
|
5027 | parent, p2 = repo.dirstate.parents() | |
5029 | if not opts.get('rev') and p2 != nullid: |
|
5028 | if not opts.get('rev') and p2 != nullid: | |
5030 | # revert after merge is a trap for new users (issue2915) |
|
5029 | # revert after merge is a trap for new users (issue2915) | |
5031 | raise util.Abort(_('uncommitted merge with no revision specified'), |
|
5030 | raise util.Abort(_('uncommitted merge with no revision specified'), | |
5032 | hint=_('use "hg update" or see "hg help revert"')) |
|
5031 | hint=_('use "hg update" or see "hg help revert"')) | |
5033 |
|
5032 | |||
5034 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5033 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
5035 |
|
5034 | |||
5036 | if not pats and not opts.get('all'): |
|
5035 | if not pats and not opts.get('all'): | |
5037 | msg = _("no files or directories specified") |
|
5036 | msg = _("no files or directories specified") | |
5038 | if p2 != nullid: |
|
5037 | if p2 != nullid: | |
5039 | hint = _("uncommitted merge, use --all to discard all changes," |
|
5038 | hint = _("uncommitted merge, use --all to discard all changes," | |
5040 | " or 'hg update -C .' to abort the merge") |
|
5039 | " or 'hg update -C .' to abort the merge") | |
5041 | raise util.Abort(msg, hint=hint) |
|
5040 | raise util.Abort(msg, hint=hint) | |
5042 | dirty = util.any(repo.status()) |
|
5041 | dirty = util.any(repo.status()) | |
5043 | node = ctx.node() |
|
5042 | node = ctx.node() | |
5044 | if node != parent: |
|
5043 | if node != parent: | |
5045 | if dirty: |
|
5044 | if dirty: | |
5046 | hint = _("uncommitted changes, use --all to discard all" |
|
5045 | hint = _("uncommitted changes, use --all to discard all" | |
5047 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
5046 | " changes, or 'hg update %s' to update") % ctx.rev() | |
5048 | else: |
|
5047 | else: | |
5049 | hint = _("use --all to revert all files," |
|
5048 | hint = _("use --all to revert all files," | |
5050 | " or 'hg update %s' to update") % ctx.rev() |
|
5049 | " or 'hg update %s' to update") % ctx.rev() | |
5051 | elif dirty: |
|
5050 | elif dirty: | |
5052 | hint = _("uncommitted changes, use --all to discard all changes") |
|
5051 | hint = _("uncommitted changes, use --all to discard all changes") | |
5053 | else: |
|
5052 | else: | |
5054 | hint = _("use --all to revert all files") |
|
5053 | hint = _("use --all to revert all files") | |
5055 | raise util.Abort(msg, hint=hint) |
|
5054 | raise util.Abort(msg, hint=hint) | |
5056 |
|
5055 | |||
5057 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
5056 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) | |
5058 |
|
5057 | |||
5059 | @command('rollback', dryrunopts + |
|
5058 | @command('rollback', dryrunopts + | |
5060 | [('f', 'force', False, _('ignore safety measures'))]) |
|
5059 | [('f', 'force', False, _('ignore safety measures'))]) | |
5061 | def rollback(ui, repo, **opts): |
|
5060 | def rollback(ui, repo, **opts): | |
5062 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
5061 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
5063 |
|
5062 | |||
5064 | Please use :hg:`commit --amend` instead of rollback to correct |
|
5063 | Please use :hg:`commit --amend` instead of rollback to correct | |
5065 | mistakes in the last commit. |
|
5064 | mistakes in the last commit. | |
5066 |
|
5065 | |||
5067 | This command should be used with care. There is only one level of |
|
5066 | This command should be used with care. There is only one level of | |
5068 | rollback, and there is no way to undo a rollback. It will also |
|
5067 | rollback, and there is no way to undo a rollback. It will also | |
5069 | restore the dirstate at the time of the last transaction, losing |
|
5068 | restore the dirstate at the time of the last transaction, losing | |
5070 | any dirstate changes since that time. This command does not alter |
|
5069 | any dirstate changes since that time. This command does not alter | |
5071 | the working directory. |
|
5070 | the working directory. | |
5072 |
|
5071 | |||
5073 | Transactions are used to encapsulate the effects of all commands |
|
5072 | Transactions are used to encapsulate the effects of all commands | |
5074 | that create new changesets or propagate existing changesets into a |
|
5073 | that create new changesets or propagate existing changesets into a | |
5075 | repository. |
|
5074 | repository. | |
5076 |
|
5075 | |||
5077 | .. container:: verbose |
|
5076 | .. container:: verbose | |
5078 |
|
5077 | |||
5079 | For example, the following commands are transactional, and their |
|
5078 | For example, the following commands are transactional, and their | |
5080 | effects can be rolled back: |
|
5079 | effects can be rolled back: | |
5081 |
|
5080 | |||
5082 | - commit |
|
5081 | - commit | |
5083 | - import |
|
5082 | - import | |
5084 | - pull |
|
5083 | - pull | |
5085 | - push (with this repository as the destination) |
|
5084 | - push (with this repository as the destination) | |
5086 | - unbundle |
|
5085 | - unbundle | |
5087 |
|
5086 | |||
5088 | To avoid permanent data loss, rollback will refuse to rollback a |
|
5087 | To avoid permanent data loss, rollback will refuse to rollback a | |
5089 | commit transaction if it isn't checked out. Use --force to |
|
5088 | commit transaction if it isn't checked out. Use --force to | |
5090 | override this protection. |
|
5089 | override this protection. | |
5091 |
|
5090 | |||
5092 | This command is not intended for use on public repositories. Once |
|
5091 | This command is not intended for use on public repositories. Once | |
5093 | changes are visible for pull by other users, rolling a transaction |
|
5092 | changes are visible for pull by other users, rolling a transaction | |
5094 | back locally is ineffective (someone else may already have pulled |
|
5093 | back locally is ineffective (someone else may already have pulled | |
5095 | the changes). Furthermore, a race is possible with readers of the |
|
5094 | the changes). Furthermore, a race is possible with readers of the | |
5096 | repository; for example an in-progress pull from the repository |
|
5095 | repository; for example an in-progress pull from the repository | |
5097 | may fail if a rollback is performed. |
|
5096 | may fail if a rollback is performed. | |
5098 |
|
5097 | |||
5099 | Returns 0 on success, 1 if no rollback data is available. |
|
5098 | Returns 0 on success, 1 if no rollback data is available. | |
5100 | """ |
|
5099 | """ | |
5101 | return repo.rollback(dryrun=opts.get('dry_run'), |
|
5100 | return repo.rollback(dryrun=opts.get('dry_run'), | |
5102 | force=opts.get('force')) |
|
5101 | force=opts.get('force')) | |
5103 |
|
5102 | |||
5104 | @command('root', []) |
|
5103 | @command('root', []) | |
5105 | def root(ui, repo): |
|
5104 | def root(ui, repo): | |
5106 | """print the root (top) of the current working directory |
|
5105 | """print the root (top) of the current working directory | |
5107 |
|
5106 | |||
5108 | Print the root directory of the current repository. |
|
5107 | Print the root directory of the current repository. | |
5109 |
|
5108 | |||
5110 | Returns 0 on success. |
|
5109 | Returns 0 on success. | |
5111 | """ |
|
5110 | """ | |
5112 | ui.write(repo.root + "\n") |
|
5111 | ui.write(repo.root + "\n") | |
5113 |
|
5112 | |||
5114 | @command('^serve', |
|
5113 | @command('^serve', | |
5115 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
5114 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
5116 | _('FILE')), |
|
5115 | _('FILE')), | |
5117 | ('d', 'daemon', None, _('run server in background')), |
|
5116 | ('d', 'daemon', None, _('run server in background')), | |
5118 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), |
|
5117 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), | |
5119 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
5118 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
5120 | # use string type, then we can check if something was passed |
|
5119 | # use string type, then we can check if something was passed | |
5121 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
5120 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
5122 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
5121 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
5123 | _('ADDR')), |
|
5122 | _('ADDR')), | |
5124 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
5123 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
5125 | _('PREFIX')), |
|
5124 | _('PREFIX')), | |
5126 | ('n', 'name', '', |
|
5125 | ('n', 'name', '', | |
5127 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
5126 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
5128 | ('', 'web-conf', '', |
|
5127 | ('', 'web-conf', '', | |
5129 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), |
|
5128 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), | |
5130 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
5129 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
5131 | _('FILE')), |
|
5130 | _('FILE')), | |
5132 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
5131 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
5133 | ('', 'stdio', None, _('for remote clients')), |
|
5132 | ('', 'stdio', None, _('for remote clients')), | |
5134 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), |
|
5133 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), | |
5135 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
5134 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
5136 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
5135 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
5137 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
5136 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
5138 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], |
|
5137 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], | |
5139 | _('[OPTION]...')) |
|
5138 | _('[OPTION]...')) | |
5140 | def serve(ui, repo, **opts): |
|
5139 | def serve(ui, repo, **opts): | |
5141 | """start stand-alone webserver |
|
5140 | """start stand-alone webserver | |
5142 |
|
5141 | |||
5143 | Start a local HTTP repository browser and pull server. You can use |
|
5142 | Start a local HTTP repository browser and pull server. You can use | |
5144 | this for ad-hoc sharing and browsing of repositories. It is |
|
5143 | this for ad-hoc sharing and browsing of repositories. It is | |
5145 | recommended to use a real web server to serve a repository for |
|
5144 | recommended to use a real web server to serve a repository for | |
5146 | longer periods of time. |
|
5145 | longer periods of time. | |
5147 |
|
5146 | |||
5148 | Please note that the server does not implement access control. |
|
5147 | Please note that the server does not implement access control. | |
5149 | This means that, by default, anybody can read from the server and |
|
5148 | This means that, by default, anybody can read from the server and | |
5150 | nobody can write to it by default. Set the ``web.allow_push`` |
|
5149 | nobody can write to it by default. Set the ``web.allow_push`` | |
5151 | option to ``*`` to allow everybody to push to the server. You |
|
5150 | option to ``*`` to allow everybody to push to the server. You | |
5152 | should use a real web server if you need to authenticate users. |
|
5151 | should use a real web server if you need to authenticate users. | |
5153 |
|
5152 | |||
5154 | By default, the server logs accesses to stdout and errors to |
|
5153 | By default, the server logs accesses to stdout and errors to | |
5155 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
5154 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
5156 | files. |
|
5155 | files. | |
5157 |
|
5156 | |||
5158 | To have the server choose a free port number to listen on, specify |
|
5157 | To have the server choose a free port number to listen on, specify | |
5159 | a port number of 0; in this case, the server will print the port |
|
5158 | a port number of 0; in this case, the server will print the port | |
5160 | number it uses. |
|
5159 | number it uses. | |
5161 |
|
5160 | |||
5162 | Returns 0 on success. |
|
5161 | Returns 0 on success. | |
5163 | """ |
|
5162 | """ | |
5164 |
|
5163 | |||
5165 | if opts["stdio"] and opts["cmdserver"]: |
|
5164 | if opts["stdio"] and opts["cmdserver"]: | |
5166 | raise util.Abort(_("cannot use --stdio with --cmdserver")) |
|
5165 | raise util.Abort(_("cannot use --stdio with --cmdserver")) | |
5167 |
|
5166 | |||
5168 | def checkrepo(): |
|
5167 | def checkrepo(): | |
5169 | if repo is None: |
|
5168 | if repo is None: | |
5170 | raise error.RepoError(_("there is no Mercurial repository here" |
|
5169 | raise error.RepoError(_("there is no Mercurial repository here" | |
5171 | " (.hg not found)")) |
|
5170 | " (.hg not found)")) | |
5172 |
|
5171 | |||
5173 | if opts["stdio"]: |
|
5172 | if opts["stdio"]: | |
5174 | checkrepo() |
|
5173 | checkrepo() | |
5175 | s = sshserver.sshserver(ui, repo) |
|
5174 | s = sshserver.sshserver(ui, repo) | |
5176 | s.serve_forever() |
|
5175 | s.serve_forever() | |
5177 |
|
5176 | |||
5178 | if opts["cmdserver"]: |
|
5177 | if opts["cmdserver"]: | |
5179 | checkrepo() |
|
5178 | checkrepo() | |
5180 | s = commandserver.server(ui, repo, opts["cmdserver"]) |
|
5179 | s = commandserver.server(ui, repo, opts["cmdserver"]) | |
5181 | return s.serve() |
|
5180 | return s.serve() | |
5182 |
|
5181 | |||
5183 | # this way we can check if something was given in the command-line |
|
5182 | # this way we can check if something was given in the command-line | |
5184 | if opts.get('port'): |
|
5183 | if opts.get('port'): | |
5185 | opts['port'] = util.getport(opts.get('port')) |
|
5184 | opts['port'] = util.getport(opts.get('port')) | |
5186 |
|
5185 | |||
5187 | baseui = repo and repo.baseui or ui |
|
5186 | baseui = repo and repo.baseui or ui | |
5188 | optlist = ("name templates style address port prefix ipv6" |
|
5187 | optlist = ("name templates style address port prefix ipv6" | |
5189 | " accesslog errorlog certificate encoding") |
|
5188 | " accesslog errorlog certificate encoding") | |
5190 | for o in optlist.split(): |
|
5189 | for o in optlist.split(): | |
5191 | val = opts.get(o, '') |
|
5190 | val = opts.get(o, '') | |
5192 | if val in (None, ''): # should check against default options instead |
|
5191 | if val in (None, ''): # should check against default options instead | |
5193 | continue |
|
5192 | continue | |
5194 | baseui.setconfig("web", o, val) |
|
5193 | baseui.setconfig("web", o, val) | |
5195 | if repo and repo.ui != baseui: |
|
5194 | if repo and repo.ui != baseui: | |
5196 | repo.ui.setconfig("web", o, val) |
|
5195 | repo.ui.setconfig("web", o, val) | |
5197 |
|
5196 | |||
5198 | o = opts.get('web_conf') or opts.get('webdir_conf') |
|
5197 | o = opts.get('web_conf') or opts.get('webdir_conf') | |
5199 | if not o: |
|
5198 | if not o: | |
5200 | if not repo: |
|
5199 | if not repo: | |
5201 | raise error.RepoError(_("there is no Mercurial repository" |
|
5200 | raise error.RepoError(_("there is no Mercurial repository" | |
5202 | " here (.hg not found)")) |
|
5201 | " here (.hg not found)")) | |
5203 | o = repo |
|
5202 | o = repo | |
5204 |
|
5203 | |||
5205 | app = hgweb.hgweb(o, baseui=baseui) |
|
5204 | app = hgweb.hgweb(o, baseui=baseui) | |
5206 | service = httpservice(ui, app, opts) |
|
5205 | service = httpservice(ui, app, opts) | |
5207 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
5206 | cmdutil.service(opts, initfn=service.init, runfn=service.run) | |
5208 |
|
5207 | |||
5209 | class httpservice(object): |
|
5208 | class httpservice(object): | |
5210 | def __init__(self, ui, app, opts): |
|
5209 | def __init__(self, ui, app, opts): | |
5211 | self.ui = ui |
|
5210 | self.ui = ui | |
5212 | self.app = app |
|
5211 | self.app = app | |
5213 | self.opts = opts |
|
5212 | self.opts = opts | |
5214 |
|
5213 | |||
5215 | def init(self): |
|
5214 | def init(self): | |
5216 | util.setsignalhandler() |
|
5215 | util.setsignalhandler() | |
5217 | self.httpd = hgweb_server.create_server(self.ui, self.app) |
|
5216 | self.httpd = hgweb_server.create_server(self.ui, self.app) | |
5218 |
|
5217 | |||
5219 | if self.opts['port'] and not self.ui.verbose: |
|
5218 | if self.opts['port'] and not self.ui.verbose: | |
5220 | return |
|
5219 | return | |
5221 |
|
5220 | |||
5222 | if self.httpd.prefix: |
|
5221 | if self.httpd.prefix: | |
5223 | prefix = self.httpd.prefix.strip('/') + '/' |
|
5222 | prefix = self.httpd.prefix.strip('/') + '/' | |
5224 | else: |
|
5223 | else: | |
5225 | prefix = '' |
|
5224 | prefix = '' | |
5226 |
|
5225 | |||
5227 | port = ':%d' % self.httpd.port |
|
5226 | port = ':%d' % self.httpd.port | |
5228 | if port == ':80': |
|
5227 | if port == ':80': | |
5229 | port = '' |
|
5228 | port = '' | |
5230 |
|
5229 | |||
5231 | bindaddr = self.httpd.addr |
|
5230 | bindaddr = self.httpd.addr | |
5232 | if bindaddr == '0.0.0.0': |
|
5231 | if bindaddr == '0.0.0.0': | |
5233 | bindaddr = '*' |
|
5232 | bindaddr = '*' | |
5234 | elif ':' in bindaddr: # IPv6 |
|
5233 | elif ':' in bindaddr: # IPv6 | |
5235 | bindaddr = '[%s]' % bindaddr |
|
5234 | bindaddr = '[%s]' % bindaddr | |
5236 |
|
5235 | |||
5237 | fqaddr = self.httpd.fqaddr |
|
5236 | fqaddr = self.httpd.fqaddr | |
5238 | if ':' in fqaddr: |
|
5237 | if ':' in fqaddr: | |
5239 | fqaddr = '[%s]' % fqaddr |
|
5238 | fqaddr = '[%s]' % fqaddr | |
5240 | if self.opts['port']: |
|
5239 | if self.opts['port']: | |
5241 | write = self.ui.status |
|
5240 | write = self.ui.status | |
5242 | else: |
|
5241 | else: | |
5243 | write = self.ui.write |
|
5242 | write = self.ui.write | |
5244 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % |
|
5243 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % | |
5245 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) |
|
5244 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) | |
5246 |
|
5245 | |||
5247 | def run(self): |
|
5246 | def run(self): | |
5248 | self.httpd.serve_forever() |
|
5247 | self.httpd.serve_forever() | |
5249 |
|
5248 | |||
5250 |
|
5249 | |||
5251 | @command('showconfig|debugconfig', |
|
5250 | @command('showconfig|debugconfig', | |
5252 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
5251 | [('u', 'untrusted', None, _('show untrusted configuration options'))], | |
5253 | _('[-u] [NAME]...')) |
|
5252 | _('[-u] [NAME]...')) | |
5254 | def showconfig(ui, repo, *values, **opts): |
|
5253 | def showconfig(ui, repo, *values, **opts): | |
5255 | """show combined config settings from all hgrc files |
|
5254 | """show combined config settings from all hgrc files | |
5256 |
|
5255 | |||
5257 | With no arguments, print names and values of all config items. |
|
5256 | With no arguments, print names and values of all config items. | |
5258 |
|
5257 | |||
5259 | With one argument of the form section.name, print just the value |
|
5258 | With one argument of the form section.name, print just the value | |
5260 | of that config item. |
|
5259 | of that config item. | |
5261 |
|
5260 | |||
5262 | With multiple arguments, print names and values of all config |
|
5261 | With multiple arguments, print names and values of all config | |
5263 | items with matching section names. |
|
5262 | items with matching section names. | |
5264 |
|
5263 | |||
5265 | With --debug, the source (filename and line number) is printed |
|
5264 | With --debug, the source (filename and line number) is printed | |
5266 | for each config item. |
|
5265 | for each config item. | |
5267 |
|
5266 | |||
5268 | Returns 0 on success. |
|
5267 | Returns 0 on success. | |
5269 | """ |
|
5268 | """ | |
5270 |
|
5269 | |||
5271 | for f in scmutil.rcpath(): |
|
5270 | for f in scmutil.rcpath(): | |
5272 | ui.debug('read config from: %s\n' % f) |
|
5271 | ui.debug('read config from: %s\n' % f) | |
5273 | untrusted = bool(opts.get('untrusted')) |
|
5272 | untrusted = bool(opts.get('untrusted')) | |
5274 | if values: |
|
5273 | if values: | |
5275 | sections = [v for v in values if '.' not in v] |
|
5274 | sections = [v for v in values if '.' not in v] | |
5276 | items = [v for v in values if '.' in v] |
|
5275 | items = [v for v in values if '.' in v] | |
5277 | if len(items) > 1 or items and sections: |
|
5276 | if len(items) > 1 or items and sections: | |
5278 | raise util.Abort(_('only one config item permitted')) |
|
5277 | raise util.Abort(_('only one config item permitted')) | |
5279 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
5278 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
5280 | value = str(value).replace('\n', '\\n') |
|
5279 | value = str(value).replace('\n', '\\n') | |
5281 | sectname = section + '.' + name |
|
5280 | sectname = section + '.' + name | |
5282 | if values: |
|
5281 | if values: | |
5283 | for v in values: |
|
5282 | for v in values: | |
5284 | if v == section: |
|
5283 | if v == section: | |
5285 | ui.debug('%s: ' % |
|
5284 | ui.debug('%s: ' % | |
5286 | ui.configsource(section, name, untrusted)) |
|
5285 | ui.configsource(section, name, untrusted)) | |
5287 | ui.write('%s=%s\n' % (sectname, value)) |
|
5286 | ui.write('%s=%s\n' % (sectname, value)) | |
5288 | elif v == sectname: |
|
5287 | elif v == sectname: | |
5289 | ui.debug('%s: ' % |
|
5288 | ui.debug('%s: ' % | |
5290 | ui.configsource(section, name, untrusted)) |
|
5289 | ui.configsource(section, name, untrusted)) | |
5291 | ui.write(value, '\n') |
|
5290 | ui.write(value, '\n') | |
5292 | else: |
|
5291 | else: | |
5293 | ui.debug('%s: ' % |
|
5292 | ui.debug('%s: ' % | |
5294 | ui.configsource(section, name, untrusted)) |
|
5293 | ui.configsource(section, name, untrusted)) | |
5295 | ui.write('%s=%s\n' % (sectname, value)) |
|
5294 | ui.write('%s=%s\n' % (sectname, value)) | |
5296 |
|
5295 | |||
5297 | @command('^status|st', |
|
5296 | @command('^status|st', | |
5298 | [('A', 'all', None, _('show status of all files')), |
|
5297 | [('A', 'all', None, _('show status of all files')), | |
5299 | ('m', 'modified', None, _('show only modified files')), |
|
5298 | ('m', 'modified', None, _('show only modified files')), | |
5300 | ('a', 'added', None, _('show only added files')), |
|
5299 | ('a', 'added', None, _('show only added files')), | |
5301 | ('r', 'removed', None, _('show only removed files')), |
|
5300 | ('r', 'removed', None, _('show only removed files')), | |
5302 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
5301 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
5303 | ('c', 'clean', None, _('show only files without changes')), |
|
5302 | ('c', 'clean', None, _('show only files without changes')), | |
5304 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
5303 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
5305 | ('i', 'ignored', None, _('show only ignored files')), |
|
5304 | ('i', 'ignored', None, _('show only ignored files')), | |
5306 | ('n', 'no-status', None, _('hide status prefix')), |
|
5305 | ('n', 'no-status', None, _('hide status prefix')), | |
5307 | ('C', 'copies', None, _('show source of copied files')), |
|
5306 | ('C', 'copies', None, _('show source of copied files')), | |
5308 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
5307 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
5309 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
5308 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
5310 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
5309 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
5311 | ] + walkopts + subrepoopts, |
|
5310 | ] + walkopts + subrepoopts, | |
5312 | _('[OPTION]... [FILE]...')) |
|
5311 | _('[OPTION]... [FILE]...')) | |
5313 | def status(ui, repo, *pats, **opts): |
|
5312 | def status(ui, repo, *pats, **opts): | |
5314 | """show changed files in the working directory |
|
5313 | """show changed files in the working directory | |
5315 |
|
5314 | |||
5316 | Show status of files in the repository. If names are given, only |
|
5315 | Show status of files in the repository. If names are given, only | |
5317 | files that match are shown. Files that are clean or ignored or |
|
5316 | files that match are shown. Files that are clean or ignored or | |
5318 | the source of a copy/move operation, are not listed unless |
|
5317 | the source of a copy/move operation, are not listed unless | |
5319 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
5318 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
5320 | Unless options described with "show only ..." are given, the |
|
5319 | Unless options described with "show only ..." are given, the | |
5321 | options -mardu are used. |
|
5320 | options -mardu are used. | |
5322 |
|
5321 | |||
5323 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
5322 | Option -q/--quiet hides untracked (unknown and ignored) files | |
5324 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
5323 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
5325 |
|
5324 | |||
5326 | .. note:: |
|
5325 | .. note:: | |
5327 |
|
5326 | |||
5328 | status may appear to disagree with diff if permissions have |
|
5327 | status may appear to disagree with diff if permissions have | |
5329 | changed or a merge has occurred. The standard diff format does |
|
5328 | changed or a merge has occurred. The standard diff format does | |
5330 | not report permission changes and diff only reports changes |
|
5329 | not report permission changes and diff only reports changes | |
5331 | relative to one merge parent. |
|
5330 | relative to one merge parent. | |
5332 |
|
5331 | |||
5333 | If one revision is given, it is used as the base revision. |
|
5332 | If one revision is given, it is used as the base revision. | |
5334 | If two revisions are given, the differences between them are |
|
5333 | If two revisions are given, the differences between them are | |
5335 | shown. The --change option can also be used as a shortcut to list |
|
5334 | shown. The --change option can also be used as a shortcut to list | |
5336 | the changed files of a revision from its first parent. |
|
5335 | the changed files of a revision from its first parent. | |
5337 |
|
5336 | |||
5338 | The codes used to show the status of files are:: |
|
5337 | The codes used to show the status of files are:: | |
5339 |
|
5338 | |||
5340 | M = modified |
|
5339 | M = modified | |
5341 | A = added |
|
5340 | A = added | |
5342 | R = removed |
|
5341 | R = removed | |
5343 | C = clean |
|
5342 | C = clean | |
5344 | ! = missing (deleted by non-hg command, but still tracked) |
|
5343 | ! = missing (deleted by non-hg command, but still tracked) | |
5345 | ? = not tracked |
|
5344 | ? = not tracked | |
5346 | I = ignored |
|
5345 | I = ignored | |
5347 | = origin of the previous file listed as A (added) |
|
5346 | = origin of the previous file listed as A (added) | |
5348 |
|
5347 | |||
5349 | .. container:: verbose |
|
5348 | .. container:: verbose | |
5350 |
|
5349 | |||
5351 | Examples: |
|
5350 | Examples: | |
5352 |
|
5351 | |||
5353 | - show changes in the working directory relative to a |
|
5352 | - show changes in the working directory relative to a | |
5354 | changeset:: |
|
5353 | changeset:: | |
5355 |
|
5354 | |||
5356 | hg status --rev 9353 |
|
5355 | hg status --rev 9353 | |
5357 |
|
5356 | |||
5358 | - show all changes including copies in an existing changeset:: |
|
5357 | - show all changes including copies in an existing changeset:: | |
5359 |
|
5358 | |||
5360 | hg status --copies --change 9353 |
|
5359 | hg status --copies --change 9353 | |
5361 |
|
5360 | |||
5362 | - get a NUL separated list of added files, suitable for xargs:: |
|
5361 | - get a NUL separated list of added files, suitable for xargs:: | |
5363 |
|
5362 | |||
5364 | hg status -an0 |
|
5363 | hg status -an0 | |
5365 |
|
5364 | |||
5366 | Returns 0 on success. |
|
5365 | Returns 0 on success. | |
5367 | """ |
|
5366 | """ | |
5368 |
|
5367 | |||
5369 | revs = opts.get('rev') |
|
5368 | revs = opts.get('rev') | |
5370 | change = opts.get('change') |
|
5369 | change = opts.get('change') | |
5371 |
|
5370 | |||
5372 | if revs and change: |
|
5371 | if revs and change: | |
5373 | msg = _('cannot specify --rev and --change at the same time') |
|
5372 | msg = _('cannot specify --rev and --change at the same time') | |
5374 | raise util.Abort(msg) |
|
5373 | raise util.Abort(msg) | |
5375 | elif change: |
|
5374 | elif change: | |
5376 | node2 = scmutil.revsingle(repo, change, None).node() |
|
5375 | node2 = scmutil.revsingle(repo, change, None).node() | |
5377 | node1 = repo[node2].p1().node() |
|
5376 | node1 = repo[node2].p1().node() | |
5378 | else: |
|
5377 | else: | |
5379 | node1, node2 = scmutil.revpair(repo, revs) |
|
5378 | node1, node2 = scmutil.revpair(repo, revs) | |
5380 |
|
5379 | |||
5381 | cwd = (pats and repo.getcwd()) or '' |
|
5380 | cwd = (pats and repo.getcwd()) or '' | |
5382 | end = opts.get('print0') and '\0' or '\n' |
|
5381 | end = opts.get('print0') and '\0' or '\n' | |
5383 | copy = {} |
|
5382 | copy = {} | |
5384 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
5383 | states = 'modified added removed deleted unknown ignored clean'.split() | |
5385 | show = [k for k in states if opts.get(k)] |
|
5384 | show = [k for k in states if opts.get(k)] | |
5386 | if opts.get('all'): |
|
5385 | if opts.get('all'): | |
5387 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
5386 | show += ui.quiet and (states[:4] + ['clean']) or states | |
5388 | if not show: |
|
5387 | if not show: | |
5389 | show = ui.quiet and states[:4] or states[:5] |
|
5388 | show = ui.quiet and states[:4] or states[:5] | |
5390 |
|
5389 | |||
5391 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), |
|
5390 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), | |
5392 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
5391 | 'ignored' in show, 'clean' in show, 'unknown' in show, | |
5393 | opts.get('subrepos')) |
|
5392 | opts.get('subrepos')) | |
5394 | changestates = zip(states, 'MAR!?IC', stat) |
|
5393 | changestates = zip(states, 'MAR!?IC', stat) | |
5395 |
|
5394 | |||
5396 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
|
5395 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): | |
5397 | copy = copies.pathcopies(repo[node1], repo[node2]) |
|
5396 | copy = copies.pathcopies(repo[node1], repo[node2]) | |
5398 |
|
5397 | |||
5399 | fm = ui.formatter('status', opts) |
|
5398 | fm = ui.formatter('status', opts) | |
5400 | fmt = '%s' + end |
|
5399 | fmt = '%s' + end | |
5401 | showchar = not opts.get('no_status') |
|
5400 | showchar = not opts.get('no_status') | |
5402 |
|
5401 | |||
5403 | for state, char, files in changestates: |
|
5402 | for state, char, files in changestates: | |
5404 | if state in show: |
|
5403 | if state in show: | |
5405 | label = 'status.' + state |
|
5404 | label = 'status.' + state | |
5406 | for f in files: |
|
5405 | for f in files: | |
5407 | fm.startitem() |
|
5406 | fm.startitem() | |
5408 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
5407 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
5409 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
5408 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
5410 | if f in copy: |
|
5409 | if f in copy: | |
5411 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
5410 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
5412 | label='status.copied') |
|
5411 | label='status.copied') | |
5413 | fm.end() |
|
5412 | fm.end() | |
5414 |
|
5413 | |||
5415 | @command('^summary|sum', |
|
5414 | @command('^summary|sum', | |
5416 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
5415 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') | |
5417 | def summary(ui, repo, **opts): |
|
5416 | def summary(ui, repo, **opts): | |
5418 | """summarize working directory state |
|
5417 | """summarize working directory state | |
5419 |
|
5418 | |||
5420 | This generates a brief summary of the working directory state, |
|
5419 | This generates a brief summary of the working directory state, | |
5421 | including parents, branch, commit status, and available updates. |
|
5420 | including parents, branch, commit status, and available updates. | |
5422 |
|
5421 | |||
5423 | With the --remote option, this will check the default paths for |
|
5422 | With the --remote option, this will check the default paths for | |
5424 | incoming and outgoing changes. This can be time-consuming. |
|
5423 | incoming and outgoing changes. This can be time-consuming. | |
5425 |
|
5424 | |||
5426 | Returns 0 on success. |
|
5425 | Returns 0 on success. | |
5427 | """ |
|
5426 | """ | |
5428 |
|
5427 | |||
5429 | ctx = repo[None] |
|
5428 | ctx = repo[None] | |
5430 | parents = ctx.parents() |
|
5429 | parents = ctx.parents() | |
5431 | pnode = parents[0].node() |
|
5430 | pnode = parents[0].node() | |
5432 | marks = [] |
|
5431 | marks = [] | |
5433 |
|
5432 | |||
5434 | for p in parents: |
|
5433 | for p in parents: | |
5435 | # label with log.changeset (instead of log.parent) since this |
|
5434 | # label with log.changeset (instead of log.parent) since this | |
5436 | # shows a working directory parent *changeset*: |
|
5435 | # shows a working directory parent *changeset*: | |
5437 | # i18n: column positioning for "hg summary" |
|
5436 | # i18n: column positioning for "hg summary" | |
5438 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
5437 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), | |
5439 | label='log.changeset changeset.%s' % p.phasestr()) |
|
5438 | label='log.changeset changeset.%s' % p.phasestr()) | |
5440 | ui.write(' '.join(p.tags()), label='log.tag') |
|
5439 | ui.write(' '.join(p.tags()), label='log.tag') | |
5441 | if p.bookmarks(): |
|
5440 | if p.bookmarks(): | |
5442 | marks.extend(p.bookmarks()) |
|
5441 | marks.extend(p.bookmarks()) | |
5443 | if p.rev() == -1: |
|
5442 | if p.rev() == -1: | |
5444 | if not len(repo): |
|
5443 | if not len(repo): | |
5445 | ui.write(_(' (empty repository)')) |
|
5444 | ui.write(_(' (empty repository)')) | |
5446 | else: |
|
5445 | else: | |
5447 | ui.write(_(' (no revision checked out)')) |
|
5446 | ui.write(_(' (no revision checked out)')) | |
5448 | ui.write('\n') |
|
5447 | ui.write('\n') | |
5449 | if p.description(): |
|
5448 | if p.description(): | |
5450 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
5449 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
5451 | label='log.summary') |
|
5450 | label='log.summary') | |
5452 |
|
5451 | |||
5453 | branch = ctx.branch() |
|
5452 | branch = ctx.branch() | |
5454 | bheads = repo.branchheads(branch) |
|
5453 | bheads = repo.branchheads(branch) | |
5455 | # i18n: column positioning for "hg summary" |
|
5454 | # i18n: column positioning for "hg summary" | |
5456 | m = _('branch: %s\n') % branch |
|
5455 | m = _('branch: %s\n') % branch | |
5457 | if branch != 'default': |
|
5456 | if branch != 'default': | |
5458 | ui.write(m, label='log.branch') |
|
5457 | ui.write(m, label='log.branch') | |
5459 | else: |
|
5458 | else: | |
5460 | ui.status(m, label='log.branch') |
|
5459 | ui.status(m, label='log.branch') | |
5461 |
|
5460 | |||
5462 | if marks: |
|
5461 | if marks: | |
5463 | current = repo._bookmarkcurrent |
|
5462 | current = repo._bookmarkcurrent | |
5464 | # i18n: column positioning for "hg summary" |
|
5463 | # i18n: column positioning for "hg summary" | |
5465 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5464 | ui.write(_('bookmarks:'), label='log.bookmark') | |
5466 | if current is not None: |
|
5465 | if current is not None: | |
5467 | if current in marks: |
|
5466 | if current in marks: | |
5468 | ui.write(' *' + current, label='bookmarks.current') |
|
5467 | ui.write(' *' + current, label='bookmarks.current') | |
5469 | marks.remove(current) |
|
5468 | marks.remove(current) | |
5470 | else: |
|
5469 | else: | |
5471 | ui.write(' [%s]' % current, label='bookmarks.current') |
|
5470 | ui.write(' [%s]' % current, label='bookmarks.current') | |
5472 | for m in marks: |
|
5471 | for m in marks: | |
5473 | ui.write(' ' + m, label='log.bookmark') |
|
5472 | ui.write(' ' + m, label='log.bookmark') | |
5474 | ui.write('\n', label='log.bookmark') |
|
5473 | ui.write('\n', label='log.bookmark') | |
5475 |
|
5474 | |||
5476 | st = list(repo.status(unknown=True))[:6] |
|
5475 | st = list(repo.status(unknown=True))[:6] | |
5477 |
|
5476 | |||
5478 | c = repo.dirstate.copies() |
|
5477 | c = repo.dirstate.copies() | |
5479 | copied, renamed = [], [] |
|
5478 | copied, renamed = [], [] | |
5480 | for d, s in c.iteritems(): |
|
5479 | for d, s in c.iteritems(): | |
5481 | if s in st[2]: |
|
5480 | if s in st[2]: | |
5482 | st[2].remove(s) |
|
5481 | st[2].remove(s) | |
5483 | renamed.append(d) |
|
5482 | renamed.append(d) | |
5484 | else: |
|
5483 | else: | |
5485 | copied.append(d) |
|
5484 | copied.append(d) | |
5486 | if d in st[1]: |
|
5485 | if d in st[1]: | |
5487 | st[1].remove(d) |
|
5486 | st[1].remove(d) | |
5488 | st.insert(3, renamed) |
|
5487 | st.insert(3, renamed) | |
5489 | st.insert(4, copied) |
|
5488 | st.insert(4, copied) | |
5490 |
|
5489 | |||
5491 | ms = mergemod.mergestate(repo) |
|
5490 | ms = mergemod.mergestate(repo) | |
5492 | st.append([f for f in ms if ms[f] == 'u']) |
|
5491 | st.append([f for f in ms if ms[f] == 'u']) | |
5493 |
|
5492 | |||
5494 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5493 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
5495 | st.append(subs) |
|
5494 | st.append(subs) | |
5496 |
|
5495 | |||
5497 | labels = [ui.label(_('%d modified'), 'status.modified'), |
|
5496 | labels = [ui.label(_('%d modified'), 'status.modified'), | |
5498 | ui.label(_('%d added'), 'status.added'), |
|
5497 | ui.label(_('%d added'), 'status.added'), | |
5499 | ui.label(_('%d removed'), 'status.removed'), |
|
5498 | ui.label(_('%d removed'), 'status.removed'), | |
5500 | ui.label(_('%d renamed'), 'status.copied'), |
|
5499 | ui.label(_('%d renamed'), 'status.copied'), | |
5501 | ui.label(_('%d copied'), 'status.copied'), |
|
5500 | ui.label(_('%d copied'), 'status.copied'), | |
5502 | ui.label(_('%d deleted'), 'status.deleted'), |
|
5501 | ui.label(_('%d deleted'), 'status.deleted'), | |
5503 | ui.label(_('%d unknown'), 'status.unknown'), |
|
5502 | ui.label(_('%d unknown'), 'status.unknown'), | |
5504 | ui.label(_('%d ignored'), 'status.ignored'), |
|
5503 | ui.label(_('%d ignored'), 'status.ignored'), | |
5505 | ui.label(_('%d unresolved'), 'resolve.unresolved'), |
|
5504 | ui.label(_('%d unresolved'), 'resolve.unresolved'), | |
5506 | ui.label(_('%d subrepos'), 'status.modified')] |
|
5505 | ui.label(_('%d subrepos'), 'status.modified')] | |
5507 | t = [] |
|
5506 | t = [] | |
5508 | for s, l in zip(st, labels): |
|
5507 | for s, l in zip(st, labels): | |
5509 | if s: |
|
5508 | if s: | |
5510 | t.append(l % len(s)) |
|
5509 | t.append(l % len(s)) | |
5511 |
|
5510 | |||
5512 | t = ', '.join(t) |
|
5511 | t = ', '.join(t) | |
5513 | cleanworkdir = False |
|
5512 | cleanworkdir = False | |
5514 |
|
5513 | |||
5515 | if repo.vfs.exists('updatestate'): |
|
5514 | if repo.vfs.exists('updatestate'): | |
5516 | t += _(' (interrupted update)') |
|
5515 | t += _(' (interrupted update)') | |
5517 | elif len(parents) > 1: |
|
5516 | elif len(parents) > 1: | |
5518 | t += _(' (merge)') |
|
5517 | t += _(' (merge)') | |
5519 | elif branch != parents[0].branch(): |
|
5518 | elif branch != parents[0].branch(): | |
5520 | t += _(' (new branch)') |
|
5519 | t += _(' (new branch)') | |
5521 | elif (parents[0].closesbranch() and |
|
5520 | elif (parents[0].closesbranch() and | |
5522 | pnode in repo.branchheads(branch, closed=True)): |
|
5521 | pnode in repo.branchheads(branch, closed=True)): | |
5523 | t += _(' (head closed)') |
|
5522 | t += _(' (head closed)') | |
5524 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): |
|
5523 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): | |
5525 | t += _(' (clean)') |
|
5524 | t += _(' (clean)') | |
5526 | cleanworkdir = True |
|
5525 | cleanworkdir = True | |
5527 | elif pnode not in bheads: |
|
5526 | elif pnode not in bheads: | |
5528 | t += _(' (new branch head)') |
|
5527 | t += _(' (new branch head)') | |
5529 |
|
5528 | |||
5530 | if cleanworkdir: |
|
5529 | if cleanworkdir: | |
5531 | # i18n: column positioning for "hg summary" |
|
5530 | # i18n: column positioning for "hg summary" | |
5532 | ui.status(_('commit: %s\n') % t.strip()) |
|
5531 | ui.status(_('commit: %s\n') % t.strip()) | |
5533 | else: |
|
5532 | else: | |
5534 | # i18n: column positioning for "hg summary" |
|
5533 | # i18n: column positioning for "hg summary" | |
5535 | ui.write(_('commit: %s\n') % t.strip()) |
|
5534 | ui.write(_('commit: %s\n') % t.strip()) | |
5536 |
|
5535 | |||
5537 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5536 | # all ancestors of branch heads - all ancestors of parent = new csets | |
5538 | new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], |
|
5537 | new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], | |
5539 | bheads)) |
|
5538 | bheads)) | |
5540 |
|
5539 | |||
5541 | if new == 0: |
|
5540 | if new == 0: | |
5542 | # i18n: column positioning for "hg summary" |
|
5541 | # i18n: column positioning for "hg summary" | |
5543 | ui.status(_('update: (current)\n')) |
|
5542 | ui.status(_('update: (current)\n')) | |
5544 | elif pnode not in bheads: |
|
5543 | elif pnode not in bheads: | |
5545 | # i18n: column positioning for "hg summary" |
|
5544 | # i18n: column positioning for "hg summary" | |
5546 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5545 | ui.write(_('update: %d new changesets (update)\n') % new) | |
5547 | else: |
|
5546 | else: | |
5548 | # i18n: column positioning for "hg summary" |
|
5547 | # i18n: column positioning for "hg summary" | |
5549 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5548 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
5550 | (new, len(bheads))) |
|
5549 | (new, len(bheads))) | |
5551 |
|
5550 | |||
5552 | cmdutil.summaryhooks(ui, repo) |
|
5551 | cmdutil.summaryhooks(ui, repo) | |
5553 |
|
5552 | |||
5554 | if opts.get('remote'): |
|
5553 | if opts.get('remote'): | |
5555 | t = [] |
|
5554 | t = [] | |
5556 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5555 | source, branches = hg.parseurl(ui.expandpath('default')) | |
5557 | sbranch = branches[0] |
|
5556 | sbranch = branches[0] | |
5558 | other = hg.peer(repo, {}, source) |
|
5557 | other = hg.peer(repo, {}, source) | |
5559 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5558 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
5560 | if revs: |
|
5559 | if revs: | |
5561 | revs = [other.lookup(rev) for rev in revs] |
|
5560 | revs = [other.lookup(rev) for rev in revs] | |
5562 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5561 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
5563 | repo.ui.pushbuffer() |
|
5562 | repo.ui.pushbuffer() | |
5564 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5563 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
5565 | _common, incoming, _rheads = commoninc |
|
5564 | _common, incoming, _rheads = commoninc | |
5566 | repo.ui.popbuffer() |
|
5565 | repo.ui.popbuffer() | |
5567 | if incoming: |
|
5566 | if incoming: | |
5568 | t.append(_('1 or more incoming')) |
|
5567 | t.append(_('1 or more incoming')) | |
5569 |
|
5568 | |||
5570 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5569 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
5571 | dbranch = branches[0] |
|
5570 | dbranch = branches[0] | |
5572 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5571 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
5573 | if source != dest: |
|
5572 | if source != dest: | |
5574 | other = hg.peer(repo, {}, dest) |
|
5573 | other = hg.peer(repo, {}, dest) | |
5575 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5574 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
5576 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5575 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
5577 | commoninc = None |
|
5576 | commoninc = None | |
5578 | if revs: |
|
5577 | if revs: | |
5579 | revs = [repo.lookup(rev) for rev in revs] |
|
5578 | revs = [repo.lookup(rev) for rev in revs] | |
5580 | repo.ui.pushbuffer() |
|
5579 | repo.ui.pushbuffer() | |
5581 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs, |
|
5580 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs, | |
5582 | commoninc=commoninc) |
|
5581 | commoninc=commoninc) | |
5583 | repo.ui.popbuffer() |
|
5582 | repo.ui.popbuffer() | |
5584 | o = outgoing.missing |
|
5583 | o = outgoing.missing | |
5585 | if o: |
|
5584 | if o: | |
5586 | t.append(_('%d outgoing') % len(o)) |
|
5585 | t.append(_('%d outgoing') % len(o)) | |
5587 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5586 | if 'bookmarks' in other.listkeys('namespaces'): | |
5588 | lmarks = repo.listkeys('bookmarks') |
|
5587 | lmarks = repo.listkeys('bookmarks') | |
5589 | rmarks = other.listkeys('bookmarks') |
|
5588 | rmarks = other.listkeys('bookmarks') | |
5590 | diff = set(rmarks) - set(lmarks) |
|
5589 | diff = set(rmarks) - set(lmarks) | |
5591 | if len(diff) > 0: |
|
5590 | if len(diff) > 0: | |
5592 | t.append(_('%d incoming bookmarks') % len(diff)) |
|
5591 | t.append(_('%d incoming bookmarks') % len(diff)) | |
5593 | diff = set(lmarks) - set(rmarks) |
|
5592 | diff = set(lmarks) - set(rmarks) | |
5594 | if len(diff) > 0: |
|
5593 | if len(diff) > 0: | |
5595 | t.append(_('%d outgoing bookmarks') % len(diff)) |
|
5594 | t.append(_('%d outgoing bookmarks') % len(diff)) | |
5596 |
|
5595 | |||
5597 | if t: |
|
5596 | if t: | |
5598 | # i18n: column positioning for "hg summary" |
|
5597 | # i18n: column positioning for "hg summary" | |
5599 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5598 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5600 | else: |
|
5599 | else: | |
5601 | # i18n: column positioning for "hg summary" |
|
5600 | # i18n: column positioning for "hg summary" | |
5602 | ui.status(_('remote: (synced)\n')) |
|
5601 | ui.status(_('remote: (synced)\n')) | |
5603 |
|
5602 | |||
5604 | @command('tag', |
|
5603 | @command('tag', | |
5605 | [('f', 'force', None, _('force tag')), |
|
5604 | [('f', 'force', None, _('force tag')), | |
5606 | ('l', 'local', None, _('make the tag local')), |
|
5605 | ('l', 'local', None, _('make the tag local')), | |
5607 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5606 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
5608 | ('', 'remove', None, _('remove a tag')), |
|
5607 | ('', 'remove', None, _('remove a tag')), | |
5609 | # -l/--local is already there, commitopts cannot be used |
|
5608 | # -l/--local is already there, commitopts cannot be used | |
5610 | ('e', 'edit', None, _('edit commit message')), |
|
5609 | ('e', 'edit', None, _('edit commit message')), | |
5611 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), |
|
5610 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), | |
5612 | ] + commitopts2, |
|
5611 | ] + commitopts2, | |
5613 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5612 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
5614 | def tag(ui, repo, name1, *names, **opts): |
|
5613 | def tag(ui, repo, name1, *names, **opts): | |
5615 | """add one or more tags for the current or given revision |
|
5614 | """add one or more tags for the current or given revision | |
5616 |
|
5615 | |||
5617 | Name a particular revision using <name>. |
|
5616 | Name a particular revision using <name>. | |
5618 |
|
5617 | |||
5619 | Tags are used to name particular revisions of the repository and are |
|
5618 | Tags are used to name particular revisions of the repository and are | |
5620 | very useful to compare different revisions, to go back to significant |
|
5619 | very useful to compare different revisions, to go back to significant | |
5621 | earlier versions or to mark branch points as releases, etc. Changing |
|
5620 | earlier versions or to mark branch points as releases, etc. Changing | |
5622 | an existing tag is normally disallowed; use -f/--force to override. |
|
5621 | an existing tag is normally disallowed; use -f/--force to override. | |
5623 |
|
5622 | |||
5624 | If no revision is given, the parent of the working directory is |
|
5623 | If no revision is given, the parent of the working directory is | |
5625 | used. |
|
5624 | used. | |
5626 |
|
5625 | |||
5627 | To facilitate version control, distribution, and merging of tags, |
|
5626 | To facilitate version control, distribution, and merging of tags, | |
5628 | they are stored as a file named ".hgtags" which is managed similarly |
|
5627 | they are stored as a file named ".hgtags" which is managed similarly | |
5629 | to other project files and can be hand-edited if necessary. This |
|
5628 | to other project files and can be hand-edited if necessary. This | |
5630 | also means that tagging creates a new commit. The file |
|
5629 | also means that tagging creates a new commit. The file | |
5631 | ".hg/localtags" is used for local tags (not shared among |
|
5630 | ".hg/localtags" is used for local tags (not shared among | |
5632 | repositories). |
|
5631 | repositories). | |
5633 |
|
5632 | |||
5634 | Tag commits are usually made at the head of a branch. If the parent |
|
5633 | Tag commits are usually made at the head of a branch. If the parent | |
5635 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5634 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
5636 | -f/--force to force the tag commit to be based on a non-head |
|
5635 | -f/--force to force the tag commit to be based on a non-head | |
5637 | changeset. |
|
5636 | changeset. | |
5638 |
|
5637 | |||
5639 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5638 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5640 |
|
5639 | |||
5641 | Since tag names have priority over branch names during revision |
|
5640 | Since tag names have priority over branch names during revision | |
5642 | lookup, using an existing branch name as a tag name is discouraged. |
|
5641 | lookup, using an existing branch name as a tag name is discouraged. | |
5643 |
|
5642 | |||
5644 | Returns 0 on success. |
|
5643 | Returns 0 on success. | |
5645 | """ |
|
5644 | """ | |
5646 | wlock = lock = None |
|
5645 | wlock = lock = None | |
5647 | try: |
|
5646 | try: | |
5648 | wlock = repo.wlock() |
|
5647 | wlock = repo.wlock() | |
5649 | lock = repo.lock() |
|
5648 | lock = repo.lock() | |
5650 | rev_ = "." |
|
5649 | rev_ = "." | |
5651 | names = [t.strip() for t in (name1,) + names] |
|
5650 | names = [t.strip() for t in (name1,) + names] | |
5652 | if len(names) != len(set(names)): |
|
5651 | if len(names) != len(set(names)): | |
5653 | raise util.Abort(_('tag names must be unique')) |
|
5652 | raise util.Abort(_('tag names must be unique')) | |
5654 | for n in names: |
|
5653 | for n in names: | |
5655 | scmutil.checknewlabel(repo, n, 'tag') |
|
5654 | scmutil.checknewlabel(repo, n, 'tag') | |
5656 | if not n: |
|
5655 | if not n: | |
5657 | raise util.Abort(_('tag names cannot consist entirely of ' |
|
5656 | raise util.Abort(_('tag names cannot consist entirely of ' | |
5658 | 'whitespace')) |
|
5657 | 'whitespace')) | |
5659 | if opts.get('rev') and opts.get('remove'): |
|
5658 | if opts.get('rev') and opts.get('remove'): | |
5660 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
5659 | raise util.Abort(_("--rev and --remove are incompatible")) | |
5661 | if opts.get('rev'): |
|
5660 | if opts.get('rev'): | |
5662 | rev_ = opts['rev'] |
|
5661 | rev_ = opts['rev'] | |
5663 | message = opts.get('message') |
|
5662 | message = opts.get('message') | |
5664 | if opts.get('remove'): |
|
5663 | if opts.get('remove'): | |
5665 | expectedtype = opts.get('local') and 'local' or 'global' |
|
5664 | expectedtype = opts.get('local') and 'local' or 'global' | |
5666 | for n in names: |
|
5665 | for n in names: | |
5667 | if not repo.tagtype(n): |
|
5666 | if not repo.tagtype(n): | |
5668 | raise util.Abort(_("tag '%s' does not exist") % n) |
|
5667 | raise util.Abort(_("tag '%s' does not exist") % n) | |
5669 | if repo.tagtype(n) != expectedtype: |
|
5668 | if repo.tagtype(n) != expectedtype: | |
5670 | if expectedtype == 'global': |
|
5669 | if expectedtype == 'global': | |
5671 | raise util.Abort(_("tag '%s' is not a global tag") % n) |
|
5670 | raise util.Abort(_("tag '%s' is not a global tag") % n) | |
5672 | else: |
|
5671 | else: | |
5673 | raise util.Abort(_("tag '%s' is not a local tag") % n) |
|
5672 | raise util.Abort(_("tag '%s' is not a local tag") % n) | |
5674 | rev_ = nullid |
|
5673 | rev_ = nullid | |
5675 | if not message: |
|
5674 | if not message: | |
5676 | # we don't translate commit messages |
|
5675 | # we don't translate commit messages | |
5677 | message = 'Removed tag %s' % ', '.join(names) |
|
5676 | message = 'Removed tag %s' % ', '.join(names) | |
5678 | elif not opts.get('force'): |
|
5677 | elif not opts.get('force'): | |
5679 | for n in names: |
|
5678 | for n in names: | |
5680 | if n in repo.tags(): |
|
5679 | if n in repo.tags(): | |
5681 | raise util.Abort(_("tag '%s' already exists " |
|
5680 | raise util.Abort(_("tag '%s' already exists " | |
5682 | "(use -f to force)") % n) |
|
5681 | "(use -f to force)") % n) | |
5683 | if not opts.get('local'): |
|
5682 | if not opts.get('local'): | |
5684 | p1, p2 = repo.dirstate.parents() |
|
5683 | p1, p2 = repo.dirstate.parents() | |
5685 | if p2 != nullid: |
|
5684 | if p2 != nullid: | |
5686 | raise util.Abort(_('uncommitted merge')) |
|
5685 | raise util.Abort(_('uncommitted merge')) | |
5687 | bheads = repo.branchheads() |
|
5686 | bheads = repo.branchheads() | |
5688 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5687 | if not opts.get('force') and bheads and p1 not in bheads: | |
5689 | raise util.Abort(_('not at a branch head (use -f to force)')) |
|
5688 | raise util.Abort(_('not at a branch head (use -f to force)')) | |
5690 | r = scmutil.revsingle(repo, rev_).node() |
|
5689 | r = scmutil.revsingle(repo, rev_).node() | |
5691 |
|
5690 | |||
5692 | if not message: |
|
5691 | if not message: | |
5693 | # we don't translate commit messages |
|
5692 | # we don't translate commit messages | |
5694 | message = ('Added tag %s for changeset %s' % |
|
5693 | message = ('Added tag %s for changeset %s' % | |
5695 | (', '.join(names), short(r))) |
|
5694 | (', '.join(names), short(r))) | |
5696 |
|
5695 | |||
5697 | date = opts.get('date') |
|
5696 | date = opts.get('date') | |
5698 | if date: |
|
5697 | if date: | |
5699 | date = util.parsedate(date) |
|
5698 | date = util.parsedate(date) | |
5700 |
|
5699 | |||
5701 | if opts.get('edit'): |
|
5700 | if opts.get('edit'): | |
5702 | message = ui.edit(message, ui.username()) |
|
5701 | message = ui.edit(message, ui.username()) | |
5703 |
|
5702 | |||
5704 | # don't allow tagging the null rev |
|
5703 | # don't allow tagging the null rev | |
5705 | if (not opts.get('remove') and |
|
5704 | if (not opts.get('remove') and | |
5706 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5705 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
5707 | raise util.Abort(_("cannot tag null revision")) |
|
5706 | raise util.Abort(_("cannot tag null revision")) | |
5708 |
|
5707 | |||
5709 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
|
5708 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) | |
5710 | finally: |
|
5709 | finally: | |
5711 | release(lock, wlock) |
|
5710 | release(lock, wlock) | |
5712 |
|
5711 | |||
5713 | @command('tags', [], '') |
|
5712 | @command('tags', [], '') | |
5714 | def tags(ui, repo, **opts): |
|
5713 | def tags(ui, repo, **opts): | |
5715 | """list repository tags |
|
5714 | """list repository tags | |
5716 |
|
5715 | |||
5717 | This lists both regular and local tags. When the -v/--verbose |
|
5716 | This lists both regular and local tags. When the -v/--verbose | |
5718 | switch is used, a third column "local" is printed for local tags. |
|
5717 | switch is used, a third column "local" is printed for local tags. | |
5719 |
|
5718 | |||
5720 | Returns 0 on success. |
|
5719 | Returns 0 on success. | |
5721 | """ |
|
5720 | """ | |
5722 |
|
5721 | |||
5723 | fm = ui.formatter('tags', opts) |
|
5722 | fm = ui.formatter('tags', opts) | |
5724 | hexfunc = ui.debugflag and hex or short |
|
5723 | hexfunc = ui.debugflag and hex or short | |
5725 | tagtype = "" |
|
5724 | tagtype = "" | |
5726 |
|
5725 | |||
5727 | for t, n in reversed(repo.tagslist()): |
|
5726 | for t, n in reversed(repo.tagslist()): | |
5728 | hn = hexfunc(n) |
|
5727 | hn = hexfunc(n) | |
5729 | label = 'tags.normal' |
|
5728 | label = 'tags.normal' | |
5730 | tagtype = '' |
|
5729 | tagtype = '' | |
5731 | if repo.tagtype(t) == 'local': |
|
5730 | if repo.tagtype(t) == 'local': | |
5732 | label = 'tags.local' |
|
5731 | label = 'tags.local' | |
5733 | tagtype = 'local' |
|
5732 | tagtype = 'local' | |
5734 |
|
5733 | |||
5735 | fm.startitem() |
|
5734 | fm.startitem() | |
5736 | fm.write('tag', '%s', t, label=label) |
|
5735 | fm.write('tag', '%s', t, label=label) | |
5737 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5736 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
5738 | fm.condwrite(not ui.quiet, 'rev id', fmt, |
|
5737 | fm.condwrite(not ui.quiet, 'rev id', fmt, | |
5739 | repo.changelog.rev(n), hn, label=label) |
|
5738 | repo.changelog.rev(n), hn, label=label) | |
5740 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5739 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
5741 | tagtype, label=label) |
|
5740 | tagtype, label=label) | |
5742 | fm.plain('\n') |
|
5741 | fm.plain('\n') | |
5743 | fm.end() |
|
5742 | fm.end() | |
5744 |
|
5743 | |||
5745 | @command('tip', |
|
5744 | @command('tip', | |
5746 | [('p', 'patch', None, _('show patch')), |
|
5745 | [('p', 'patch', None, _('show patch')), | |
5747 | ('g', 'git', None, _('use git extended diff format')), |
|
5746 | ('g', 'git', None, _('use git extended diff format')), | |
5748 | ] + templateopts, |
|
5747 | ] + templateopts, | |
5749 | _('[-p] [-g]')) |
|
5748 | _('[-p] [-g]')) | |
5750 | def tip(ui, repo, **opts): |
|
5749 | def tip(ui, repo, **opts): | |
5751 | """show the tip revision (DEPRECATED) |
|
5750 | """show the tip revision (DEPRECATED) | |
5752 |
|
5751 | |||
5753 | The tip revision (usually just called the tip) is the changeset |
|
5752 | The tip revision (usually just called the tip) is the changeset | |
5754 | most recently added to the repository (and therefore the most |
|
5753 | most recently added to the repository (and therefore the most | |
5755 | recently changed head). |
|
5754 | recently changed head). | |
5756 |
|
5755 | |||
5757 | If you have just made a commit, that commit will be the tip. If |
|
5756 | If you have just made a commit, that commit will be the tip. If | |
5758 | you have just pulled changes from another repository, the tip of |
|
5757 | you have just pulled changes from another repository, the tip of | |
5759 | that repository becomes the current tip. The "tip" tag is special |
|
5758 | that repository becomes the current tip. The "tip" tag is special | |
5760 | and cannot be renamed or assigned to a different changeset. |
|
5759 | and cannot be renamed or assigned to a different changeset. | |
5761 |
|
5760 | |||
5762 | This command is deprecated, please use :hg:`heads` instead. |
|
5761 | This command is deprecated, please use :hg:`heads` instead. | |
5763 |
|
5762 | |||
5764 | Returns 0 on success. |
|
5763 | Returns 0 on success. | |
5765 | """ |
|
5764 | """ | |
5766 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5765 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5767 | displayer.show(repo['tip']) |
|
5766 | displayer.show(repo['tip']) | |
5768 | displayer.close() |
|
5767 | displayer.close() | |
5769 |
|
5768 | |||
5770 | @command('unbundle', |
|
5769 | @command('unbundle', | |
5771 | [('u', 'update', None, |
|
5770 | [('u', 'update', None, | |
5772 | _('update to new branch head if changesets were unbundled'))], |
|
5771 | _('update to new branch head if changesets were unbundled'))], | |
5773 | _('[-u] FILE...')) |
|
5772 | _('[-u] FILE...')) | |
5774 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5773 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
5775 | """apply one or more changegroup files |
|
5774 | """apply one or more changegroup files | |
5776 |
|
5775 | |||
5777 | Apply one or more compressed changegroup files generated by the |
|
5776 | Apply one or more compressed changegroup files generated by the | |
5778 | bundle command. |
|
5777 | bundle command. | |
5779 |
|
5778 | |||
5780 | Returns 0 on success, 1 if an update has unresolved files. |
|
5779 | Returns 0 on success, 1 if an update has unresolved files. | |
5781 | """ |
|
5780 | """ | |
5782 | fnames = (fname1,) + fnames |
|
5781 | fnames = (fname1,) + fnames | |
5783 |
|
5782 | |||
5784 | lock = repo.lock() |
|
5783 | lock = repo.lock() | |
5785 | wc = repo['.'] |
|
5784 | wc = repo['.'] | |
5786 | try: |
|
5785 | try: | |
5787 | for fname in fnames: |
|
5786 | for fname in fnames: | |
5788 | f = hg.openpath(ui, fname) |
|
5787 | f = hg.openpath(ui, fname) | |
5789 | gen = changegroup.readbundle(f, fname) |
|
5788 | gen = changegroup.readbundle(f, fname) | |
5790 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
|
5789 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) | |
5791 | finally: |
|
5790 | finally: | |
5792 | lock.release() |
|
5791 | lock.release() | |
5793 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) |
|
5792 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) | |
5794 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
5793 | return postincoming(ui, repo, modheads, opts.get('update'), None) | |
5795 |
|
5794 | |||
5796 | @command('^update|up|checkout|co', |
|
5795 | @command('^update|up|checkout|co', | |
5797 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5796 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
5798 | ('c', 'check', None, |
|
5797 | ('c', 'check', None, | |
5799 | _('update across branches if no uncommitted changes')), |
|
5798 | _('update across branches if no uncommitted changes')), | |
5800 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5799 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5801 | ('r', 'rev', '', _('revision'), _('REV'))], |
|
5800 | ('r', 'rev', '', _('revision'), _('REV'))], | |
5802 | _('[-c] [-C] [-d DATE] [[-r] REV]')) |
|
5801 | _('[-c] [-C] [-d DATE] [[-r] REV]')) | |
5803 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): |
|
5802 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): | |
5804 | """update working directory (or switch revisions) |
|
5803 | """update working directory (or switch revisions) | |
5805 |
|
5804 | |||
5806 | Update the repository's working directory to the specified |
|
5805 | Update the repository's working directory to the specified | |
5807 | changeset. If no changeset is specified, update to the tip of the |
|
5806 | changeset. If no changeset is specified, update to the tip of the | |
5808 | current named branch and move the current bookmark (see :hg:`help |
|
5807 | current named branch and move the current bookmark (see :hg:`help | |
5809 | bookmarks`). |
|
5808 | bookmarks`). | |
5810 |
|
5809 | |||
5811 | Update sets the working directory's parent revision to the specified |
|
5810 | Update sets the working directory's parent revision to the specified | |
5812 | changeset (see :hg:`help parents`). |
|
5811 | changeset (see :hg:`help parents`). | |
5813 |
|
5812 | |||
5814 | If the changeset is not a descendant or ancestor of the working |
|
5813 | If the changeset is not a descendant or ancestor of the working | |
5815 | directory's parent, the update is aborted. With the -c/--check |
|
5814 | directory's parent, the update is aborted. With the -c/--check | |
5816 | option, the working directory is checked for uncommitted changes; if |
|
5815 | option, the working directory is checked for uncommitted changes; if | |
5817 | none are found, the working directory is updated to the specified |
|
5816 | none are found, the working directory is updated to the specified | |
5818 | changeset. |
|
5817 | changeset. | |
5819 |
|
5818 | |||
5820 | .. container:: verbose |
|
5819 | .. container:: verbose | |
5821 |
|
5820 | |||
5822 | The following rules apply when the working directory contains |
|
5821 | The following rules apply when the working directory contains | |
5823 | uncommitted changes: |
|
5822 | uncommitted changes: | |
5824 |
|
5823 | |||
5825 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
5824 | 1. If neither -c/--check nor -C/--clean is specified, and if | |
5826 | the requested changeset is an ancestor or descendant of |
|
5825 | the requested changeset is an ancestor or descendant of | |
5827 | the working directory's parent, the uncommitted changes |
|
5826 | the working directory's parent, the uncommitted changes | |
5828 | are merged into the requested changeset and the merged |
|
5827 | are merged into the requested changeset and the merged | |
5829 | result is left uncommitted. If the requested changeset is |
|
5828 | result is left uncommitted. If the requested changeset is | |
5830 | not an ancestor or descendant (that is, it is on another |
|
5829 | not an ancestor or descendant (that is, it is on another | |
5831 | branch), the update is aborted and the uncommitted changes |
|
5830 | branch), the update is aborted and the uncommitted changes | |
5832 | are preserved. |
|
5831 | are preserved. | |
5833 |
|
5832 | |||
5834 | 2. With the -c/--check option, the update is aborted and the |
|
5833 | 2. With the -c/--check option, the update is aborted and the | |
5835 | uncommitted changes are preserved. |
|
5834 | uncommitted changes are preserved. | |
5836 |
|
5835 | |||
5837 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
5836 | 3. With the -C/--clean option, uncommitted changes are discarded and | |
5838 | the working directory is updated to the requested changeset. |
|
5837 | the working directory is updated to the requested changeset. | |
5839 |
|
5838 | |||
5840 | To cancel an uncommitted merge (and lose your changes), use |
|
5839 | To cancel an uncommitted merge (and lose your changes), use | |
5841 | :hg:`update --clean .`. |
|
5840 | :hg:`update --clean .`. | |
5842 |
|
5841 | |||
5843 | Use null as the changeset to remove the working directory (like |
|
5842 | Use null as the changeset to remove the working directory (like | |
5844 | :hg:`clone -U`). |
|
5843 | :hg:`clone -U`). | |
5845 |
|
5844 | |||
5846 | If you want to revert just one file to an older revision, use |
|
5845 | If you want to revert just one file to an older revision, use | |
5847 | :hg:`revert [-r REV] NAME`. |
|
5846 | :hg:`revert [-r REV] NAME`. | |
5848 |
|
5847 | |||
5849 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5848 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5850 |
|
5849 | |||
5851 | Returns 0 on success, 1 if there are unresolved files. |
|
5850 | Returns 0 on success, 1 if there are unresolved files. | |
5852 | """ |
|
5851 | """ | |
5853 | if rev and node: |
|
5852 | if rev and node: | |
5854 | raise util.Abort(_("please specify just one revision")) |
|
5853 | raise util.Abort(_("please specify just one revision")) | |
5855 |
|
5854 | |||
5856 | if rev is None or rev == '': |
|
5855 | if rev is None or rev == '': | |
5857 | rev = node |
|
5856 | rev = node | |
5858 |
|
5857 | |||
5859 | cmdutil.clearunfinished(repo) |
|
5858 | cmdutil.clearunfinished(repo) | |
5860 |
|
5859 | |||
5861 | # with no argument, we also move the current bookmark, if any |
|
5860 | # with no argument, we also move the current bookmark, if any | |
5862 | rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) |
|
5861 | rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) | |
5863 |
|
5862 | |||
5864 | # if we defined a bookmark, we have to remember the original bookmark name |
|
5863 | # if we defined a bookmark, we have to remember the original bookmark name | |
5865 | brev = rev |
|
5864 | brev = rev | |
5866 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5865 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
5867 |
|
5866 | |||
5868 | if check and clean: |
|
5867 | if check and clean: | |
5869 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
5868 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) | |
5870 |
|
5869 | |||
5871 | if date: |
|
5870 | if date: | |
5872 | if rev is not None: |
|
5871 | if rev is not None: | |
5873 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5872 | raise util.Abort(_("you can't specify a revision and a date")) | |
5874 | rev = cmdutil.finddate(ui, repo, date) |
|
5873 | rev = cmdutil.finddate(ui, repo, date) | |
5875 |
|
5874 | |||
5876 | if check: |
|
5875 | if check: | |
5877 | c = repo[None] |
|
5876 | c = repo[None] | |
5878 | if c.dirty(merge=False, branch=False, missing=True): |
|
5877 | if c.dirty(merge=False, branch=False, missing=True): | |
5879 | raise util.Abort(_("uncommitted changes")) |
|
5878 | raise util.Abort(_("uncommitted changes")) | |
5880 | if rev is None: |
|
5879 | if rev is None: | |
5881 | rev = repo[repo[None].branch()].rev() |
|
5880 | rev = repo[repo[None].branch()].rev() | |
5882 | mergemod._checkunknown(repo, repo[None], repo[rev]) |
|
5881 | mergemod._checkunknown(repo, repo[None], repo[rev]) | |
5883 |
|
5882 | |||
5884 | if clean: |
|
5883 | if clean: | |
5885 | ret = hg.clean(repo, rev) |
|
5884 | ret = hg.clean(repo, rev) | |
5886 | else: |
|
5885 | else: | |
5887 | ret = hg.update(repo, rev) |
|
5886 | ret = hg.update(repo, rev) | |
5888 |
|
5887 | |||
5889 | if not ret and movemarkfrom: |
|
5888 | if not ret and movemarkfrom: | |
5890 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
5889 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
5891 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
5890 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |
5892 | elif brev in repo._bookmarks: |
|
5891 | elif brev in repo._bookmarks: | |
5893 | bookmarks.setcurrent(repo, brev) |
|
5892 | bookmarks.setcurrent(repo, brev) | |
5894 | elif brev: |
|
5893 | elif brev: | |
5895 | bookmarks.unsetcurrent(repo) |
|
5894 | bookmarks.unsetcurrent(repo) | |
5896 |
|
5895 | |||
5897 | return ret |
|
5896 | return ret | |
5898 |
|
5897 | |||
5899 | @command('verify', []) |
|
5898 | @command('verify', []) | |
5900 | def verify(ui, repo): |
|
5899 | def verify(ui, repo): | |
5901 | """verify the integrity of the repository |
|
5900 | """verify the integrity of the repository | |
5902 |
|
5901 | |||
5903 | Verify the integrity of the current repository. |
|
5902 | Verify the integrity of the current repository. | |
5904 |
|
5903 | |||
5905 | This will perform an extensive check of the repository's |
|
5904 | This will perform an extensive check of the repository's | |
5906 | integrity, validating the hashes and checksums of each entry in |
|
5905 | integrity, validating the hashes and checksums of each entry in | |
5907 | the changelog, manifest, and tracked files, as well as the |
|
5906 | the changelog, manifest, and tracked files, as well as the | |
5908 | integrity of their crosslinks and indices. |
|
5907 | integrity of their crosslinks and indices. | |
5909 |
|
5908 | |||
5910 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption |
|
5909 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption | |
5911 | for more information about recovery from corruption of the |
|
5910 | for more information about recovery from corruption of the | |
5912 | repository. |
|
5911 | repository. | |
5913 |
|
5912 | |||
5914 | Returns 0 on success, 1 if errors are encountered. |
|
5913 | Returns 0 on success, 1 if errors are encountered. | |
5915 | """ |
|
5914 | """ | |
5916 | return hg.verify(repo) |
|
5915 | return hg.verify(repo) | |
5917 |
|
5916 | |||
5918 | @command('version', []) |
|
5917 | @command('version', []) | |
5919 | def version_(ui): |
|
5918 | def version_(ui): | |
5920 | """output version and copyright information""" |
|
5919 | """output version and copyright information""" | |
5921 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
5920 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | |
5922 | % util.version()) |
|
5921 | % util.version()) | |
5923 | ui.status(_( |
|
5922 | ui.status(_( | |
5924 | "(see http://mercurial.selenic.com for more information)\n" |
|
5923 | "(see http://mercurial.selenic.com for more information)\n" | |
5925 | "\nCopyright (C) 2005-2014 Matt Mackall and others\n" |
|
5924 | "\nCopyright (C) 2005-2014 Matt Mackall and others\n" | |
5926 | "This is free software; see the source for copying conditions. " |
|
5925 | "This is free software; see the source for copying conditions. " | |
5927 | "There is NO\nwarranty; " |
|
5926 | "There is NO\nwarranty; " | |
5928 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5927 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
5929 | )) |
|
5928 | )) | |
5930 |
|
5929 | |||
5931 | norepo = ("clone init version help debugcommands debugcomplete" |
|
5930 | norepo = ("clone init version help debugcommands debugcomplete" | |
5932 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" |
|
5931 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" | |
5933 | " debugknown debuggetbundle debugbundle") |
|
5932 | " debugknown debuggetbundle debugbundle") | |
5934 | optionalrepo = ("identify paths serve showconfig debugancestor debugdag" |
|
5933 | optionalrepo = ("identify paths serve showconfig debugancestor debugdag" | |
5935 | " debugdata debugindex debugindexdot debugrevlog") |
|
5934 | " debugdata debugindex debugindexdot debugrevlog") | |
5936 | inferrepo = ("add addremove annotate cat commit diff grep forget log parents" |
|
5935 | inferrepo = ("add addremove annotate cat commit diff grep forget log parents" | |
5937 | " remove resolve status debugwalk") |
|
5936 | " remove resolve status debugwalk") |
@@ -1,941 +1,942 b'' | |||||
1 | # merge.py - directory-level update/merge handling for Mercurial |
|
1 | # merge.py - directory-level update/merge handling for Mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2006, 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 | import struct |
|
8 | import struct | |
9 |
|
9 | |||
10 | from node import nullid, nullrev, hex, bin |
|
10 | from node import nullid, nullrev, hex, bin | |
11 | from i18n import _ |
|
11 | from i18n import _ | |
12 | from mercurial import obsolete |
|
12 | from mercurial import obsolete | |
13 | import error, util, filemerge, copies, subrepo, worker, dicthelpers |
|
13 | import error, util, filemerge, copies, subrepo, worker, dicthelpers | |
14 | import errno, os, shutil |
|
14 | import errno, os, shutil | |
15 |
|
15 | |||
16 | _pack = struct.pack |
|
16 | _pack = struct.pack | |
17 | _unpack = struct.unpack |
|
17 | _unpack = struct.unpack | |
18 |
|
18 | |||
19 | def _droponode(data): |
|
19 | def _droponode(data): | |
20 | # used for compatibility for v1 |
|
20 | # used for compatibility for v1 | |
21 | bits = data.split("\0") |
|
21 | bits = data.split("\0") | |
22 | bits = bits[:-2] + bits[-1:] |
|
22 | bits = bits[:-2] + bits[-1:] | |
23 | return "\0".join(bits) |
|
23 | return "\0".join(bits) | |
24 |
|
24 | |||
25 | class mergestate(object): |
|
25 | class mergestate(object): | |
26 | '''track 3-way merge state of individual files |
|
26 | '''track 3-way merge state of individual files | |
27 |
|
27 | |||
28 | it is stored on disk when needed. Two file are used, one with an old |
|
28 | it is stored on disk when needed. Two file are used, one with an old | |
29 | format, one with a new format. Both contains similar data, but the new |
|
29 | format, one with a new format. Both contains similar data, but the new | |
30 | format can store new kind of field. |
|
30 | format can store new kind of field. | |
31 |
|
31 | |||
32 | Current new format is a list of arbitrary record of the form: |
|
32 | Current new format is a list of arbitrary record of the form: | |
33 |
|
33 | |||
34 | [type][length][content] |
|
34 | [type][length][content] | |
35 |
|
35 | |||
36 | Type is a single character, length is a 4 bytes integer, content is an |
|
36 | Type is a single character, length is a 4 bytes integer, content is an | |
37 | arbitrary suites of bytes of lenght `length`. |
|
37 | arbitrary suites of bytes of lenght `length`. | |
38 |
|
38 | |||
39 | Type should be a letter. Capital letter are mandatory record, Mercurial |
|
39 | Type should be a letter. Capital letter are mandatory record, Mercurial | |
40 | should abort if they are unknown. lower case record can be safely ignored. |
|
40 | should abort if they are unknown. lower case record can be safely ignored. | |
41 |
|
41 | |||
42 | Currently known record: |
|
42 | Currently known record: | |
43 |
|
43 | |||
44 | L: the node of the "local" part of the merge (hexified version) |
|
44 | L: the node of the "local" part of the merge (hexified version) | |
45 | O: the node of the "other" part of the merge (hexified version) |
|
45 | O: the node of the "other" part of the merge (hexified version) | |
46 | F: a file to be merged entry |
|
46 | F: a file to be merged entry | |
47 | ''' |
|
47 | ''' | |
48 | statepathv1 = "merge/state" |
|
48 | statepathv1 = "merge/state" | |
49 | statepathv2 = "merge/state2" |
|
49 | statepathv2 = "merge/state2" | |
50 | def __init__(self, repo): |
|
50 | def __init__(self, repo): | |
51 | self._repo = repo |
|
51 | self._repo = repo | |
52 | self._dirty = False |
|
52 | self._dirty = False | |
53 | self._read() |
|
53 | self._read() | |
54 | def reset(self, node=None, other=None): |
|
54 | def reset(self, node=None, other=None): | |
55 | self._state = {} |
|
55 | self._state = {} | |
56 | if node: |
|
56 | if node: | |
57 | self._local = node |
|
57 | self._local = node | |
58 | self._other = other |
|
58 | self._other = other | |
59 | shutil.rmtree(self._repo.join("merge"), True) |
|
59 | shutil.rmtree(self._repo.join("merge"), True) | |
60 | self._dirty = False |
|
60 | self._dirty = False | |
61 | def _read(self): |
|
61 | def _read(self): | |
62 | self._state = {} |
|
62 | self._state = {} | |
63 | records = self._readrecords() |
|
63 | records = self._readrecords() | |
64 | for rtype, record in records: |
|
64 | for rtype, record in records: | |
65 | if rtype == 'L': |
|
65 | if rtype == 'L': | |
66 | self._local = bin(record) |
|
66 | self._local = bin(record) | |
67 | elif rtype == 'O': |
|
67 | elif rtype == 'O': | |
68 | self._other = bin(record) |
|
68 | self._other = bin(record) | |
69 | elif rtype == "F": |
|
69 | elif rtype == "F": | |
70 | bits = record.split("\0") |
|
70 | bits = record.split("\0") | |
71 | self._state[bits[0]] = bits[1:] |
|
71 | self._state[bits[0]] = bits[1:] | |
72 | elif not rtype.islower(): |
|
72 | elif not rtype.islower(): | |
73 | raise util.Abort(_('unsupported merge state record:' |
|
73 | raise util.Abort(_('unsupported merge state record:' | |
74 | % rtype)) |
|
74 | % rtype)) | |
75 | self._dirty = False |
|
75 | self._dirty = False | |
76 | def _readrecords(self): |
|
76 | def _readrecords(self): | |
77 | v1records = self._readrecordsv1() |
|
77 | v1records = self._readrecordsv1() | |
78 | v2records = self._readrecordsv2() |
|
78 | v2records = self._readrecordsv2() | |
79 | oldv2 = set() # old format version of v2 record |
|
79 | oldv2 = set() # old format version of v2 record | |
80 | for rec in v2records: |
|
80 | for rec in v2records: | |
81 | if rec[0] == 'L': |
|
81 | if rec[0] == 'L': | |
82 | oldv2.add(rec) |
|
82 | oldv2.add(rec) | |
83 | elif rec[0] == 'F': |
|
83 | elif rec[0] == 'F': | |
84 | # drop the onode data (not contained in v1) |
|
84 | # drop the onode data (not contained in v1) | |
85 | oldv2.add(('F', _droponode(rec[1]))) |
|
85 | oldv2.add(('F', _droponode(rec[1]))) | |
86 | for rec in v1records: |
|
86 | for rec in v1records: | |
87 | if rec not in oldv2: |
|
87 | if rec not in oldv2: | |
88 | # v1 file is newer than v2 file, use it |
|
88 | # v1 file is newer than v2 file, use it | |
89 | # we have to infer the "other" changeset of the merge |
|
89 | # we have to infer the "other" changeset of the merge | |
90 | # we cannot do better than that with v1 of the format |
|
90 | # we cannot do better than that with v1 of the format | |
91 | mctx = self._repo[None].parents()[-1] |
|
91 | mctx = self._repo[None].parents()[-1] | |
92 | v1records.append(('O', mctx.hex())) |
|
92 | v1records.append(('O', mctx.hex())) | |
93 | # add place holder "other" file node information |
|
93 | # add place holder "other" file node information | |
94 | # nobody is using it yet so we do no need to fetch the data |
|
94 | # nobody is using it yet so we do no need to fetch the data | |
95 | # if mctx was wrong `mctx[bits[-2]]` may fails. |
|
95 | # if mctx was wrong `mctx[bits[-2]]` may fails. | |
96 | for idx, r in enumerate(v1records): |
|
96 | for idx, r in enumerate(v1records): | |
97 | if r[0] == 'F': |
|
97 | if r[0] == 'F': | |
98 | bits = r[1].split("\0") |
|
98 | bits = r[1].split("\0") | |
99 | bits.insert(-2, '') |
|
99 | bits.insert(-2, '') | |
100 | v1records[idx] = (r[0], "\0".join(bits)) |
|
100 | v1records[idx] = (r[0], "\0".join(bits)) | |
101 | return v1records |
|
101 | return v1records | |
102 | else: |
|
102 | else: | |
103 | return v2records |
|
103 | return v2records | |
104 | def _readrecordsv1(self): |
|
104 | def _readrecordsv1(self): | |
105 | records = [] |
|
105 | records = [] | |
106 | try: |
|
106 | try: | |
107 | f = self._repo.opener(self.statepathv1) |
|
107 | f = self._repo.opener(self.statepathv1) | |
108 | for i, l in enumerate(f): |
|
108 | for i, l in enumerate(f): | |
109 | if i == 0: |
|
109 | if i == 0: | |
110 | records.append(('L', l[:-1])) |
|
110 | records.append(('L', l[:-1])) | |
111 | else: |
|
111 | else: | |
112 | records.append(('F', l[:-1])) |
|
112 | records.append(('F', l[:-1])) | |
113 | f.close() |
|
113 | f.close() | |
114 | except IOError, err: |
|
114 | except IOError, err: | |
115 | if err.errno != errno.ENOENT: |
|
115 | if err.errno != errno.ENOENT: | |
116 | raise |
|
116 | raise | |
117 | return records |
|
117 | return records | |
118 | def _readrecordsv2(self): |
|
118 | def _readrecordsv2(self): | |
119 | records = [] |
|
119 | records = [] | |
120 | try: |
|
120 | try: | |
121 | f = self._repo.opener(self.statepathv2) |
|
121 | f = self._repo.opener(self.statepathv2) | |
122 | data = f.read() |
|
122 | data = f.read() | |
123 | off = 0 |
|
123 | off = 0 | |
124 | end = len(data) |
|
124 | end = len(data) | |
125 | while off < end: |
|
125 | while off < end: | |
126 | rtype = data[off] |
|
126 | rtype = data[off] | |
127 | off += 1 |
|
127 | off += 1 | |
128 | lenght = _unpack('>I', data[off:(off + 4)])[0] |
|
128 | lenght = _unpack('>I', data[off:(off + 4)])[0] | |
129 | off += 4 |
|
129 | off += 4 | |
130 | record = data[off:(off + lenght)] |
|
130 | record = data[off:(off + lenght)] | |
131 | off += lenght |
|
131 | off += lenght | |
132 | records.append((rtype, record)) |
|
132 | records.append((rtype, record)) | |
133 | f.close() |
|
133 | f.close() | |
134 | except IOError, err: |
|
134 | except IOError, err: | |
135 | if err.errno != errno.ENOENT: |
|
135 | if err.errno != errno.ENOENT: | |
136 | raise |
|
136 | raise | |
137 | return records |
|
137 | return records | |
138 | def commit(self): |
|
138 | def commit(self): | |
139 | if self._dirty: |
|
139 | if self._dirty: | |
140 | records = [] |
|
140 | records = [] | |
141 | records.append(("L", hex(self._local))) |
|
141 | records.append(("L", hex(self._local))) | |
142 | records.append(("O", hex(self._other))) |
|
142 | records.append(("O", hex(self._other))) | |
143 | for d, v in self._state.iteritems(): |
|
143 | for d, v in self._state.iteritems(): | |
144 | records.append(("F", "\0".join([d] + v))) |
|
144 | records.append(("F", "\0".join([d] + v))) | |
145 | self._writerecords(records) |
|
145 | self._writerecords(records) | |
146 | self._dirty = False |
|
146 | self._dirty = False | |
147 | def _writerecords(self, records): |
|
147 | def _writerecords(self, records): | |
148 | self._writerecordsv1(records) |
|
148 | self._writerecordsv1(records) | |
149 | self._writerecordsv2(records) |
|
149 | self._writerecordsv2(records) | |
150 | def _writerecordsv1(self, records): |
|
150 | def _writerecordsv1(self, records): | |
151 | f = self._repo.opener(self.statepathv1, "w") |
|
151 | f = self._repo.opener(self.statepathv1, "w") | |
152 | irecords = iter(records) |
|
152 | irecords = iter(records) | |
153 | lrecords = irecords.next() |
|
153 | lrecords = irecords.next() | |
154 | assert lrecords[0] == 'L' |
|
154 | assert lrecords[0] == 'L' | |
155 | f.write(hex(self._local) + "\n") |
|
155 | f.write(hex(self._local) + "\n") | |
156 | for rtype, data in irecords: |
|
156 | for rtype, data in irecords: | |
157 | if rtype == "F": |
|
157 | if rtype == "F": | |
158 | f.write("%s\n" % _droponode(data)) |
|
158 | f.write("%s\n" % _droponode(data)) | |
159 | f.close() |
|
159 | f.close() | |
160 | def _writerecordsv2(self, records): |
|
160 | def _writerecordsv2(self, records): | |
161 | f = self._repo.opener(self.statepathv2, "w") |
|
161 | f = self._repo.opener(self.statepathv2, "w") | |
162 | for key, data in records: |
|
162 | for key, data in records: | |
163 | assert len(key) == 1 |
|
163 | assert len(key) == 1 | |
164 | format = ">sI%is" % len(data) |
|
164 | format = ">sI%is" % len(data) | |
165 | f.write(_pack(format, key, len(data), data)) |
|
165 | f.write(_pack(format, key, len(data), data)) | |
166 | f.close() |
|
166 | f.close() | |
167 | def add(self, fcl, fco, fca, fd): |
|
167 | def add(self, fcl, fco, fca, fd): | |
168 | hash = util.sha1(fcl.path()).hexdigest() |
|
168 | hash = util.sha1(fcl.path()).hexdigest() | |
169 | self._repo.opener.write("merge/" + hash, fcl.data()) |
|
169 | self._repo.opener.write("merge/" + hash, fcl.data()) | |
170 | self._state[fd] = ['u', hash, fcl.path(), |
|
170 | self._state[fd] = ['u', hash, fcl.path(), | |
171 | fca.path(), hex(fca.filenode()), |
|
171 | fca.path(), hex(fca.filenode()), | |
172 | fco.path(), hex(fco.filenode()), |
|
172 | fco.path(), hex(fco.filenode()), | |
173 | fcl.flags()] |
|
173 | fcl.flags()] | |
174 | self._dirty = True |
|
174 | self._dirty = True | |
175 | def __contains__(self, dfile): |
|
175 | def __contains__(self, dfile): | |
176 | return dfile in self._state |
|
176 | return dfile in self._state | |
177 | def __getitem__(self, dfile): |
|
177 | def __getitem__(self, dfile): | |
178 | return self._state[dfile][0] |
|
178 | return self._state[dfile][0] | |
179 | def __iter__(self): |
|
179 | def __iter__(self): | |
180 | l = self._state.keys() |
|
180 | l = self._state.keys() | |
181 | l.sort() |
|
181 | l.sort() | |
182 | for f in l: |
|
182 | for f in l: | |
183 | yield f |
|
183 | yield f | |
184 | def files(self): |
|
184 | def files(self): | |
185 | return self._state.keys() |
|
185 | return self._state.keys() | |
186 | def mark(self, dfile, state): |
|
186 | def mark(self, dfile, state): | |
187 | self._state[dfile][0] = state |
|
187 | self._state[dfile][0] = state | |
188 | self._dirty = True |
|
188 | self._dirty = True | |
189 |
def resolve(self, dfile, wctx |
|
189 | def resolve(self, dfile, wctx): | |
190 | if self[dfile] == 'r': |
|
190 | if self[dfile] == 'r': | |
191 | return 0 |
|
191 | return 0 | |
192 | stateentry = self._state[dfile] |
|
192 | stateentry = self._state[dfile] | |
193 | state, hash, lfile, afile, anode, ofile, onode, flags = stateentry |
|
193 | state, hash, lfile, afile, anode, ofile, onode, flags = stateentry | |
|
194 | octx = self._repo[self._other] | |||
194 | fcd = wctx[dfile] |
|
195 | fcd = wctx[dfile] | |
195 | fco = octx[ofile] |
|
196 | fco = octx[ofile] | |
196 | fca = self._repo.filectx(afile, fileid=anode) |
|
197 | fca = self._repo.filectx(afile, fileid=anode) | |
197 | # "premerge" x flags |
|
198 | # "premerge" x flags | |
198 | flo = fco.flags() |
|
199 | flo = fco.flags() | |
199 | fla = fca.flags() |
|
200 | fla = fca.flags() | |
200 | if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: |
|
201 | if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: | |
201 | if fca.node() == nullid: |
|
202 | if fca.node() == nullid: | |
202 | self._repo.ui.warn(_('warning: cannot merge flags for %s\n') % |
|
203 | self._repo.ui.warn(_('warning: cannot merge flags for %s\n') % | |
203 | afile) |
|
204 | afile) | |
204 | elif flags == fla: |
|
205 | elif flags == fla: | |
205 | flags = flo |
|
206 | flags = flo | |
206 | # restore local |
|
207 | # restore local | |
207 | f = self._repo.opener("merge/" + hash) |
|
208 | f = self._repo.opener("merge/" + hash) | |
208 | self._repo.wwrite(dfile, f.read(), flags) |
|
209 | self._repo.wwrite(dfile, f.read(), flags) | |
209 | f.close() |
|
210 | f.close() | |
210 | r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) |
|
211 | r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) | |
211 | if r is None: |
|
212 | if r is None: | |
212 | # no real conflict |
|
213 | # no real conflict | |
213 | del self._state[dfile] |
|
214 | del self._state[dfile] | |
214 | elif not r: |
|
215 | elif not r: | |
215 | self.mark(dfile, 'r') |
|
216 | self.mark(dfile, 'r') | |
216 | return r |
|
217 | return r | |
217 |
|
218 | |||
218 | def _checkunknownfile(repo, wctx, mctx, f): |
|
219 | def _checkunknownfile(repo, wctx, mctx, f): | |
219 | return (not repo.dirstate._ignore(f) |
|
220 | return (not repo.dirstate._ignore(f) | |
220 | and os.path.isfile(repo.wjoin(f)) |
|
221 | and os.path.isfile(repo.wjoin(f)) | |
221 | and repo.wopener.audit.check(f) |
|
222 | and repo.wopener.audit.check(f) | |
222 | and repo.dirstate.normalize(f) not in repo.dirstate |
|
223 | and repo.dirstate.normalize(f) not in repo.dirstate | |
223 | and mctx[f].cmp(wctx[f])) |
|
224 | and mctx[f].cmp(wctx[f])) | |
224 |
|
225 | |||
225 | def _checkunknown(repo, wctx, mctx): |
|
226 | def _checkunknown(repo, wctx, mctx): | |
226 | "check for collisions between unknown files and files in mctx" |
|
227 | "check for collisions between unknown files and files in mctx" | |
227 |
|
228 | |||
228 | error = False |
|
229 | error = False | |
229 | for f in mctx: |
|
230 | for f in mctx: | |
230 | if f not in wctx and _checkunknownfile(repo, wctx, mctx, f): |
|
231 | if f not in wctx and _checkunknownfile(repo, wctx, mctx, f): | |
231 | error = True |
|
232 | error = True | |
232 | wctx._repo.ui.warn(_("%s: untracked file differs\n") % f) |
|
233 | wctx._repo.ui.warn(_("%s: untracked file differs\n") % f) | |
233 | if error: |
|
234 | if error: | |
234 | raise util.Abort(_("untracked files in working directory differ " |
|
235 | raise util.Abort(_("untracked files in working directory differ " | |
235 | "from files in requested revision")) |
|
236 | "from files in requested revision")) | |
236 |
|
237 | |||
237 | def _forgetremoved(wctx, mctx, branchmerge): |
|
238 | def _forgetremoved(wctx, mctx, branchmerge): | |
238 | """ |
|
239 | """ | |
239 | Forget removed files |
|
240 | Forget removed files | |
240 |
|
241 | |||
241 | If we're jumping between revisions (as opposed to merging), and if |
|
242 | If we're jumping between revisions (as opposed to merging), and if | |
242 | neither the working directory nor the target rev has the file, |
|
243 | neither the working directory nor the target rev has the file, | |
243 | then we need to remove it from the dirstate, to prevent the |
|
244 | then we need to remove it from the dirstate, to prevent the | |
244 | dirstate from listing the file when it is no longer in the |
|
245 | dirstate from listing the file when it is no longer in the | |
245 | manifest. |
|
246 | manifest. | |
246 |
|
247 | |||
247 | If we're merging, and the other revision has removed a file |
|
248 | If we're merging, and the other revision has removed a file | |
248 | that is not present in the working directory, we need to mark it |
|
249 | that is not present in the working directory, we need to mark it | |
249 | as removed. |
|
250 | as removed. | |
250 | """ |
|
251 | """ | |
251 |
|
252 | |||
252 | actions = [] |
|
253 | actions = [] | |
253 | state = branchmerge and 'r' or 'f' |
|
254 | state = branchmerge and 'r' or 'f' | |
254 | for f in wctx.deleted(): |
|
255 | for f in wctx.deleted(): | |
255 | if f not in mctx: |
|
256 | if f not in mctx: | |
256 | actions.append((f, state, None, "forget deleted")) |
|
257 | actions.append((f, state, None, "forget deleted")) | |
257 |
|
258 | |||
258 | if not branchmerge: |
|
259 | if not branchmerge: | |
259 | for f in wctx.removed(): |
|
260 | for f in wctx.removed(): | |
260 | if f not in mctx: |
|
261 | if f not in mctx: | |
261 | actions.append((f, "f", None, "forget removed")) |
|
262 | actions.append((f, "f", None, "forget removed")) | |
262 |
|
263 | |||
263 | return actions |
|
264 | return actions | |
264 |
|
265 | |||
265 | def _checkcollision(repo, wmf, actions, prompts): |
|
266 | def _checkcollision(repo, wmf, actions, prompts): | |
266 | # build provisional merged manifest up |
|
267 | # build provisional merged manifest up | |
267 | pmmf = set(wmf) |
|
268 | pmmf = set(wmf) | |
268 |
|
269 | |||
269 | def addop(f, args): |
|
270 | def addop(f, args): | |
270 | pmmf.add(f) |
|
271 | pmmf.add(f) | |
271 | def removeop(f, args): |
|
272 | def removeop(f, args): | |
272 | pmmf.discard(f) |
|
273 | pmmf.discard(f) | |
273 | def nop(f, args): |
|
274 | def nop(f, args): | |
274 | pass |
|
275 | pass | |
275 |
|
276 | |||
276 | def renameop(f, args): |
|
277 | def renameop(f, args): | |
277 | f2, fd, flags = args |
|
278 | f2, fd, flags = args | |
278 | if f: |
|
279 | if f: | |
279 | pmmf.discard(f) |
|
280 | pmmf.discard(f) | |
280 | pmmf.add(fd) |
|
281 | pmmf.add(fd) | |
281 | def mergeop(f, args): |
|
282 | def mergeop(f, args): | |
282 | f2, fd, move = args |
|
283 | f2, fd, move = args | |
283 | if move: |
|
284 | if move: | |
284 | pmmf.discard(f) |
|
285 | pmmf.discard(f) | |
285 | pmmf.add(fd) |
|
286 | pmmf.add(fd) | |
286 |
|
287 | |||
287 | opmap = { |
|
288 | opmap = { | |
288 | "a": addop, |
|
289 | "a": addop, | |
289 | "d": renameop, |
|
290 | "d": renameop, | |
290 | "dr": nop, |
|
291 | "dr": nop, | |
291 | "e": nop, |
|
292 | "e": nop, | |
292 | "f": addop, # untracked file should be kept in working directory |
|
293 | "f": addop, # untracked file should be kept in working directory | |
293 | "g": addop, |
|
294 | "g": addop, | |
294 | "m": mergeop, |
|
295 | "m": mergeop, | |
295 | "r": removeop, |
|
296 | "r": removeop, | |
296 | "rd": nop, |
|
297 | "rd": nop, | |
297 | } |
|
298 | } | |
298 | for f, m, args, msg in actions: |
|
299 | for f, m, args, msg in actions: | |
299 | op = opmap.get(m) |
|
300 | op = opmap.get(m) | |
300 | assert op, m |
|
301 | assert op, m | |
301 | op(f, args) |
|
302 | op(f, args) | |
302 |
|
303 | |||
303 | opmap = { |
|
304 | opmap = { | |
304 | "cd": addop, |
|
305 | "cd": addop, | |
305 | "dc": addop, |
|
306 | "dc": addop, | |
306 | } |
|
307 | } | |
307 | for f, m in prompts: |
|
308 | for f, m in prompts: | |
308 | op = opmap.get(m) |
|
309 | op = opmap.get(m) | |
309 | assert op, m |
|
310 | assert op, m | |
310 | op(f, None) |
|
311 | op(f, None) | |
311 |
|
312 | |||
312 | # check case-folding collision in provisional merged manifest |
|
313 | # check case-folding collision in provisional merged manifest | |
313 | foldmap = {} |
|
314 | foldmap = {} | |
314 | for f in sorted(pmmf): |
|
315 | for f in sorted(pmmf): | |
315 | fold = util.normcase(f) |
|
316 | fold = util.normcase(f) | |
316 | if fold in foldmap: |
|
317 | if fold in foldmap: | |
317 | raise util.Abort(_("case-folding collision between %s and %s") |
|
318 | raise util.Abort(_("case-folding collision between %s and %s") | |
318 | % (f, foldmap[fold])) |
|
319 | % (f, foldmap[fold])) | |
319 | foldmap[fold] = f |
|
320 | foldmap[fold] = f | |
320 |
|
321 | |||
321 | def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial, |
|
322 | def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial, | |
322 | acceptremote=False): |
|
323 | acceptremote=False): | |
323 | """ |
|
324 | """ | |
324 | Merge p1 and p2 with ancestor pa and generate merge action list |
|
325 | Merge p1 and p2 with ancestor pa and generate merge action list | |
325 |
|
326 | |||
326 | branchmerge and force are as passed in to update |
|
327 | branchmerge and force are as passed in to update | |
327 | partial = function to filter file lists |
|
328 | partial = function to filter file lists | |
328 | acceptremote = accept the incoming changes without prompting |
|
329 | acceptremote = accept the incoming changes without prompting | |
329 | """ |
|
330 | """ | |
330 |
|
331 | |||
331 | overwrite = force and not branchmerge |
|
332 | overwrite = force and not branchmerge | |
332 | actions, copy, movewithdir = [], {}, {} |
|
333 | actions, copy, movewithdir = [], {}, {} | |
333 |
|
334 | |||
334 | followcopies = False |
|
335 | followcopies = False | |
335 | if overwrite: |
|
336 | if overwrite: | |
336 | pa = wctx |
|
337 | pa = wctx | |
337 | elif pa == p2: # backwards |
|
338 | elif pa == p2: # backwards | |
338 | pa = wctx.p1() |
|
339 | pa = wctx.p1() | |
339 | elif not branchmerge and not wctx.dirty(missing=True): |
|
340 | elif not branchmerge and not wctx.dirty(missing=True): | |
340 | pass |
|
341 | pass | |
341 | elif pa and repo.ui.configbool("merge", "followcopies", True): |
|
342 | elif pa and repo.ui.configbool("merge", "followcopies", True): | |
342 | followcopies = True |
|
343 | followcopies = True | |
343 |
|
344 | |||
344 | # manifests fetched in order are going to be faster, so prime the caches |
|
345 | # manifests fetched in order are going to be faster, so prime the caches | |
345 | [x.manifest() for x in |
|
346 | [x.manifest() for x in | |
346 | sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev())] |
|
347 | sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev())] | |
347 |
|
348 | |||
348 | if followcopies: |
|
349 | if followcopies: | |
349 | ret = copies.mergecopies(repo, wctx, p2, pa) |
|
350 | ret = copies.mergecopies(repo, wctx, p2, pa) | |
350 | copy, movewithdir, diverge, renamedelete = ret |
|
351 | copy, movewithdir, diverge, renamedelete = ret | |
351 | for of, fl in diverge.iteritems(): |
|
352 | for of, fl in diverge.iteritems(): | |
352 | actions.append((of, "dr", (fl,), "divergent renames")) |
|
353 | actions.append((of, "dr", (fl,), "divergent renames")) | |
353 | for of, fl in renamedelete.iteritems(): |
|
354 | for of, fl in renamedelete.iteritems(): | |
354 | actions.append((of, "rd", (fl,), "rename and delete")) |
|
355 | actions.append((of, "rd", (fl,), "rename and delete")) | |
355 |
|
356 | |||
356 | repo.ui.note(_("resolving manifests\n")) |
|
357 | repo.ui.note(_("resolving manifests\n")) | |
357 | repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n" |
|
358 | repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n" | |
358 | % (bool(branchmerge), bool(force), bool(partial))) |
|
359 | % (bool(branchmerge), bool(force), bool(partial))) | |
359 | repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2)) |
|
360 | repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2)) | |
360 |
|
361 | |||
361 | m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() |
|
362 | m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() | |
362 | copied = set(copy.values()) |
|
363 | copied = set(copy.values()) | |
363 | copied.update(movewithdir.values()) |
|
364 | copied.update(movewithdir.values()) | |
364 |
|
365 | |||
365 | if '.hgsubstate' in m1: |
|
366 | if '.hgsubstate' in m1: | |
366 | # check whether sub state is modified |
|
367 | # check whether sub state is modified | |
367 | for s in sorted(wctx.substate): |
|
368 | for s in sorted(wctx.substate): | |
368 | if wctx.sub(s).dirty(): |
|
369 | if wctx.sub(s).dirty(): | |
369 | m1['.hgsubstate'] += "+" |
|
370 | m1['.hgsubstate'] += "+" | |
370 | break |
|
371 | break | |
371 |
|
372 | |||
372 | aborts, prompts = [], [] |
|
373 | aborts, prompts = [], [] | |
373 | # Compare manifests |
|
374 | # Compare manifests | |
374 | fdiff = dicthelpers.diff(m1, m2) |
|
375 | fdiff = dicthelpers.diff(m1, m2) | |
375 | flagsdiff = m1.flagsdiff(m2) |
|
376 | flagsdiff = m1.flagsdiff(m2) | |
376 | diff12 = dicthelpers.join(fdiff, flagsdiff) |
|
377 | diff12 = dicthelpers.join(fdiff, flagsdiff) | |
377 |
|
378 | |||
378 | for f, (n12, fl12) in diff12.iteritems(): |
|
379 | for f, (n12, fl12) in diff12.iteritems(): | |
379 | if n12: |
|
380 | if n12: | |
380 | n1, n2 = n12 |
|
381 | n1, n2 = n12 | |
381 | else: # file contents didn't change, but flags did |
|
382 | else: # file contents didn't change, but flags did | |
382 | n1 = n2 = m1.get(f, None) |
|
383 | n1 = n2 = m1.get(f, None) | |
383 | if n1 is None: |
|
384 | if n1 is None: | |
384 | # Since n1 == n2, the file isn't present in m2 either. This |
|
385 | # Since n1 == n2, the file isn't present in m2 either. This | |
385 | # means that the file was removed or deleted locally and |
|
386 | # means that the file was removed or deleted locally and | |
386 | # removed remotely, but that residual entries remain in flags. |
|
387 | # removed remotely, but that residual entries remain in flags. | |
387 | # This can happen in manifests generated by workingctx. |
|
388 | # This can happen in manifests generated by workingctx. | |
388 | continue |
|
389 | continue | |
389 | if fl12: |
|
390 | if fl12: | |
390 | fl1, fl2 = fl12 |
|
391 | fl1, fl2 = fl12 | |
391 | else: # flags didn't change, file contents did |
|
392 | else: # flags didn't change, file contents did | |
392 | fl1 = fl2 = m1.flags(f) |
|
393 | fl1 = fl2 = m1.flags(f) | |
393 |
|
394 | |||
394 | if partial and not partial(f): |
|
395 | if partial and not partial(f): | |
395 | continue |
|
396 | continue | |
396 | if n1 and n2: |
|
397 | if n1 and n2: | |
397 | fla = ma.flags(f) |
|
398 | fla = ma.flags(f) | |
398 | nol = 'l' not in fl1 + fl2 + fla |
|
399 | nol = 'l' not in fl1 + fl2 + fla | |
399 | a = ma.get(f, nullid) |
|
400 | a = ma.get(f, nullid) | |
400 | if n2 == a and fl2 == fla: |
|
401 | if n2 == a and fl2 == fla: | |
401 | pass # remote unchanged - keep local |
|
402 | pass # remote unchanged - keep local | |
402 | elif n1 == a and fl1 == fla: # local unchanged - use remote |
|
403 | elif n1 == a and fl1 == fla: # local unchanged - use remote | |
403 | if n1 == n2: # optimization: keep local content |
|
404 | if n1 == n2: # optimization: keep local content | |
404 | actions.append((f, "e", (fl2,), "update permissions")) |
|
405 | actions.append((f, "e", (fl2,), "update permissions")) | |
405 | else: |
|
406 | else: | |
406 | actions.append((f, "g", (fl2,), "remote is newer")) |
|
407 | actions.append((f, "g", (fl2,), "remote is newer")) | |
407 | elif nol and n2 == a: # remote only changed 'x' |
|
408 | elif nol and n2 == a: # remote only changed 'x' | |
408 | actions.append((f, "e", (fl2,), "update permissions")) |
|
409 | actions.append((f, "e", (fl2,), "update permissions")) | |
409 | elif nol and n1 == a: # local only changed 'x' |
|
410 | elif nol and n1 == a: # local only changed 'x' | |
410 | actions.append((f, "g", (fl1,), "remote is newer")) |
|
411 | actions.append((f, "g", (fl1,), "remote is newer")) | |
411 | else: # both changed something |
|
412 | else: # both changed something | |
412 | actions.append((f, "m", (f, f, False), "versions differ")) |
|
413 | actions.append((f, "m", (f, f, False), "versions differ")) | |
413 | elif f in copied: # files we'll deal with on m2 side |
|
414 | elif f in copied: # files we'll deal with on m2 side | |
414 | pass |
|
415 | pass | |
415 | elif n1 and f in movewithdir: # directory rename |
|
416 | elif n1 and f in movewithdir: # directory rename | |
416 | f2 = movewithdir[f] |
|
417 | f2 = movewithdir[f] | |
417 | actions.append((f, "d", (None, f2, fl1), |
|
418 | actions.append((f, "d", (None, f2, fl1), | |
418 | "remote renamed directory to " + f2)) |
|
419 | "remote renamed directory to " + f2)) | |
419 | elif n1 and f in copy: |
|
420 | elif n1 and f in copy: | |
420 | f2 = copy[f] |
|
421 | f2 = copy[f] | |
421 | actions.append((f, "m", (f2, f, False), |
|
422 | actions.append((f, "m", (f2, f, False), | |
422 | "local copied/moved to " + f2)) |
|
423 | "local copied/moved to " + f2)) | |
423 | elif n1 and f in ma: # clean, a different, no remote |
|
424 | elif n1 and f in ma: # clean, a different, no remote | |
424 | if n1 != ma[f]: |
|
425 | if n1 != ma[f]: | |
425 | prompts.append((f, "cd")) # prompt changed/deleted |
|
426 | prompts.append((f, "cd")) # prompt changed/deleted | |
426 | elif n1[20:] == "a": # added, no remote |
|
427 | elif n1[20:] == "a": # added, no remote | |
427 | actions.append((f, "f", None, "remote deleted")) |
|
428 | actions.append((f, "f", None, "remote deleted")) | |
428 | else: |
|
429 | else: | |
429 | actions.append((f, "r", None, "other deleted")) |
|
430 | actions.append((f, "r", None, "other deleted")) | |
430 | elif n2 and f in movewithdir: |
|
431 | elif n2 and f in movewithdir: | |
431 | f2 = movewithdir[f] |
|
432 | f2 = movewithdir[f] | |
432 | actions.append((None, "d", (f, f2, fl2), |
|
433 | actions.append((None, "d", (f, f2, fl2), | |
433 | "local renamed directory to " + f2)) |
|
434 | "local renamed directory to " + f2)) | |
434 | elif n2 and f in copy: |
|
435 | elif n2 and f in copy: | |
435 | f2 = copy[f] |
|
436 | f2 = copy[f] | |
436 | if f2 in m2: |
|
437 | if f2 in m2: | |
437 | actions.append((f2, "m", (f, f, False), |
|
438 | actions.append((f2, "m", (f, f, False), | |
438 | "remote copied to " + f)) |
|
439 | "remote copied to " + f)) | |
439 | else: |
|
440 | else: | |
440 | actions.append((f2, "m", (f, f, True), |
|
441 | actions.append((f2, "m", (f, f, True), | |
441 | "remote moved to " + f)) |
|
442 | "remote moved to " + f)) | |
442 | elif n2 and f not in ma: |
|
443 | elif n2 and f not in ma: | |
443 | # local unknown, remote created: the logic is described by the |
|
444 | # local unknown, remote created: the logic is described by the | |
444 | # following table: |
|
445 | # following table: | |
445 | # |
|
446 | # | |
446 | # force branchmerge different | action |
|
447 | # force branchmerge different | action | |
447 | # n * n | get |
|
448 | # n * n | get | |
448 | # n * y | abort |
|
449 | # n * y | abort | |
449 | # y n * | get |
|
450 | # y n * | get | |
450 | # y y n | get |
|
451 | # y y n | get | |
451 | # y y y | merge |
|
452 | # y y y | merge | |
452 | # |
|
453 | # | |
453 | # Checking whether the files are different is expensive, so we |
|
454 | # Checking whether the files are different is expensive, so we | |
454 | # don't do that when we can avoid it. |
|
455 | # don't do that when we can avoid it. | |
455 | if force and not branchmerge: |
|
456 | if force and not branchmerge: | |
456 | actions.append((f, "g", (fl2,), "remote created")) |
|
457 | actions.append((f, "g", (fl2,), "remote created")) | |
457 | else: |
|
458 | else: | |
458 | different = _checkunknownfile(repo, wctx, p2, f) |
|
459 | different = _checkunknownfile(repo, wctx, p2, f) | |
459 | if force and branchmerge and different: |
|
460 | if force and branchmerge and different: | |
460 | actions.append((f, "m", (f, f, False), |
|
461 | actions.append((f, "m", (f, f, False), | |
461 | "remote differs from untracked local")) |
|
462 | "remote differs from untracked local")) | |
462 | elif not force and different: |
|
463 | elif not force and different: | |
463 | aborts.append((f, "ud")) |
|
464 | aborts.append((f, "ud")) | |
464 | else: |
|
465 | else: | |
465 | actions.append((f, "g", (fl2,), "remote created")) |
|
466 | actions.append((f, "g", (fl2,), "remote created")) | |
466 | elif n2 and n2 != ma[f]: |
|
467 | elif n2 and n2 != ma[f]: | |
467 | different = _checkunknownfile(repo, wctx, p2, f) |
|
468 | different = _checkunknownfile(repo, wctx, p2, f) | |
468 | if not force and different: |
|
469 | if not force and different: | |
469 | aborts.append((f, "ud")) |
|
470 | aborts.append((f, "ud")) | |
470 | else: |
|
471 | else: | |
471 | # if different: old untracked f may be overwritten and lost |
|
472 | # if different: old untracked f may be overwritten and lost | |
472 | prompts.append((f, "dc")) # prompt deleted/changed |
|
473 | prompts.append((f, "dc")) # prompt deleted/changed | |
473 |
|
474 | |||
474 | for f, m in sorted(aborts): |
|
475 | for f, m in sorted(aborts): | |
475 | if m == "ud": |
|
476 | if m == "ud": | |
476 | repo.ui.warn(_("%s: untracked file differs\n") % f) |
|
477 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
477 | else: assert False, m |
|
478 | else: assert False, m | |
478 | if aborts: |
|
479 | if aborts: | |
479 | raise util.Abort(_("untracked files in working directory differ " |
|
480 | raise util.Abort(_("untracked files in working directory differ " | |
480 | "from files in requested revision")) |
|
481 | "from files in requested revision")) | |
481 |
|
482 | |||
482 | if not util.checkcase(repo.path): |
|
483 | if not util.checkcase(repo.path): | |
483 | # check collision between files only in p2 for clean update |
|
484 | # check collision between files only in p2 for clean update | |
484 | if (not branchmerge and |
|
485 | if (not branchmerge and | |
485 | (force or not wctx.dirty(missing=True, branch=False))): |
|
486 | (force or not wctx.dirty(missing=True, branch=False))): | |
486 | _checkcollision(repo, m2, [], []) |
|
487 | _checkcollision(repo, m2, [], []) | |
487 | else: |
|
488 | else: | |
488 | _checkcollision(repo, m1, actions, prompts) |
|
489 | _checkcollision(repo, m1, actions, prompts) | |
489 |
|
490 | |||
490 | for f, m in sorted(prompts): |
|
491 | for f, m in sorted(prompts): | |
491 | if m == "cd": |
|
492 | if m == "cd": | |
492 | if acceptremote: |
|
493 | if acceptremote: | |
493 | actions.append((f, "r", None, "remote delete")) |
|
494 | actions.append((f, "r", None, "remote delete")) | |
494 | elif repo.ui.promptchoice( |
|
495 | elif repo.ui.promptchoice( | |
495 | _("local changed %s which remote deleted\n" |
|
496 | _("local changed %s which remote deleted\n" | |
496 | "use (c)hanged version or (d)elete?" |
|
497 | "use (c)hanged version or (d)elete?" | |
497 | "$$ &Changed $$ &Delete") % f, 0): |
|
498 | "$$ &Changed $$ &Delete") % f, 0): | |
498 | actions.append((f, "r", None, "prompt delete")) |
|
499 | actions.append((f, "r", None, "prompt delete")) | |
499 | else: |
|
500 | else: | |
500 | actions.append((f, "a", None, "prompt keep")) |
|
501 | actions.append((f, "a", None, "prompt keep")) | |
501 | elif m == "dc": |
|
502 | elif m == "dc": | |
502 | if acceptremote: |
|
503 | if acceptremote: | |
503 | actions.append((f, "g", (m2.flags(f),), "remote recreating")) |
|
504 | actions.append((f, "g", (m2.flags(f),), "remote recreating")) | |
504 | elif repo.ui.promptchoice( |
|
505 | elif repo.ui.promptchoice( | |
505 | _("remote changed %s which local deleted\n" |
|
506 | _("remote changed %s which local deleted\n" | |
506 | "use (c)hanged version or leave (d)eleted?" |
|
507 | "use (c)hanged version or leave (d)eleted?" | |
507 | "$$ &Changed $$ &Deleted") % f, 0) == 0: |
|
508 | "$$ &Changed $$ &Deleted") % f, 0) == 0: | |
508 | actions.append((f, "g", (m2.flags(f),), "prompt recreating")) |
|
509 | actions.append((f, "g", (m2.flags(f),), "prompt recreating")) | |
509 | else: assert False, m |
|
510 | else: assert False, m | |
510 | return actions |
|
511 | return actions | |
511 |
|
512 | |||
512 | def actionkey(a): |
|
513 | def actionkey(a): | |
513 | return a[1] in "rf" and -1 or 0, a |
|
514 | return a[1] in "rf" and -1 or 0, a | |
514 |
|
515 | |||
515 | def getremove(repo, mctx, overwrite, args): |
|
516 | def getremove(repo, mctx, overwrite, args): | |
516 | """apply usually-non-interactive updates to the working directory |
|
517 | """apply usually-non-interactive updates to the working directory | |
517 |
|
518 | |||
518 | mctx is the context to be merged into the working copy |
|
519 | mctx is the context to be merged into the working copy | |
519 |
|
520 | |||
520 | yields tuples for progress updates |
|
521 | yields tuples for progress updates | |
521 | """ |
|
522 | """ | |
522 | verbose = repo.ui.verbose |
|
523 | verbose = repo.ui.verbose | |
523 | unlink = util.unlinkpath |
|
524 | unlink = util.unlinkpath | |
524 | wjoin = repo.wjoin |
|
525 | wjoin = repo.wjoin | |
525 | fctx = mctx.filectx |
|
526 | fctx = mctx.filectx | |
526 | wwrite = repo.wwrite |
|
527 | wwrite = repo.wwrite | |
527 | audit = repo.wopener.audit |
|
528 | audit = repo.wopener.audit | |
528 | i = 0 |
|
529 | i = 0 | |
529 | for arg in args: |
|
530 | for arg in args: | |
530 | f = arg[0] |
|
531 | f = arg[0] | |
531 | if arg[1] == 'r': |
|
532 | if arg[1] == 'r': | |
532 | if verbose: |
|
533 | if verbose: | |
533 | repo.ui.note(_("removing %s\n") % f) |
|
534 | repo.ui.note(_("removing %s\n") % f) | |
534 | audit(f) |
|
535 | audit(f) | |
535 | try: |
|
536 | try: | |
536 | unlink(wjoin(f), ignoremissing=True) |
|
537 | unlink(wjoin(f), ignoremissing=True) | |
537 | except OSError, inst: |
|
538 | except OSError, inst: | |
538 | repo.ui.warn(_("update failed to remove %s: %s!\n") % |
|
539 | repo.ui.warn(_("update failed to remove %s: %s!\n") % | |
539 | (f, inst.strerror)) |
|
540 | (f, inst.strerror)) | |
540 | else: |
|
541 | else: | |
541 | if verbose: |
|
542 | if verbose: | |
542 | repo.ui.note(_("getting %s\n") % f) |
|
543 | repo.ui.note(_("getting %s\n") % f) | |
543 | wwrite(f, fctx(f).data(), arg[2][0]) |
|
544 | wwrite(f, fctx(f).data(), arg[2][0]) | |
544 | if i == 100: |
|
545 | if i == 100: | |
545 | yield i, f |
|
546 | yield i, f | |
546 | i = 0 |
|
547 | i = 0 | |
547 | i += 1 |
|
548 | i += 1 | |
548 | if i > 0: |
|
549 | if i > 0: | |
549 | yield i, f |
|
550 | yield i, f | |
550 |
|
551 | |||
551 | def applyupdates(repo, actions, wctx, mctx, actx, overwrite): |
|
552 | def applyupdates(repo, actions, wctx, mctx, actx, overwrite): | |
552 | """apply the merge action list to the working directory |
|
553 | """apply the merge action list to the working directory | |
553 |
|
554 | |||
554 | wctx is the working copy context |
|
555 | wctx is the working copy context | |
555 | mctx is the context to be merged into the working copy |
|
556 | mctx is the context to be merged into the working copy | |
556 | actx is the context of the common ancestor |
|
557 | actx is the context of the common ancestor | |
557 |
|
558 | |||
558 | Return a tuple of counts (updated, merged, removed, unresolved) that |
|
559 | Return a tuple of counts (updated, merged, removed, unresolved) that | |
559 | describes how many files were affected by the update. |
|
560 | describes how many files were affected by the update. | |
560 | """ |
|
561 | """ | |
561 |
|
562 | |||
562 | updated, merged, removed, unresolved = 0, 0, 0, 0 |
|
563 | updated, merged, removed, unresolved = 0, 0, 0, 0 | |
563 | ms = mergestate(repo) |
|
564 | ms = mergestate(repo) | |
564 | ms.reset(wctx.p1().node(), mctx.node()) |
|
565 | ms.reset(wctx.p1().node(), mctx.node()) | |
565 | moves = [] |
|
566 | moves = [] | |
566 | actions.sort(key=actionkey) |
|
567 | actions.sort(key=actionkey) | |
567 |
|
568 | |||
568 | # prescan for merges |
|
569 | # prescan for merges | |
569 | for a in actions: |
|
570 | for a in actions: | |
570 | f, m, args, msg = a |
|
571 | f, m, args, msg = a | |
571 | repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
|
572 | repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) | |
572 | if m == "m": # merge |
|
573 | if m == "m": # merge | |
573 | f2, fd, move = args |
|
574 | f2, fd, move = args | |
574 | if fd == '.hgsubstate': # merged internally |
|
575 | if fd == '.hgsubstate': # merged internally | |
575 | continue |
|
576 | continue | |
576 | repo.ui.debug(" preserving %s for resolve of %s\n" % (f, fd)) |
|
577 | repo.ui.debug(" preserving %s for resolve of %s\n" % (f, fd)) | |
577 | fcl = wctx[f] |
|
578 | fcl = wctx[f] | |
578 | fco = mctx[f2] |
|
579 | fco = mctx[f2] | |
579 | if mctx == actx: # backwards, use working dir parent as ancestor |
|
580 | if mctx == actx: # backwards, use working dir parent as ancestor | |
580 | if fcl.parents(): |
|
581 | if fcl.parents(): | |
581 | fca = fcl.p1() |
|
582 | fca = fcl.p1() | |
582 | else: |
|
583 | else: | |
583 | fca = repo.filectx(f, fileid=nullrev) |
|
584 | fca = repo.filectx(f, fileid=nullrev) | |
584 | else: |
|
585 | else: | |
585 | fca = fcl.ancestor(fco, actx) |
|
586 | fca = fcl.ancestor(fco, actx) | |
586 | if not fca: |
|
587 | if not fca: | |
587 | fca = repo.filectx(f, fileid=nullrev) |
|
588 | fca = repo.filectx(f, fileid=nullrev) | |
588 | ms.add(fcl, fco, fca, fd) |
|
589 | ms.add(fcl, fco, fca, fd) | |
589 | if f != fd and move: |
|
590 | if f != fd and move: | |
590 | moves.append(f) |
|
591 | moves.append(f) | |
591 |
|
592 | |||
592 | audit = repo.wopener.audit |
|
593 | audit = repo.wopener.audit | |
593 |
|
594 | |||
594 | # remove renamed files after safely stored |
|
595 | # remove renamed files after safely stored | |
595 | for f in moves: |
|
596 | for f in moves: | |
596 | if os.path.lexists(repo.wjoin(f)): |
|
597 | if os.path.lexists(repo.wjoin(f)): | |
597 | repo.ui.debug("removing %s\n" % f) |
|
598 | repo.ui.debug("removing %s\n" % f) | |
598 | audit(f) |
|
599 | audit(f) | |
599 | util.unlinkpath(repo.wjoin(f)) |
|
600 | util.unlinkpath(repo.wjoin(f)) | |
600 |
|
601 | |||
601 | numupdates = len(actions) |
|
602 | numupdates = len(actions) | |
602 | workeractions = [a for a in actions if a[1] in 'gr'] |
|
603 | workeractions = [a for a in actions if a[1] in 'gr'] | |
603 | updateactions = [a for a in workeractions if a[1] == 'g'] |
|
604 | updateactions = [a for a in workeractions if a[1] == 'g'] | |
604 | updated = len(updateactions) |
|
605 | updated = len(updateactions) | |
605 | removeactions = [a for a in workeractions if a[1] == 'r'] |
|
606 | removeactions = [a for a in workeractions if a[1] == 'r'] | |
606 | removed = len(removeactions) |
|
607 | removed = len(removeactions) | |
607 | actions = [a for a in actions if a[1] not in 'gr'] |
|
608 | actions = [a for a in actions if a[1] not in 'gr'] | |
608 |
|
609 | |||
609 | hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] |
|
610 | hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] | |
610 | if hgsub and hgsub[0] == 'r': |
|
611 | if hgsub and hgsub[0] == 'r': | |
611 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) |
|
612 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) | |
612 |
|
613 | |||
613 | z = 0 |
|
614 | z = 0 | |
614 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), |
|
615 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), | |
615 | removeactions) |
|
616 | removeactions) | |
616 | for i, item in prog: |
|
617 | for i, item in prog: | |
617 | z += i |
|
618 | z += i | |
618 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, |
|
619 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, | |
619 | unit=_('files')) |
|
620 | unit=_('files')) | |
620 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), |
|
621 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), | |
621 | updateactions) |
|
622 | updateactions) | |
622 | for i, item in prog: |
|
623 | for i, item in prog: | |
623 | z += i |
|
624 | z += i | |
624 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, |
|
625 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, | |
625 | unit=_('files')) |
|
626 | unit=_('files')) | |
626 |
|
627 | |||
627 | if hgsub and hgsub[0] == 'g': |
|
628 | if hgsub and hgsub[0] == 'g': | |
628 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) |
|
629 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) | |
629 |
|
630 | |||
630 | _updating = _('updating') |
|
631 | _updating = _('updating') | |
631 | _files = _('files') |
|
632 | _files = _('files') | |
632 | progress = repo.ui.progress |
|
633 | progress = repo.ui.progress | |
633 |
|
634 | |||
634 | for i, a in enumerate(actions): |
|
635 | for i, a in enumerate(actions): | |
635 | f, m, args, msg = a |
|
636 | f, m, args, msg = a | |
636 | progress(_updating, z + i + 1, item=f, total=numupdates, unit=_files) |
|
637 | progress(_updating, z + i + 1, item=f, total=numupdates, unit=_files) | |
637 | if m == "m": # merge |
|
638 | if m == "m": # merge | |
638 | f2, fd, move = args |
|
639 | f2, fd, move = args | |
639 | if fd == '.hgsubstate': # subrepo states need updating |
|
640 | if fd == '.hgsubstate': # subrepo states need updating | |
640 | subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
|
641 | subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), | |
641 | overwrite) |
|
642 | overwrite) | |
642 | continue |
|
643 | continue | |
643 | audit(fd) |
|
644 | audit(fd) | |
644 |
r = ms.resolve(fd, wctx |
|
645 | r = ms.resolve(fd, wctx) | |
645 | if r is not None and r > 0: |
|
646 | if r is not None and r > 0: | |
646 | unresolved += 1 |
|
647 | unresolved += 1 | |
647 | else: |
|
648 | else: | |
648 | if r is None: |
|
649 | if r is None: | |
649 | updated += 1 |
|
650 | updated += 1 | |
650 | else: |
|
651 | else: | |
651 | merged += 1 |
|
652 | merged += 1 | |
652 | elif m == "d": # directory rename |
|
653 | elif m == "d": # directory rename | |
653 | f2, fd, flags = args |
|
654 | f2, fd, flags = args | |
654 | if f: |
|
655 | if f: | |
655 | repo.ui.note(_("moving %s to %s\n") % (f, fd)) |
|
656 | repo.ui.note(_("moving %s to %s\n") % (f, fd)) | |
656 | audit(f) |
|
657 | audit(f) | |
657 | repo.wwrite(fd, wctx.filectx(f).data(), flags) |
|
658 | repo.wwrite(fd, wctx.filectx(f).data(), flags) | |
658 | util.unlinkpath(repo.wjoin(f)) |
|
659 | util.unlinkpath(repo.wjoin(f)) | |
659 | if f2: |
|
660 | if f2: | |
660 | repo.ui.note(_("getting %s to %s\n") % (f2, fd)) |
|
661 | repo.ui.note(_("getting %s to %s\n") % (f2, fd)) | |
661 | repo.wwrite(fd, mctx.filectx(f2).data(), flags) |
|
662 | repo.wwrite(fd, mctx.filectx(f2).data(), flags) | |
662 | updated += 1 |
|
663 | updated += 1 | |
663 | elif m == "dr": # divergent renames |
|
664 | elif m == "dr": # divergent renames | |
664 | fl, = args |
|
665 | fl, = args | |
665 | repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
666 | repo.ui.warn(_("note: possible conflict - %s was renamed " | |
666 | "multiple times to:\n") % f) |
|
667 | "multiple times to:\n") % f) | |
667 | for nf in fl: |
|
668 | for nf in fl: | |
668 | repo.ui.warn(" %s\n" % nf) |
|
669 | repo.ui.warn(" %s\n" % nf) | |
669 | elif m == "rd": # rename and delete |
|
670 | elif m == "rd": # rename and delete | |
670 | fl, = args |
|
671 | fl, = args | |
671 | repo.ui.warn(_("note: possible conflict - %s was deleted " |
|
672 | repo.ui.warn(_("note: possible conflict - %s was deleted " | |
672 | "and renamed to:\n") % f) |
|
673 | "and renamed to:\n") % f) | |
673 | for nf in fl: |
|
674 | for nf in fl: | |
674 | repo.ui.warn(" %s\n" % nf) |
|
675 | repo.ui.warn(" %s\n" % nf) | |
675 | elif m == "e": # exec |
|
676 | elif m == "e": # exec | |
676 | flags, = args |
|
677 | flags, = args | |
677 | audit(f) |
|
678 | audit(f) | |
678 | util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
|
679 | util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) | |
679 | updated += 1 |
|
680 | updated += 1 | |
680 | ms.commit() |
|
681 | ms.commit() | |
681 | progress(_updating, None, total=numupdates, unit=_files) |
|
682 | progress(_updating, None, total=numupdates, unit=_files) | |
682 |
|
683 | |||
683 | return updated, merged, removed, unresolved |
|
684 | return updated, merged, removed, unresolved | |
684 |
|
685 | |||
685 | def calculateupdates(repo, tctx, mctx, ancestor, branchmerge, force, partial, |
|
686 | def calculateupdates(repo, tctx, mctx, ancestor, branchmerge, force, partial, | |
686 | acceptremote=False): |
|
687 | acceptremote=False): | |
687 | "Calculate the actions needed to merge mctx into tctx" |
|
688 | "Calculate the actions needed to merge mctx into tctx" | |
688 | actions = [] |
|
689 | actions = [] | |
689 | actions += manifestmerge(repo, tctx, mctx, |
|
690 | actions += manifestmerge(repo, tctx, mctx, | |
690 | ancestor, |
|
691 | ancestor, | |
691 | branchmerge, force, |
|
692 | branchmerge, force, | |
692 | partial, acceptremote) |
|
693 | partial, acceptremote) | |
693 | if tctx.rev() is None: |
|
694 | if tctx.rev() is None: | |
694 | actions += _forgetremoved(tctx, mctx, branchmerge) |
|
695 | actions += _forgetremoved(tctx, mctx, branchmerge) | |
695 | return actions |
|
696 | return actions | |
696 |
|
697 | |||
697 | def recordupdates(repo, actions, branchmerge): |
|
698 | def recordupdates(repo, actions, branchmerge): | |
698 | "record merge actions to the dirstate" |
|
699 | "record merge actions to the dirstate" | |
699 |
|
700 | |||
700 | for a in actions: |
|
701 | for a in actions: | |
701 | f, m, args, msg = a |
|
702 | f, m, args, msg = a | |
702 | if m == "r": # remove |
|
703 | if m == "r": # remove | |
703 | if branchmerge: |
|
704 | if branchmerge: | |
704 | repo.dirstate.remove(f) |
|
705 | repo.dirstate.remove(f) | |
705 | else: |
|
706 | else: | |
706 | repo.dirstate.drop(f) |
|
707 | repo.dirstate.drop(f) | |
707 | elif m == "a": # re-add |
|
708 | elif m == "a": # re-add | |
708 | if not branchmerge: |
|
709 | if not branchmerge: | |
709 | repo.dirstate.add(f) |
|
710 | repo.dirstate.add(f) | |
710 | elif m == "f": # forget |
|
711 | elif m == "f": # forget | |
711 | repo.dirstate.drop(f) |
|
712 | repo.dirstate.drop(f) | |
712 | elif m == "e": # exec change |
|
713 | elif m == "e": # exec change | |
713 | repo.dirstate.normallookup(f) |
|
714 | repo.dirstate.normallookup(f) | |
714 | elif m == "g": # get |
|
715 | elif m == "g": # get | |
715 | if branchmerge: |
|
716 | if branchmerge: | |
716 | repo.dirstate.otherparent(f) |
|
717 | repo.dirstate.otherparent(f) | |
717 | else: |
|
718 | else: | |
718 | repo.dirstate.normal(f) |
|
719 | repo.dirstate.normal(f) | |
719 | elif m == "m": # merge |
|
720 | elif m == "m": # merge | |
720 | f2, fd, move = args |
|
721 | f2, fd, move = args | |
721 | if branchmerge: |
|
722 | if branchmerge: | |
722 | # We've done a branch merge, mark this file as merged |
|
723 | # We've done a branch merge, mark this file as merged | |
723 | # so that we properly record the merger later |
|
724 | # so that we properly record the merger later | |
724 | repo.dirstate.merge(fd) |
|
725 | repo.dirstate.merge(fd) | |
725 | if f != f2: # copy/rename |
|
726 | if f != f2: # copy/rename | |
726 | if move: |
|
727 | if move: | |
727 | repo.dirstate.remove(f) |
|
728 | repo.dirstate.remove(f) | |
728 | if f != fd: |
|
729 | if f != fd: | |
729 | repo.dirstate.copy(f, fd) |
|
730 | repo.dirstate.copy(f, fd) | |
730 | else: |
|
731 | else: | |
731 | repo.dirstate.copy(f2, fd) |
|
732 | repo.dirstate.copy(f2, fd) | |
732 | else: |
|
733 | else: | |
733 | # We've update-merged a locally modified file, so |
|
734 | # We've update-merged a locally modified file, so | |
734 | # we set the dirstate to emulate a normal checkout |
|
735 | # we set the dirstate to emulate a normal checkout | |
735 | # of that file some time in the past. Thus our |
|
736 | # of that file some time in the past. Thus our | |
736 | # merge will appear as a normal local file |
|
737 | # merge will appear as a normal local file | |
737 | # modification. |
|
738 | # modification. | |
738 | if f2 == fd: # file not locally copied/moved |
|
739 | if f2 == fd: # file not locally copied/moved | |
739 | repo.dirstate.normallookup(fd) |
|
740 | repo.dirstate.normallookup(fd) | |
740 | if move: |
|
741 | if move: | |
741 | repo.dirstate.drop(f) |
|
742 | repo.dirstate.drop(f) | |
742 | elif m == "d": # directory rename |
|
743 | elif m == "d": # directory rename | |
743 | f2, fd, flag = args |
|
744 | f2, fd, flag = args | |
744 | if not f2 and f not in repo.dirstate: |
|
745 | if not f2 and f not in repo.dirstate: | |
745 | # untracked file moved |
|
746 | # untracked file moved | |
746 | continue |
|
747 | continue | |
747 | if branchmerge: |
|
748 | if branchmerge: | |
748 | repo.dirstate.add(fd) |
|
749 | repo.dirstate.add(fd) | |
749 | if f: |
|
750 | if f: | |
750 | repo.dirstate.remove(f) |
|
751 | repo.dirstate.remove(f) | |
751 | repo.dirstate.copy(f, fd) |
|
752 | repo.dirstate.copy(f, fd) | |
752 | if f2: |
|
753 | if f2: | |
753 | repo.dirstate.copy(f2, fd) |
|
754 | repo.dirstate.copy(f2, fd) | |
754 | else: |
|
755 | else: | |
755 | repo.dirstate.normal(fd) |
|
756 | repo.dirstate.normal(fd) | |
756 | if f: |
|
757 | if f: | |
757 | repo.dirstate.drop(f) |
|
758 | repo.dirstate.drop(f) | |
758 |
|
759 | |||
759 | def update(repo, node, branchmerge, force, partial, ancestor=None, |
|
760 | def update(repo, node, branchmerge, force, partial, ancestor=None, | |
760 | mergeancestor=False): |
|
761 | mergeancestor=False): | |
761 | """ |
|
762 | """ | |
762 | Perform a merge between the working directory and the given node |
|
763 | Perform a merge between the working directory and the given node | |
763 |
|
764 | |||
764 | node = the node to update to, or None if unspecified |
|
765 | node = the node to update to, or None if unspecified | |
765 | branchmerge = whether to merge between branches |
|
766 | branchmerge = whether to merge between branches | |
766 | force = whether to force branch merging or file overwriting |
|
767 | force = whether to force branch merging or file overwriting | |
767 | partial = a function to filter file lists (dirstate not updated) |
|
768 | partial = a function to filter file lists (dirstate not updated) | |
768 | mergeancestor = whether it is merging with an ancestor. If true, |
|
769 | mergeancestor = whether it is merging with an ancestor. If true, | |
769 | we should accept the incoming changes for any prompts that occur. |
|
770 | we should accept the incoming changes for any prompts that occur. | |
770 | If false, merging with an ancestor (fast-forward) is only allowed |
|
771 | If false, merging with an ancestor (fast-forward) is only allowed | |
771 | between different named branches. This flag is used by rebase extension |
|
772 | between different named branches. This flag is used by rebase extension | |
772 | as a temporary fix and should be avoided in general. |
|
773 | as a temporary fix and should be avoided in general. | |
773 |
|
774 | |||
774 | The table below shows all the behaviors of the update command |
|
775 | The table below shows all the behaviors of the update command | |
775 | given the -c and -C or no options, whether the working directory |
|
776 | given the -c and -C or no options, whether the working directory | |
776 | is dirty, whether a revision is specified, and the relationship of |
|
777 | is dirty, whether a revision is specified, and the relationship of | |
777 | the parent rev to the target rev (linear, on the same named |
|
778 | the parent rev to the target rev (linear, on the same named | |
778 | branch, or on another named branch). |
|
779 | branch, or on another named branch). | |
779 |
|
780 | |||
780 | This logic is tested by test-update-branches.t. |
|
781 | This logic is tested by test-update-branches.t. | |
781 |
|
782 | |||
782 | -c -C dirty rev | linear same cross |
|
783 | -c -C dirty rev | linear same cross | |
783 | n n n n | ok (1) x |
|
784 | n n n n | ok (1) x | |
784 | n n n y | ok ok ok |
|
785 | n n n y | ok ok ok | |
785 | n n y n | merge (2) (2) |
|
786 | n n y n | merge (2) (2) | |
786 | n n y y | merge (3) (3) |
|
787 | n n y y | merge (3) (3) | |
787 | n y * * | --- discard --- |
|
788 | n y * * | --- discard --- | |
788 | y n y * | --- (4) --- |
|
789 | y n y * | --- (4) --- | |
789 | y n n * | --- ok --- |
|
790 | y n n * | --- ok --- | |
790 | y y * * | --- (5) --- |
|
791 | y y * * | --- (5) --- | |
791 |
|
792 | |||
792 | x = can't happen |
|
793 | x = can't happen | |
793 | * = don't-care |
|
794 | * = don't-care | |
794 | 1 = abort: not a linear update (merge or update --check to force update) |
|
795 | 1 = abort: not a linear update (merge or update --check to force update) | |
795 | 2 = abort: uncommitted changes (commit and merge, or update --clean to |
|
796 | 2 = abort: uncommitted changes (commit and merge, or update --clean to | |
796 | discard changes) |
|
797 | discard changes) | |
797 | 3 = abort: uncommitted changes (commit or update --clean to discard changes) |
|
798 | 3 = abort: uncommitted changes (commit or update --clean to discard changes) | |
798 | 4 = abort: uncommitted changes (checked in commands.py) |
|
799 | 4 = abort: uncommitted changes (checked in commands.py) | |
799 | 5 = incompatible options (checked in commands.py) |
|
800 | 5 = incompatible options (checked in commands.py) | |
800 |
|
801 | |||
801 | Return the same tuple as applyupdates(). |
|
802 | Return the same tuple as applyupdates(). | |
802 | """ |
|
803 | """ | |
803 |
|
804 | |||
804 | onode = node |
|
805 | onode = node | |
805 | wlock = repo.wlock() |
|
806 | wlock = repo.wlock() | |
806 | try: |
|
807 | try: | |
807 | wc = repo[None] |
|
808 | wc = repo[None] | |
808 | pl = wc.parents() |
|
809 | pl = wc.parents() | |
809 | p1 = pl[0] |
|
810 | p1 = pl[0] | |
810 | pa = None |
|
811 | pa = None | |
811 | if ancestor: |
|
812 | if ancestor: | |
812 | pa = repo[ancestor] |
|
813 | pa = repo[ancestor] | |
813 |
|
814 | |||
814 | if node is None: |
|
815 | if node is None: | |
815 | # Here is where we should consider bookmarks, divergent bookmarks, |
|
816 | # Here is where we should consider bookmarks, divergent bookmarks, | |
816 | # foreground changesets (successors), and tip of current branch; |
|
817 | # foreground changesets (successors), and tip of current branch; | |
817 | # but currently we are only checking the branch tips. |
|
818 | # but currently we are only checking the branch tips. | |
818 | try: |
|
819 | try: | |
819 | node = repo.branchtip(wc.branch()) |
|
820 | node = repo.branchtip(wc.branch()) | |
820 | except error.RepoLookupError: |
|
821 | except error.RepoLookupError: | |
821 | if wc.branch() == "default": # no default branch! |
|
822 | if wc.branch() == "default": # no default branch! | |
822 | node = repo.lookup("tip") # update to tip |
|
823 | node = repo.lookup("tip") # update to tip | |
823 | else: |
|
824 | else: | |
824 | raise util.Abort(_("branch %s not found") % wc.branch()) |
|
825 | raise util.Abort(_("branch %s not found") % wc.branch()) | |
825 |
|
826 | |||
826 | if p1.obsolete() and not p1.children(): |
|
827 | if p1.obsolete() and not p1.children(): | |
827 | # allow updating to successors |
|
828 | # allow updating to successors | |
828 | successors = obsolete.successorssets(repo, p1.node()) |
|
829 | successors = obsolete.successorssets(repo, p1.node()) | |
829 |
|
830 | |||
830 | # behavior of certain cases is as follows, |
|
831 | # behavior of certain cases is as follows, | |
831 | # |
|
832 | # | |
832 | # divergent changesets: update to highest rev, similar to what |
|
833 | # divergent changesets: update to highest rev, similar to what | |
833 | # is currently done when there are more than one head |
|
834 | # is currently done when there are more than one head | |
834 | # (i.e. 'tip') |
|
835 | # (i.e. 'tip') | |
835 | # |
|
836 | # | |
836 | # replaced changesets: same as divergent except we know there |
|
837 | # replaced changesets: same as divergent except we know there | |
837 | # is no conflict |
|
838 | # is no conflict | |
838 | # |
|
839 | # | |
839 | # pruned changeset: no update is done; though, we could |
|
840 | # pruned changeset: no update is done; though, we could | |
840 | # consider updating to the first non-obsolete parent, |
|
841 | # consider updating to the first non-obsolete parent, | |
841 | # similar to what is current done for 'hg prune' |
|
842 | # similar to what is current done for 'hg prune' | |
842 |
|
843 | |||
843 | if successors: |
|
844 | if successors: | |
844 | # flatten the list here handles both divergent (len > 1) |
|
845 | # flatten the list here handles both divergent (len > 1) | |
845 | # and the usual case (len = 1) |
|
846 | # and the usual case (len = 1) | |
846 | successors = [n for sub in successors for n in sub] |
|
847 | successors = [n for sub in successors for n in sub] | |
847 |
|
848 | |||
848 | # get the max revision for the given successors set, |
|
849 | # get the max revision for the given successors set, | |
849 | # i.e. the 'tip' of a set |
|
850 | # i.e. the 'tip' of a set | |
850 | node = repo.revs("max(%ln)", successors)[0] |
|
851 | node = repo.revs("max(%ln)", successors)[0] | |
851 | pa = p1 |
|
852 | pa = p1 | |
852 |
|
853 | |||
853 | overwrite = force and not branchmerge |
|
854 | overwrite = force and not branchmerge | |
854 |
|
855 | |||
855 | p2 = repo[node] |
|
856 | p2 = repo[node] | |
856 | if pa is None: |
|
857 | if pa is None: | |
857 | pa = p1.ancestor(p2) |
|
858 | pa = p1.ancestor(p2) | |
858 |
|
859 | |||
859 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
|
860 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | |
860 |
|
861 | |||
861 | ### check phase |
|
862 | ### check phase | |
862 | if not overwrite and len(pl) > 1: |
|
863 | if not overwrite and len(pl) > 1: | |
863 | raise util.Abort(_("outstanding uncommitted merges")) |
|
864 | raise util.Abort(_("outstanding uncommitted merges")) | |
864 | if branchmerge: |
|
865 | if branchmerge: | |
865 | if pa == p2: |
|
866 | if pa == p2: | |
866 | raise util.Abort(_("merging with a working directory ancestor" |
|
867 | raise util.Abort(_("merging with a working directory ancestor" | |
867 | " has no effect")) |
|
868 | " has no effect")) | |
868 | elif pa == p1: |
|
869 | elif pa == p1: | |
869 | if not mergeancestor and p1.branch() == p2.branch(): |
|
870 | if not mergeancestor and p1.branch() == p2.branch(): | |
870 | raise util.Abort(_("nothing to merge"), |
|
871 | raise util.Abort(_("nothing to merge"), | |
871 | hint=_("use 'hg update' " |
|
872 | hint=_("use 'hg update' " | |
872 | "or check 'hg heads'")) |
|
873 | "or check 'hg heads'")) | |
873 | if not force and (wc.files() or wc.deleted()): |
|
874 | if not force and (wc.files() or wc.deleted()): | |
874 | raise util.Abort(_("uncommitted changes"), |
|
875 | raise util.Abort(_("uncommitted changes"), | |
875 | hint=_("use 'hg status' to list changes")) |
|
876 | hint=_("use 'hg status' to list changes")) | |
876 | for s in sorted(wc.substate): |
|
877 | for s in sorted(wc.substate): | |
877 | if wc.sub(s).dirty(): |
|
878 | if wc.sub(s).dirty(): | |
878 | raise util.Abort(_("uncommitted changes in " |
|
879 | raise util.Abort(_("uncommitted changes in " | |
879 | "subrepository '%s'") % s) |
|
880 | "subrepository '%s'") % s) | |
880 |
|
881 | |||
881 | elif not overwrite: |
|
882 | elif not overwrite: | |
882 | if p1 == p2: # no-op update |
|
883 | if p1 == p2: # no-op update | |
883 | # call the hooks and exit early |
|
884 | # call the hooks and exit early | |
884 | repo.hook('preupdate', throw=True, parent1=xp2, parent2='') |
|
885 | repo.hook('preupdate', throw=True, parent1=xp2, parent2='') | |
885 | repo.hook('update', parent1=xp2, parent2='', error=0) |
|
886 | repo.hook('update', parent1=xp2, parent2='', error=0) | |
886 | return 0, 0, 0, 0 |
|
887 | return 0, 0, 0, 0 | |
887 |
|
888 | |||
888 | if pa not in (p1, p2): # nonlinear |
|
889 | if pa not in (p1, p2): # nonlinear | |
889 | dirty = wc.dirty(missing=True) |
|
890 | dirty = wc.dirty(missing=True) | |
890 | if dirty or onode is None: |
|
891 | if dirty or onode is None: | |
891 | # Branching is a bit strange to ensure we do the minimal |
|
892 | # Branching is a bit strange to ensure we do the minimal | |
892 | # amount of call to obsolete.background. |
|
893 | # amount of call to obsolete.background. | |
893 | foreground = obsolete.foreground(repo, [p1.node()]) |
|
894 | foreground = obsolete.foreground(repo, [p1.node()]) | |
894 | # note: the <node> variable contains a random identifier |
|
895 | # note: the <node> variable contains a random identifier | |
895 | if repo[node].node() in foreground: |
|
896 | if repo[node].node() in foreground: | |
896 | pa = p1 # allow updating to successors |
|
897 | pa = p1 # allow updating to successors | |
897 | elif dirty: |
|
898 | elif dirty: | |
898 | msg = _("uncommitted changes") |
|
899 | msg = _("uncommitted changes") | |
899 | if onode is None: |
|
900 | if onode is None: | |
900 | hint = _("commit and merge, or update --clean to" |
|
901 | hint = _("commit and merge, or update --clean to" | |
901 | " discard changes") |
|
902 | " discard changes") | |
902 | else: |
|
903 | else: | |
903 | hint = _("commit or update --clean to discard" |
|
904 | hint = _("commit or update --clean to discard" | |
904 | " changes") |
|
905 | " changes") | |
905 | raise util.Abort(msg, hint=hint) |
|
906 | raise util.Abort(msg, hint=hint) | |
906 | else: # node is none |
|
907 | else: # node is none | |
907 | msg = _("not a linear update") |
|
908 | msg = _("not a linear update") | |
908 | hint = _("merge or update --check to force update") |
|
909 | hint = _("merge or update --check to force update") | |
909 | raise util.Abort(msg, hint=hint) |
|
910 | raise util.Abort(msg, hint=hint) | |
910 | else: |
|
911 | else: | |
911 | # Allow jumping branches if clean and specific rev given |
|
912 | # Allow jumping branches if clean and specific rev given | |
912 | pa = p1 |
|
913 | pa = p1 | |
913 |
|
914 | |||
914 | ### calculate phase |
|
915 | ### calculate phase | |
915 | actions = calculateupdates(repo, wc, p2, pa, |
|
916 | actions = calculateupdates(repo, wc, p2, pa, | |
916 | branchmerge, force, partial, mergeancestor) |
|
917 | branchmerge, force, partial, mergeancestor) | |
917 |
|
918 | |||
918 | ### apply phase |
|
919 | ### apply phase | |
919 | if not branchmerge: # just jump to the new rev |
|
920 | if not branchmerge: # just jump to the new rev | |
920 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |
|
921 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | |
921 | if not partial: |
|
922 | if not partial: | |
922 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
|
923 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | |
923 | # note that we're in the middle of an update |
|
924 | # note that we're in the middle of an update | |
924 | repo.vfs.write('updatestate', p2.hex()) |
|
925 | repo.vfs.write('updatestate', p2.hex()) | |
925 |
|
926 | |||
926 | stats = applyupdates(repo, actions, wc, p2, pa, overwrite) |
|
927 | stats = applyupdates(repo, actions, wc, p2, pa, overwrite) | |
927 |
|
928 | |||
928 | if not partial: |
|
929 | if not partial: | |
929 | repo.setparents(fp1, fp2) |
|
930 | repo.setparents(fp1, fp2) | |
930 | recordupdates(repo, actions, branchmerge) |
|
931 | recordupdates(repo, actions, branchmerge) | |
931 | # update completed, clear state |
|
932 | # update completed, clear state | |
932 | util.unlink(repo.join('updatestate')) |
|
933 | util.unlink(repo.join('updatestate')) | |
933 |
|
934 | |||
934 | if not branchmerge: |
|
935 | if not branchmerge: | |
935 | repo.dirstate.setbranch(p2.branch()) |
|
936 | repo.dirstate.setbranch(p2.branch()) | |
936 | finally: |
|
937 | finally: | |
937 | wlock.release() |
|
938 | wlock.release() | |
938 |
|
939 | |||
939 | if not partial: |
|
940 | if not partial: | |
940 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
|
941 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) | |
941 | return stats |
|
942 | return stats |
@@ -1,410 +1,500 b'' | |||||
1 | $ hg init basic |
|
1 | $ hg init basic | |
2 | $ cd basic |
|
2 | $ cd basic | |
3 |
|
3 | |||
4 | should complain |
|
4 | should complain | |
5 |
|
5 | |||
6 | $ hg backout |
|
6 | $ hg backout | |
7 | abort: please specify a revision to backout |
|
7 | abort: please specify a revision to backout | |
8 | [255] |
|
8 | [255] | |
9 | $ hg backout -r 0 0 |
|
9 | $ hg backout -r 0 0 | |
10 | abort: please specify just one revision |
|
10 | abort: please specify just one revision | |
11 | [255] |
|
11 | [255] | |
12 |
|
12 | |||
13 | basic operation |
|
13 | basic operation | |
14 |
|
14 | |||
15 | $ echo a > a |
|
15 | $ echo a > a | |
16 | $ hg commit -d '0 0' -A -m a |
|
16 | $ hg commit -d '0 0' -A -m a | |
17 | adding a |
|
17 | adding a | |
18 | $ echo b >> a |
|
18 | $ echo b >> a | |
19 | $ hg commit -d '1 0' -m b |
|
19 | $ hg commit -d '1 0' -m b | |
20 |
|
20 | |||
21 | $ hg backout -d '2 0' tip --tool=true |
|
21 | $ hg backout -d '2 0' tip --tool=true | |
22 | reverting a |
|
22 | reverting a | |
23 | changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57 |
|
23 | changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57 | |
24 | $ cat a |
|
24 | $ cat a | |
25 | a |
|
25 | a | |
26 | $ hg summary |
|
26 | $ hg summary | |
27 | parent: 2:2929462c3dff tip |
|
27 | parent: 2:2929462c3dff tip | |
28 | Backed out changeset a820f4f40a57 |
|
28 | Backed out changeset a820f4f40a57 | |
29 | branch: default |
|
29 | branch: default | |
30 | commit: (clean) |
|
30 | commit: (clean) | |
31 | update: (current) |
|
31 | update: (current) | |
32 |
|
32 | |||
33 | file that was removed is recreated |
|
33 | file that was removed is recreated | |
34 |
|
34 | |||
35 | $ cd .. |
|
35 | $ cd .. | |
36 | $ hg init remove |
|
36 | $ hg init remove | |
37 | $ cd remove |
|
37 | $ cd remove | |
38 |
|
38 | |||
39 | $ echo content > a |
|
39 | $ echo content > a | |
40 | $ hg commit -d '0 0' -A -m a |
|
40 | $ hg commit -d '0 0' -A -m a | |
41 | adding a |
|
41 | adding a | |
42 |
|
42 | |||
43 | $ hg rm a |
|
43 | $ hg rm a | |
44 | $ hg commit -d '1 0' -m b |
|
44 | $ hg commit -d '1 0' -m b | |
45 |
|
45 | |||
46 | $ hg backout -d '2 0' tip --tool=true |
|
46 | $ hg backout -d '2 0' tip --tool=true | |
47 | adding a |
|
47 | adding a | |
48 | changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372 |
|
48 | changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372 | |
49 | $ cat a |
|
49 | $ cat a | |
50 | content |
|
50 | content | |
51 | $ hg summary |
|
51 | $ hg summary | |
52 | parent: 2:de31bdc76c0d tip |
|
52 | parent: 2:de31bdc76c0d tip | |
53 | Backed out changeset 76862dcce372 |
|
53 | Backed out changeset 76862dcce372 | |
54 | branch: default |
|
54 | branch: default | |
55 | commit: (clean) |
|
55 | commit: (clean) | |
56 | update: (current) |
|
56 | update: (current) | |
57 |
|
57 | |||
58 | backout of backout is as if nothing happened |
|
58 | backout of backout is as if nothing happened | |
59 |
|
59 | |||
60 | $ hg backout -d '3 0' --merge tip --tool=true |
|
60 | $ hg backout -d '3 0' --merge tip --tool=true | |
61 | removing a |
|
61 | removing a | |
62 | changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d |
|
62 | changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d | |
63 | $ test -f a |
|
63 | $ test -f a | |
64 | [1] |
|
64 | [1] | |
65 | $ hg summary |
|
65 | $ hg summary | |
66 | parent: 3:7f6d0f120113 tip |
|
66 | parent: 3:7f6d0f120113 tip | |
67 | Backed out changeset de31bdc76c0d |
|
67 | Backed out changeset de31bdc76c0d | |
68 | branch: default |
|
68 | branch: default | |
69 | commit: (clean) |
|
69 | commit: (clean) | |
70 | update: (current) |
|
70 | update: (current) | |
71 |
|
71 | |||
72 | across branch |
|
72 | across branch | |
73 |
|
73 | |||
74 | $ cd .. |
|
74 | $ cd .. | |
75 | $ hg init branch |
|
75 | $ hg init branch | |
76 | $ cd branch |
|
76 | $ cd branch | |
77 | $ echo a > a |
|
77 | $ echo a > a | |
78 | $ hg ci -Am0 |
|
78 | $ hg ci -Am0 | |
79 | adding a |
|
79 | adding a | |
80 | $ echo b > b |
|
80 | $ echo b > b | |
81 | $ hg ci -Am1 |
|
81 | $ hg ci -Am1 | |
82 | adding b |
|
82 | adding b | |
83 | $ hg co -C 0 |
|
83 | $ hg co -C 0 | |
84 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
84 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
85 | $ hg summary |
|
85 | $ hg summary | |
86 | parent: 0:f7b1eb17ad24 |
|
86 | parent: 0:f7b1eb17ad24 | |
87 | 0 |
|
87 | 0 | |
88 | branch: default |
|
88 | branch: default | |
89 | commit: (clean) |
|
89 | commit: (clean) | |
90 | update: 1 new changesets (update) |
|
90 | update: 1 new changesets (update) | |
91 |
|
91 | |||
92 | should fail |
|
92 | should fail | |
93 |
|
93 | |||
94 | $ hg backout 1 |
|
94 | $ hg backout 1 | |
95 | abort: cannot backout change on a different branch |
|
95 | abort: cannot backout change on a different branch | |
96 | [255] |
|
96 | [255] | |
97 | $ echo c > c |
|
97 | $ echo c > c | |
98 | $ hg ci -Am2 |
|
98 | $ hg ci -Am2 | |
99 | adding c |
|
99 | adding c | |
100 | created new head |
|
100 | created new head | |
101 | $ hg summary |
|
101 | $ hg summary | |
102 | parent: 2:db815d6d32e6 tip |
|
102 | parent: 2:db815d6d32e6 tip | |
103 | 2 |
|
103 | 2 | |
104 | branch: default |
|
104 | branch: default | |
105 | commit: (clean) |
|
105 | commit: (clean) | |
106 | update: 1 new changesets, 2 branch heads (merge) |
|
106 | update: 1 new changesets, 2 branch heads (merge) | |
107 |
|
107 | |||
108 | should fail |
|
108 | should fail | |
109 |
|
109 | |||
110 | $ hg backout 1 |
|
110 | $ hg backout 1 | |
111 | abort: cannot backout change on a different branch |
|
111 | abort: cannot backout change on a different branch | |
112 | [255] |
|
112 | [255] | |
113 | $ hg summary |
|
113 | $ hg summary | |
114 | parent: 2:db815d6d32e6 tip |
|
114 | parent: 2:db815d6d32e6 tip | |
115 | 2 |
|
115 | 2 | |
116 | branch: default |
|
116 | branch: default | |
117 | commit: (clean) |
|
117 | commit: (clean) | |
118 | update: 1 new changesets, 2 branch heads (merge) |
|
118 | update: 1 new changesets, 2 branch heads (merge) | |
119 |
|
119 | |||
120 | backout with merge |
|
120 | backout with merge | |
121 |
|
121 | |||
122 | $ cd .. |
|
122 | $ cd .. | |
123 | $ hg init merge |
|
123 | $ hg init merge | |
124 | $ cd merge |
|
124 | $ cd merge | |
125 |
|
125 | |||
126 | $ echo line 1 > a |
|
126 | $ echo line 1 > a | |
127 | $ echo line 2 >> a |
|
127 | $ echo line 2 >> a | |
128 | $ hg commit -d '0 0' -A -m a |
|
128 | $ hg commit -d '0 0' -A -m a | |
129 | adding a |
|
129 | adding a | |
130 | $ hg summary |
|
130 | $ hg summary | |
131 | parent: 0:59395513a13a tip |
|
131 | parent: 0:59395513a13a tip | |
132 | a |
|
132 | a | |
133 | branch: default |
|
133 | branch: default | |
134 | commit: (clean) |
|
134 | commit: (clean) | |
135 | update: (current) |
|
135 | update: (current) | |
136 |
|
136 | |||
137 | remove line 1 |
|
137 | remove line 1 | |
138 |
|
138 | |||
139 | $ echo line 2 > a |
|
139 | $ echo line 2 > a | |
140 | $ hg commit -d '1 0' -m b |
|
140 | $ hg commit -d '1 0' -m b | |
141 |
|
141 | |||
142 | $ echo line 3 >> a |
|
142 | $ echo line 3 >> a | |
143 | $ hg commit -d '2 0' -m c |
|
143 | $ hg commit -d '2 0' -m c | |
144 |
|
144 | |||
145 | $ hg backout --merge -d '3 0' 1 --tool=true |
|
145 | $ hg backout --merge -d '3 0' 1 --tool=true | |
146 | reverting a |
|
146 | reverting a | |
147 | created new head |
|
147 | created new head | |
148 | changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 |
|
148 | changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 | |
149 | merging with changeset 3:26b8ccb9ad91 |
|
149 | merging with changeset 3:26b8ccb9ad91 | |
150 | merging a |
|
150 | merging a | |
151 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
151 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
152 | (branch merge, don't forget to commit) |
|
152 | (branch merge, don't forget to commit) | |
153 | $ hg commit -d '4 0' -m d |
|
153 | $ hg commit -d '4 0' -m d | |
154 | $ hg summary |
|
154 | $ hg summary | |
155 | parent: 4:c7df5e0b9c09 tip |
|
155 | parent: 4:c7df5e0b9c09 tip | |
156 | d |
|
156 | d | |
157 | branch: default |
|
157 | branch: default | |
158 | commit: (clean) |
|
158 | commit: (clean) | |
159 | update: (current) |
|
159 | update: (current) | |
160 |
|
160 | |||
161 | check line 1 is back |
|
161 | check line 1 is back | |
162 |
|
162 | |||
163 | $ cat a |
|
163 | $ cat a | |
164 | line 1 |
|
164 | line 1 | |
165 | line 2 |
|
165 | line 2 | |
166 | line 3 |
|
166 | line 3 | |
167 |
|
167 | |||
168 | $ cd .. |
|
168 | $ cd .. | |
169 |
|
169 | |||
170 | backout should not back out subsequent changesets |
|
170 | backout should not back out subsequent changesets | |
171 |
|
171 | |||
172 | $ hg init onecs |
|
172 | $ hg init onecs | |
173 | $ cd onecs |
|
173 | $ cd onecs | |
174 | $ echo 1 > a |
|
174 | $ echo 1 > a | |
175 | $ hg commit -d '0 0' -A -m a |
|
175 | $ hg commit -d '0 0' -A -m a | |
176 | adding a |
|
176 | adding a | |
177 | $ echo 2 >> a |
|
177 | $ echo 2 >> a | |
178 | $ hg commit -d '1 0' -m b |
|
178 | $ hg commit -d '1 0' -m b | |
179 | $ echo 1 > b |
|
179 | $ echo 1 > b | |
180 | $ hg commit -d '2 0' -A -m c |
|
180 | $ hg commit -d '2 0' -A -m c | |
181 | adding b |
|
181 | adding b | |
182 | $ hg summary |
|
182 | $ hg summary | |
183 | parent: 2:882396649954 tip |
|
183 | parent: 2:882396649954 tip | |
184 | c |
|
184 | c | |
185 | branch: default |
|
185 | branch: default | |
186 | commit: (clean) |
|
186 | commit: (clean) | |
187 | update: (current) |
|
187 | update: (current) | |
188 |
|
188 | |||
189 | without --merge |
|
189 | without --merge | |
190 | $ hg backout -d '3 0' 1 --tool=true |
|
190 | $ hg backout -d '3 0' 1 --tool=true | |
191 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
191 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
192 | changeset 22bca4c721e5 backed out, don't forget to commit. |
|
192 | changeset 22bca4c721e5 backed out, don't forget to commit. | |
193 | $ hg locate b |
|
193 | $ hg locate b | |
194 | b |
|
194 | b | |
195 | $ hg update -C tip |
|
195 | $ hg update -C tip | |
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
197 | $ hg locate b |
|
197 | $ hg locate b | |
198 | b |
|
198 | b | |
199 | $ hg summary |
|
199 | $ hg summary | |
200 | parent: 2:882396649954 tip |
|
200 | parent: 2:882396649954 tip | |
201 | c |
|
201 | c | |
202 | branch: default |
|
202 | branch: default | |
203 | commit: (clean) |
|
203 | commit: (clean) | |
204 | update: (current) |
|
204 | update: (current) | |
205 |
|
205 | |||
206 | with --merge |
|
206 | with --merge | |
207 | $ hg backout --merge -d '3 0' 1 --tool=true |
|
207 | $ hg backout --merge -d '3 0' 1 --tool=true | |
208 | reverting a |
|
208 | reverting a | |
209 | created new head |
|
209 | created new head | |
210 | changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 |
|
210 | changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 | |
211 | merging with changeset 3:3202beb76721 |
|
211 | merging with changeset 3:3202beb76721 | |
212 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
212 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
213 | (branch merge, don't forget to commit) |
|
213 | (branch merge, don't forget to commit) | |
214 | $ hg locate b |
|
214 | $ hg locate b | |
215 | b |
|
215 | b | |
216 | $ hg update -C tip |
|
216 | $ hg update -C tip | |
217 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
217 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
218 | $ hg locate b |
|
218 | $ hg locate b | |
219 | [1] |
|
219 | [1] | |
220 |
|
220 | |||
221 | $ cd .. |
|
221 | $ cd .. | |
222 | $ hg init m |
|
222 | $ hg init m | |
223 | $ cd m |
|
223 | $ cd m | |
224 | $ echo a > a |
|
224 | $ echo a > a | |
225 | $ hg commit -d '0 0' -A -m a |
|
225 | $ hg commit -d '0 0' -A -m a | |
226 | adding a |
|
226 | adding a | |
227 | $ echo b > b |
|
227 | $ echo b > b | |
228 | $ hg commit -d '1 0' -A -m b |
|
228 | $ hg commit -d '1 0' -A -m b | |
229 | adding b |
|
229 | adding b | |
230 | $ echo c > c |
|
230 | $ echo c > c | |
231 | $ hg commit -d '2 0' -A -m b |
|
231 | $ hg commit -d '2 0' -A -m b | |
232 | adding c |
|
232 | adding c | |
233 | $ hg update 1 |
|
233 | $ hg update 1 | |
234 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
234 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
235 | $ echo d > d |
|
235 | $ echo d > d | |
236 | $ hg commit -d '3 0' -A -m c |
|
236 | $ hg commit -d '3 0' -A -m c | |
237 | adding d |
|
237 | adding d | |
238 | created new head |
|
238 | created new head | |
239 | $ hg merge 2 |
|
239 | $ hg merge 2 | |
240 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
240 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
241 | (branch merge, don't forget to commit) |
|
241 | (branch merge, don't forget to commit) | |
242 | $ hg commit -d '4 0' -A -m d |
|
242 | $ hg commit -d '4 0' -A -m d | |
243 | $ hg summary |
|
243 | $ hg summary | |
244 | parent: 4:b2f3bb92043e tip |
|
244 | parent: 4:b2f3bb92043e tip | |
245 | d |
|
245 | d | |
246 | branch: default |
|
246 | branch: default | |
247 | commit: (clean) |
|
247 | commit: (clean) | |
248 | update: (current) |
|
248 | update: (current) | |
249 |
|
249 | |||
250 | backout of merge should fail |
|
250 | backout of merge should fail | |
251 |
|
251 | |||
252 | $ hg backout 4 |
|
252 | $ hg backout 4 | |
253 | abort: cannot backout a merge changeset |
|
253 | abort: cannot backout a merge changeset | |
254 | [255] |
|
254 | [255] | |
255 |
|
255 | |||
256 | backout of merge with bad parent should fail |
|
256 | backout of merge with bad parent should fail | |
257 |
|
257 | |||
258 | $ hg backout --parent 0 4 |
|
258 | $ hg backout --parent 0 4 | |
259 | abort: cb9a9f314b8b is not a parent of b2f3bb92043e |
|
259 | abort: cb9a9f314b8b is not a parent of b2f3bb92043e | |
260 | [255] |
|
260 | [255] | |
261 |
|
261 | |||
262 | backout of non-merge with parent should fail |
|
262 | backout of non-merge with parent should fail | |
263 |
|
263 | |||
264 | $ hg backout --parent 0 3 |
|
264 | $ hg backout --parent 0 3 | |
265 | abort: cannot use --parent on non-merge changeset |
|
265 | abort: cannot use --parent on non-merge changeset | |
266 | [255] |
|
266 | [255] | |
267 |
|
267 | |||
268 | backout with valid parent should be ok |
|
268 | backout with valid parent should be ok | |
269 |
|
269 | |||
270 | $ hg backout -d '5 0' --parent 2 4 --tool=true |
|
270 | $ hg backout -d '5 0' --parent 2 4 --tool=true | |
271 | removing d |
|
271 | removing d | |
272 | changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e |
|
272 | changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e | |
273 | $ hg summary |
|
273 | $ hg summary | |
274 | parent: 5:10e5328c8435 tip |
|
274 | parent: 5:10e5328c8435 tip | |
275 | Backed out changeset b2f3bb92043e |
|
275 | Backed out changeset b2f3bb92043e | |
276 | branch: default |
|
276 | branch: default | |
277 | commit: (clean) |
|
277 | commit: (clean) | |
278 | update: (current) |
|
278 | update: (current) | |
279 |
|
279 | |||
280 | $ hg rollback |
|
280 | $ hg rollback | |
281 | repository tip rolled back to revision 4 (undo commit) |
|
281 | repository tip rolled back to revision 4 (undo commit) | |
282 | working directory now based on revision 4 |
|
282 | working directory now based on revision 4 | |
283 | $ hg update -C |
|
283 | $ hg update -C | |
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
285 | $ hg summary |
|
285 | $ hg summary | |
286 | parent: 4:b2f3bb92043e tip |
|
286 | parent: 4:b2f3bb92043e tip | |
287 | d |
|
287 | d | |
288 | branch: default |
|
288 | branch: default | |
289 | commit: (clean) |
|
289 | commit: (clean) | |
290 | update: (current) |
|
290 | update: (current) | |
291 |
|
291 | |||
292 | $ hg backout -d '6 0' --parent 3 4 --tool=true |
|
292 | $ hg backout -d '6 0' --parent 3 4 --tool=true | |
293 | removing c |
|
293 | removing c | |
294 | changeset 5:033590168430 backs out changeset 4:b2f3bb92043e |
|
294 | changeset 5:033590168430 backs out changeset 4:b2f3bb92043e | |
295 | $ hg summary |
|
295 | $ hg summary | |
296 | parent: 5:033590168430 tip |
|
296 | parent: 5:033590168430 tip | |
297 | Backed out changeset b2f3bb92043e |
|
297 | Backed out changeset b2f3bb92043e | |
298 | branch: default |
|
298 | branch: default | |
299 | commit: (clean) |
|
299 | commit: (clean) | |
300 | update: (current) |
|
300 | update: (current) | |
301 |
|
301 | |||
302 | $ cd .. |
|
302 | $ cd .. | |
303 |
|
303 | |||
304 | named branches |
|
304 | named branches | |
305 |
|
305 | |||
306 | $ hg init named_branches |
|
306 | $ hg init named_branches | |
307 | $ cd named_branches |
|
307 | $ cd named_branches | |
308 |
|
308 | |||
309 | $ echo default > default |
|
309 | $ echo default > default | |
310 | $ hg ci -d '0 0' -Am default |
|
310 | $ hg ci -d '0 0' -Am default | |
311 | adding default |
|
311 | adding default | |
312 | $ hg branch branch1 |
|
312 | $ hg branch branch1 | |
313 | marked working directory as branch branch1 |
|
313 | marked working directory as branch branch1 | |
314 | (branches are permanent and global, did you want a bookmark?) |
|
314 | (branches are permanent and global, did you want a bookmark?) | |
315 | $ echo branch1 > file1 |
|
315 | $ echo branch1 > file1 | |
316 | $ hg ci -d '1 0' -Am file1 |
|
316 | $ hg ci -d '1 0' -Am file1 | |
317 | adding file1 |
|
317 | adding file1 | |
318 | $ hg branch branch2 |
|
318 | $ hg branch branch2 | |
319 | marked working directory as branch branch2 |
|
319 | marked working directory as branch branch2 | |
320 | (branches are permanent and global, did you want a bookmark?) |
|
320 | (branches are permanent and global, did you want a bookmark?) | |
321 | $ echo branch2 > file2 |
|
321 | $ echo branch2 > file2 | |
322 | $ hg ci -d '2 0' -Am file2 |
|
322 | $ hg ci -d '2 0' -Am file2 | |
323 | adding file2 |
|
323 | adding file2 | |
324 |
|
324 | |||
325 | without --merge |
|
325 | without --merge | |
326 | $ hg backout -r 1 --tool=true |
|
326 | $ hg backout -r 1 --tool=true | |
327 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
327 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
328 | changeset bf1602f437f3 backed out, don't forget to commit. |
|
328 | changeset bf1602f437f3 backed out, don't forget to commit. | |
329 | $ hg branch |
|
329 | $ hg branch | |
330 | branch2 |
|
330 | branch2 | |
331 | $ hg status -A |
|
331 | $ hg status -A | |
332 | R file1 |
|
332 | R file1 | |
333 | C default |
|
333 | C default | |
334 | C file2 |
|
334 | C file2 | |
335 | $ hg summary |
|
335 | $ hg summary | |
336 | parent: 2:45bbcd363bf0 tip |
|
336 | parent: 2:45bbcd363bf0 tip | |
337 | file2 |
|
337 | file2 | |
338 | branch: branch2 |
|
338 | branch: branch2 | |
339 | commit: 1 removed |
|
339 | commit: 1 removed | |
340 | update: (current) |
|
340 | update: (current) | |
341 |
|
341 | |||
342 | with --merge |
|
342 | with --merge | |
343 | $ hg update -qC |
|
343 | $ hg update -qC | |
344 | $ hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true |
|
344 | $ hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true | |
345 | removing file1 |
|
345 | removing file1 | |
346 | created new head |
|
346 | created new head | |
347 | changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 |
|
347 | changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 | |
348 | merging with changeset 3:d4e8f6db59fb |
|
348 | merging with changeset 3:d4e8f6db59fb | |
349 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
349 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
350 | (branch merge, don't forget to commit) |
|
350 | (branch merge, don't forget to commit) | |
351 | $ hg summary |
|
351 | $ hg summary | |
352 | parent: 2:45bbcd363bf0 |
|
352 | parent: 2:45bbcd363bf0 | |
353 | file2 |
|
353 | file2 | |
354 | parent: 3:d4e8f6db59fb tip |
|
354 | parent: 3:d4e8f6db59fb tip | |
355 | backout on branch1 |
|
355 | backout on branch1 | |
356 | branch: branch2 |
|
356 | branch: branch2 | |
357 | commit: 1 removed (merge) |
|
357 | commit: 1 removed (merge) | |
358 | update: (current) |
|
358 | update: (current) | |
359 | $ hg update -q -C 2 |
|
359 | $ hg update -q -C 2 | |
360 |
|
360 | |||
361 | on branch2 with branch1 not merged, so file1 should still exist: |
|
361 | on branch2 with branch1 not merged, so file1 should still exist: | |
362 |
|
362 | |||
363 | $ hg id |
|
363 | $ hg id | |
364 | 45bbcd363bf0 (branch2) |
|
364 | 45bbcd363bf0 (branch2) | |
365 | $ hg st -A |
|
365 | $ hg st -A | |
366 | C default |
|
366 | C default | |
367 | C file1 |
|
367 | C file1 | |
368 | C file2 |
|
368 | C file2 | |
369 | $ hg summary |
|
369 | $ hg summary | |
370 | parent: 2:45bbcd363bf0 |
|
370 | parent: 2:45bbcd363bf0 | |
371 | file2 |
|
371 | file2 | |
372 | branch: branch2 |
|
372 | branch: branch2 | |
373 | commit: (clean) |
|
373 | commit: (clean) | |
374 | update: 1 new changesets, 2 branch heads (merge) |
|
374 | update: 1 new changesets, 2 branch heads (merge) | |
375 |
|
375 | |||
376 | on branch2 with branch1 merged, so file1 should be gone: |
|
376 | on branch2 with branch1 merged, so file1 should be gone: | |
377 |
|
377 | |||
378 | $ hg merge |
|
378 | $ hg merge | |
379 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
379 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
380 | (branch merge, don't forget to commit) |
|
380 | (branch merge, don't forget to commit) | |
381 | $ hg ci -d '4 0' -m 'merge backout of branch1' |
|
381 | $ hg ci -d '4 0' -m 'merge backout of branch1' | |
382 | $ hg id |
|
382 | $ hg id | |
383 | 22149cdde76d (branch2) tip |
|
383 | 22149cdde76d (branch2) tip | |
384 | $ hg st -A |
|
384 | $ hg st -A | |
385 | C default |
|
385 | C default | |
386 | C file2 |
|
386 | C file2 | |
387 | $ hg summary |
|
387 | $ hg summary | |
388 | parent: 4:22149cdde76d tip |
|
388 | parent: 4:22149cdde76d tip | |
389 | merge backout of branch1 |
|
389 | merge backout of branch1 | |
390 | branch: branch2 |
|
390 | branch: branch2 | |
391 | commit: (clean) |
|
391 | commit: (clean) | |
392 | update: (current) |
|
392 | update: (current) | |
393 |
|
393 | |||
394 | on branch1, so no file1 and file2: |
|
394 | on branch1, so no file1 and file2: | |
395 |
|
395 | |||
396 | $ hg co -C branch1 |
|
396 | $ hg co -C branch1 | |
397 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
397 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
398 | $ hg id |
|
398 | $ hg id | |
399 | bf1602f437f3 (branch1) |
|
399 | bf1602f437f3 (branch1) | |
400 | $ hg st -A |
|
400 | $ hg st -A | |
401 | C default |
|
401 | C default | |
402 | C file1 |
|
402 | C file1 | |
403 | $ hg summary |
|
403 | $ hg summary | |
404 | parent: 1:bf1602f437f3 |
|
404 | parent: 1:bf1602f437f3 | |
405 | file1 |
|
405 | file1 | |
406 | branch: branch1 |
|
406 | branch: branch1 | |
407 | commit: (clean) |
|
407 | commit: (clean) | |
408 | update: (current) |
|
408 | update: (current) | |
409 |
|
409 | |||
410 | $ cd .. |
|
410 | $ cd .. | |
|
411 | ||||
|
412 | ||||
|
413 | Test usage of `hg resolve` in case of conflict | |||
|
414 | (issue4163) | |||
|
415 | ||||
|
416 | $ hg init issue4163 | |||
|
417 | $ cd issue4163 | |||
|
418 | $ touch foo | |||
|
419 | $ hg add foo | |||
|
420 | $ cat > foo << EOF | |||
|
421 | > one | |||
|
422 | > two | |||
|
423 | > three | |||
|
424 | > four | |||
|
425 | > five | |||
|
426 | > six | |||
|
427 | > seven | |||
|
428 | > height | |||
|
429 | > nine | |||
|
430 | > ten | |||
|
431 | > EOF | |||
|
432 | $ hg ci -m 'initial' | |||
|
433 | $ cat > foo << EOF | |||
|
434 | > one | |||
|
435 | > two | |||
|
436 | > THREE | |||
|
437 | > four | |||
|
438 | > five | |||
|
439 | > six | |||
|
440 | > seven | |||
|
441 | > height | |||
|
442 | > nine | |||
|
443 | > ten | |||
|
444 | > EOF | |||
|
445 | $ hg ci -m 'capital three' | |||
|
446 | $ cat > foo << EOF | |||
|
447 | > one | |||
|
448 | > two | |||
|
449 | > THREE | |||
|
450 | > four | |||
|
451 | > five | |||
|
452 | > six | |||
|
453 | > seven | |||
|
454 | > height | |||
|
455 | > nine | |||
|
456 | > TEN | |||
|
457 | > EOF | |||
|
458 | $ hg ci -m 'capital ten' | |||
|
459 | $ hg backout -r 'desc("capital three")' --tool internal:fail | |||
|
460 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
461 | use 'hg resolve' to retry unresolved file merges | |||
|
462 | [1] | |||
|
463 | $ hg status | |||
|
464 | $ hg resolve -l # still unresolved | |||
|
465 | U foo | |||
|
466 | $ hg summary | |||
|
467 | parent: 2:b71750c4b0fd tip | |||
|
468 | capital ten | |||
|
469 | branch: default | |||
|
470 | commit: 1 unresolved (clean) | |||
|
471 | update: (current) | |||
|
472 | $ hg resolve --all --debug | |||
|
473 | picked tool 'internal:merge' for foo (binary False symlink False) | |||
|
474 | merging foo | |||
|
475 | my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 | |||
|
476 | premerge successful | |||
|
477 | $ hg status | |||
|
478 | M foo | |||
|
479 | ? foo.orig | |||
|
480 | $ hg resolve -l | |||
|
481 | R foo | |||
|
482 | $ hg summary | |||
|
483 | parent: 2:b71750c4b0fd tip | |||
|
484 | capital ten | |||
|
485 | branch: default | |||
|
486 | commit: 1 modified, 1 unknown | |||
|
487 | update: (current) | |||
|
488 | $ cat foo | |||
|
489 | one | |||
|
490 | two | |||
|
491 | three | |||
|
492 | four | |||
|
493 | five | |||
|
494 | six | |||
|
495 | seven | |||
|
496 | height | |||
|
497 | nine | |||
|
498 | TEN | |||
|
499 | ||||
|
500 |
General Comments 0
You need to be logged in to leave comments.
Login now