|
|
@@
-1,6220
+1,6220
b''
|
|
|
1
|
# commands.py - command processing for mercurial
|
|
1
|
# commands.py - command processing for mercurial
|
|
|
2
|
#
|
|
2
|
#
|
|
|
3
|
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
|
|
3
|
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
|
|
|
4
|
#
|
|
4
|
#
|
|
|
5
|
# This software may be used and distributed according to the terms of the
|
|
5
|
# This software may be used and distributed according to the terms of the
|
|
|
6
|
# GNU General Public License version 2 or any later version.
|
|
6
|
# GNU General Public License version 2 or any later version.
|
|
|
7
|
|
|
7
|
|
|
|
8
|
from __future__ import absolute_import
|
|
8
|
from __future__ import absolute_import
|
|
|
9
|
|
|
9
|
|
|
|
10
|
import difflib
|
|
10
|
import difflib
|
|
|
11
|
import errno
|
|
11
|
import errno
|
|
|
12
|
import os
|
|
12
|
import os
|
|
|
13
|
import re
|
|
13
|
import re
|
|
|
14
|
import sys
|
|
14
|
import sys
|
|
|
15
|
|
|
15
|
|
|
|
16
|
from .i18n import _
|
|
16
|
from .i18n import _
|
|
|
17
|
from .node import (
|
|
17
|
from .node import (
|
|
|
18
|
hex,
|
|
18
|
hex,
|
|
|
19
|
nullid,
|
|
19
|
nullid,
|
|
|
20
|
nullrev,
|
|
20
|
nullrev,
|
|
|
21
|
short,
|
|
21
|
short,
|
|
|
22
|
wdirhex,
|
|
22
|
wdirhex,
|
|
|
23
|
wdirrev,
|
|
23
|
wdirrev,
|
|
|
24
|
)
|
|
24
|
)
|
|
|
25
|
from . import (
|
|
25
|
from . import (
|
|
|
26
|
archival,
|
|
26
|
archival,
|
|
|
27
|
bookmarks,
|
|
27
|
bookmarks,
|
|
|
28
|
bundle2,
|
|
28
|
bundle2,
|
|
|
29
|
changegroup,
|
|
29
|
changegroup,
|
|
|
30
|
cmdutil,
|
|
30
|
cmdutil,
|
|
|
31
|
copies,
|
|
31
|
copies,
|
|
|
32
|
debugcommands as debugcommandsmod,
|
|
32
|
debugcommands as debugcommandsmod,
|
|
|
33
|
destutil,
|
|
33
|
destutil,
|
|
|
34
|
dirstateguard,
|
|
34
|
dirstateguard,
|
|
|
35
|
discovery,
|
|
35
|
discovery,
|
|
|
36
|
encoding,
|
|
36
|
encoding,
|
|
|
37
|
error,
|
|
37
|
error,
|
|
|
38
|
exchange,
|
|
38
|
exchange,
|
|
|
39
|
extensions,
|
|
39
|
extensions,
|
|
|
40
|
filemerge,
|
|
40
|
filemerge,
|
|
|
41
|
formatter,
|
|
41
|
formatter,
|
|
|
42
|
graphmod,
|
|
42
|
graphmod,
|
|
|
43
|
hbisect,
|
|
43
|
hbisect,
|
|
|
44
|
help,
|
|
44
|
help,
|
|
|
45
|
hg,
|
|
45
|
hg,
|
|
|
46
|
logcmdutil,
|
|
46
|
logcmdutil,
|
|
|
47
|
merge as mergemod,
|
|
47
|
merge as mergemod,
|
|
|
48
|
narrowspec,
|
|
48
|
narrowspec,
|
|
|
49
|
obsolete,
|
|
49
|
obsolete,
|
|
|
50
|
obsutil,
|
|
50
|
obsutil,
|
|
|
51
|
patch,
|
|
51
|
patch,
|
|
|
52
|
phases,
|
|
52
|
phases,
|
|
|
53
|
pycompat,
|
|
53
|
pycompat,
|
|
|
54
|
rcutil,
|
|
54
|
rcutil,
|
|
|
55
|
registrar,
|
|
55
|
registrar,
|
|
|
56
|
repair,
|
|
56
|
repair,
|
|
|
57
|
revsetlang,
|
|
57
|
revsetlang,
|
|
|
58
|
rewriteutil,
|
|
58
|
rewriteutil,
|
|
|
59
|
scmutil,
|
|
59
|
scmutil,
|
|
|
60
|
server,
|
|
60
|
server,
|
|
|
61
|
state as statemod,
|
|
61
|
state as statemod,
|
|
|
62
|
streamclone,
|
|
62
|
streamclone,
|
|
|
63
|
tags as tagsmod,
|
|
63
|
tags as tagsmod,
|
|
|
64
|
templatekw,
|
|
64
|
templatekw,
|
|
|
65
|
ui as uimod,
|
|
65
|
ui as uimod,
|
|
|
66
|
util,
|
|
66
|
util,
|
|
|
67
|
wireprotoserver,
|
|
67
|
wireprotoserver,
|
|
|
68
|
)
|
|
68
|
)
|
|
|
69
|
from .utils import (
|
|
69
|
from .utils import (
|
|
|
70
|
dateutil,
|
|
70
|
dateutil,
|
|
|
71
|
stringutil,
|
|
71
|
stringutil,
|
|
|
72
|
)
|
|
72
|
)
|
|
|
73
|
|
|
73
|
|
|
|
74
|
table = {}
|
|
74
|
table = {}
|
|
|
75
|
table.update(debugcommandsmod.command._table)
|
|
75
|
table.update(debugcommandsmod.command._table)
|
|
|
76
|
|
|
76
|
|
|
|
77
|
command = registrar.command(table)
|
|
77
|
command = registrar.command(table)
|
|
|
78
|
INTENT_READONLY = registrar.INTENT_READONLY
|
|
78
|
INTENT_READONLY = registrar.INTENT_READONLY
|
|
|
79
|
|
|
79
|
|
|
|
80
|
# common command options
|
|
80
|
# common command options
|
|
|
81
|
|
|
81
|
|
|
|
82
|
globalopts = [
|
|
82
|
globalopts = [
|
|
|
83
|
('R', 'repository', '',
|
|
83
|
('R', 'repository', '',
|
|
|
84
|
_('repository root directory or name of overlay bundle file'),
|
|
84
|
_('repository root directory or name of overlay bundle file'),
|
|
|
85
|
_('REPO')),
|
|
85
|
_('REPO')),
|
|
|
86
|
('', 'cwd', '',
|
|
86
|
('', 'cwd', '',
|
|
|
87
|
_('change working directory'), _('DIR')),
|
|
87
|
_('change working directory'), _('DIR')),
|
|
|
88
|
('y', 'noninteractive', None,
|
|
88
|
('y', 'noninteractive', None,
|
|
|
89
|
_('do not prompt, automatically pick the first choice for all prompts')),
|
|
89
|
_('do not prompt, automatically pick the first choice for all prompts')),
|
|
|
90
|
('q', 'quiet', None, _('suppress output')),
|
|
90
|
('q', 'quiet', None, _('suppress output')),
|
|
|
91
|
('v', 'verbose', None, _('enable additional output')),
|
|
91
|
('v', 'verbose', None, _('enable additional output')),
|
|
|
92
|
('', 'color', '',
|
|
92
|
('', 'color', '',
|
|
|
93
|
# i18n: 'always', 'auto', 'never', and 'debug' are keywords
|
|
93
|
# i18n: 'always', 'auto', 'never', and 'debug' are keywords
|
|
|
94
|
# and should not be translated
|
|
94
|
# and should not be translated
|
|
|
95
|
_("when to colorize (boolean, always, auto, never, or debug)"),
|
|
95
|
_("when to colorize (boolean, always, auto, never, or debug)"),
|
|
|
96
|
_('TYPE')),
|
|
96
|
_('TYPE')),
|
|
|
97
|
('', 'config', [],
|
|
97
|
('', 'config', [],
|
|
|
98
|
_('set/override config option (use \'section.name=value\')'),
|
|
98
|
_('set/override config option (use \'section.name=value\')'),
|
|
|
99
|
_('CONFIG')),
|
|
99
|
_('CONFIG')),
|
|
|
100
|
('', 'debug', None, _('enable debugging output')),
|
|
100
|
('', 'debug', None, _('enable debugging output')),
|
|
|
101
|
('', 'debugger', None, _('start debugger')),
|
|
101
|
('', 'debugger', None, _('start debugger')),
|
|
|
102
|
('', 'encoding', encoding.encoding, _('set the charset encoding'),
|
|
102
|
('', 'encoding', encoding.encoding, _('set the charset encoding'),
|
|
|
103
|
_('ENCODE')),
|
|
103
|
_('ENCODE')),
|
|
|
104
|
('', 'encodingmode', encoding.encodingmode,
|
|
104
|
('', 'encodingmode', encoding.encodingmode,
|
|
|
105
|
_('set the charset encoding mode'), _('MODE')),
|
|
105
|
_('set the charset encoding mode'), _('MODE')),
|
|
|
106
|
('', 'traceback', None, _('always print a traceback on exception')),
|
|
106
|
('', 'traceback', None, _('always print a traceback on exception')),
|
|
|
107
|
('', 'time', None, _('time how long the command takes')),
|
|
107
|
('', 'time', None, _('time how long the command takes')),
|
|
|
108
|
('', 'profile', None, _('print command execution profile')),
|
|
108
|
('', 'profile', None, _('print command execution profile')),
|
|
|
109
|
('', 'version', None, _('output version information and exit')),
|
|
109
|
('', 'version', None, _('output version information and exit')),
|
|
|
110
|
('h', 'help', None, _('display help and exit')),
|
|
110
|
('h', 'help', None, _('display help and exit')),
|
|
|
111
|
('', 'hidden', False, _('consider hidden changesets')),
|
|
111
|
('', 'hidden', False, _('consider hidden changesets')),
|
|
|
112
|
('', 'pager', 'auto',
|
|
112
|
('', 'pager', 'auto',
|
|
|
113
|
_("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
|
|
113
|
_("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
|
|
|
114
|
]
|
|
114
|
]
|
|
|
115
|
|
|
115
|
|
|
|
116
|
dryrunopts = cmdutil.dryrunopts
|
|
116
|
dryrunopts = cmdutil.dryrunopts
|
|
|
117
|
remoteopts = cmdutil.remoteopts
|
|
117
|
remoteopts = cmdutil.remoteopts
|
|
|
118
|
walkopts = cmdutil.walkopts
|
|
118
|
walkopts = cmdutil.walkopts
|
|
|
119
|
commitopts = cmdutil.commitopts
|
|
119
|
commitopts = cmdutil.commitopts
|
|
|
120
|
commitopts2 = cmdutil.commitopts2
|
|
120
|
commitopts2 = cmdutil.commitopts2
|
|
|
121
|
formatteropts = cmdutil.formatteropts
|
|
121
|
formatteropts = cmdutil.formatteropts
|
|
|
122
|
templateopts = cmdutil.templateopts
|
|
122
|
templateopts = cmdutil.templateopts
|
|
|
123
|
logopts = cmdutil.logopts
|
|
123
|
logopts = cmdutil.logopts
|
|
|
124
|
diffopts = cmdutil.diffopts
|
|
124
|
diffopts = cmdutil.diffopts
|
|
|
125
|
diffwsopts = cmdutil.diffwsopts
|
|
125
|
diffwsopts = cmdutil.diffwsopts
|
|
|
126
|
diffopts2 = cmdutil.diffopts2
|
|
126
|
diffopts2 = cmdutil.diffopts2
|
|
|
127
|
mergetoolopts = cmdutil.mergetoolopts
|
|
127
|
mergetoolopts = cmdutil.mergetoolopts
|
|
|
128
|
similarityopts = cmdutil.similarityopts
|
|
128
|
similarityopts = cmdutil.similarityopts
|
|
|
129
|
subrepoopts = cmdutil.subrepoopts
|
|
129
|
subrepoopts = cmdutil.subrepoopts
|
|
|
130
|
debugrevlogopts = cmdutil.debugrevlogopts
|
|
130
|
debugrevlogopts = cmdutil.debugrevlogopts
|
|
|
131
|
|
|
131
|
|
|
|
132
|
# Commands start here, listed alphabetically
|
|
132
|
# Commands start here, listed alphabetically
|
|
|
133
|
|
|
133
|
|
|
|
134
|
@command('add',
|
|
134
|
@command('add',
|
|
|
135
|
walkopts + subrepoopts + dryrunopts,
|
|
135
|
walkopts + subrepoopts + dryrunopts,
|
|
|
136
|
_('[OPTION]... [FILE]...'),
|
|
136
|
_('[OPTION]... [FILE]...'),
|
|
|
137
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
137
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
138
|
helpbasic=True, inferrepo=True)
|
|
138
|
helpbasic=True, inferrepo=True)
|
|
|
139
|
def add(ui, repo, *pats, **opts):
|
|
139
|
def add(ui, repo, *pats, **opts):
|
|
|
140
|
"""add the specified files on the next commit
|
|
140
|
"""add the specified files on the next commit
|
|
|
141
|
|
|
141
|
|
|
|
142
|
Schedule files to be version controlled and added to the
|
|
142
|
Schedule files to be version controlled and added to the
|
|
|
143
|
repository.
|
|
143
|
repository.
|
|
|
144
|
|
|
144
|
|
|
|
145
|
The files will be added to the repository at the next commit. To
|
|
145
|
The files will be added to the repository at the next commit. To
|
|
|
146
|
undo an add before that, see :hg:`forget`.
|
|
146
|
undo an add before that, see :hg:`forget`.
|
|
|
147
|
|
|
147
|
|
|
|
148
|
If no names are given, add all files to the repository (except
|
|
148
|
If no names are given, add all files to the repository (except
|
|
|
149
|
files matching ``.hgignore``).
|
|
149
|
files matching ``.hgignore``).
|
|
|
150
|
|
|
150
|
|
|
|
151
|
.. container:: verbose
|
|
151
|
.. container:: verbose
|
|
|
152
|
|
|
152
|
|
|
|
153
|
Examples:
|
|
153
|
Examples:
|
|
|
154
|
|
|
154
|
|
|
|
155
|
- New (unknown) files are added
|
|
155
|
- New (unknown) files are added
|
|
|
156
|
automatically by :hg:`add`::
|
|
156
|
automatically by :hg:`add`::
|
|
|
157
|
|
|
157
|
|
|
|
158
|
$ ls
|
|
158
|
$ ls
|
|
|
159
|
foo.c
|
|
159
|
foo.c
|
|
|
160
|
$ hg status
|
|
160
|
$ hg status
|
|
|
161
|
? foo.c
|
|
161
|
? foo.c
|
|
|
162
|
$ hg add
|
|
162
|
$ hg add
|
|
|
163
|
adding foo.c
|
|
163
|
adding foo.c
|
|
|
164
|
$ hg status
|
|
164
|
$ hg status
|
|
|
165
|
A foo.c
|
|
165
|
A foo.c
|
|
|
166
|
|
|
166
|
|
|
|
167
|
- Specific files to be added can be specified::
|
|
167
|
- Specific files to be added can be specified::
|
|
|
168
|
|
|
168
|
|
|
|
169
|
$ ls
|
|
169
|
$ ls
|
|
|
170
|
bar.c foo.c
|
|
170
|
bar.c foo.c
|
|
|
171
|
$ hg status
|
|
171
|
$ hg status
|
|
|
172
|
? bar.c
|
|
172
|
? bar.c
|
|
|
173
|
? foo.c
|
|
173
|
? foo.c
|
|
|
174
|
$ hg add bar.c
|
|
174
|
$ hg add bar.c
|
|
|
175
|
$ hg status
|
|
175
|
$ hg status
|
|
|
176
|
A bar.c
|
|
176
|
A bar.c
|
|
|
177
|
? foo.c
|
|
177
|
? foo.c
|
|
|
178
|
|
|
178
|
|
|
|
179
|
Returns 0 if all files are successfully added.
|
|
179
|
Returns 0 if all files are successfully added.
|
|
|
180
|
"""
|
|
180
|
"""
|
|
|
181
|
|
|
181
|
|
|
|
182
|
m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
|
|
182
|
m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
|
|
|
183
|
rejected = cmdutil.add(ui, repo, m, "", False, **opts)
|
|
183
|
rejected = cmdutil.add(ui, repo, m, "", False, **opts)
|
|
|
184
|
return rejected and 1 or 0
|
|
184
|
return rejected and 1 or 0
|
|
|
185
|
|
|
185
|
|
|
|
186
|
@command('addremove',
|
|
186
|
@command('addremove',
|
|
|
187
|
similarityopts + subrepoopts + walkopts + dryrunopts,
|
|
187
|
similarityopts + subrepoopts + walkopts + dryrunopts,
|
|
|
188
|
_('[OPTION]... [FILE]...'),
|
|
188
|
_('[OPTION]... [FILE]...'),
|
|
|
189
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
189
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
190
|
inferrepo=True)
|
|
190
|
inferrepo=True)
|
|
|
191
|
def addremove(ui, repo, *pats, **opts):
|
|
191
|
def addremove(ui, repo, *pats, **opts):
|
|
|
192
|
"""add all new files, delete all missing files
|
|
192
|
"""add all new files, delete all missing files
|
|
|
193
|
|
|
193
|
|
|
|
194
|
Add all new files and remove all missing files from the
|
|
194
|
Add all new files and remove all missing files from the
|
|
|
195
|
repository.
|
|
195
|
repository.
|
|
|
196
|
|
|
196
|
|
|
|
197
|
Unless names are given, new files are ignored if they match any of
|
|
197
|
Unless names are given, new files are ignored if they match any of
|
|
|
198
|
the patterns in ``.hgignore``. As with add, these changes take
|
|
198
|
the patterns in ``.hgignore``. As with add, these changes take
|
|
|
199
|
effect at the next commit.
|
|
199
|
effect at the next commit.
|
|
|
200
|
|
|
200
|
|
|
|
201
|
Use the -s/--similarity option to detect renamed files. This
|
|
201
|
Use the -s/--similarity option to detect renamed files. This
|
|
|
202
|
option takes a percentage between 0 (disabled) and 100 (files must
|
|
202
|
option takes a percentage between 0 (disabled) and 100 (files must
|
|
|
203
|
be identical) as its parameter. With a parameter greater than 0,
|
|
203
|
be identical) as its parameter. With a parameter greater than 0,
|
|
|
204
|
this compares every removed file with every added file and records
|
|
204
|
this compares every removed file with every added file and records
|
|
|
205
|
those similar enough as renames. Detecting renamed files this way
|
|
205
|
those similar enough as renames. Detecting renamed files this way
|
|
|
206
|
can be expensive. After using this option, :hg:`status -C` can be
|
|
206
|
can be expensive. After using this option, :hg:`status -C` can be
|
|
|
207
|
used to check which files were identified as moved or renamed. If
|
|
207
|
used to check which files were identified as moved or renamed. If
|
|
|
208
|
not specified, -s/--similarity defaults to 100 and only renames of
|
|
208
|
not specified, -s/--similarity defaults to 100 and only renames of
|
|
|
209
|
identical files are detected.
|
|
209
|
identical files are detected.
|
|
|
210
|
|
|
210
|
|
|
|
211
|
.. container:: verbose
|
|
211
|
.. container:: verbose
|
|
|
212
|
|
|
212
|
|
|
|
213
|
Examples:
|
|
213
|
Examples:
|
|
|
214
|
|
|
214
|
|
|
|
215
|
- A number of files (bar.c and foo.c) are new,
|
|
215
|
- A number of files (bar.c and foo.c) are new,
|
|
|
216
|
while foobar.c has been removed (without using :hg:`remove`)
|
|
216
|
while foobar.c has been removed (without using :hg:`remove`)
|
|
|
217
|
from the repository::
|
|
217
|
from the repository::
|
|
|
218
|
|
|
218
|
|
|
|
219
|
$ ls
|
|
219
|
$ ls
|
|
|
220
|
bar.c foo.c
|
|
220
|
bar.c foo.c
|
|
|
221
|
$ hg status
|
|
221
|
$ hg status
|
|
|
222
|
! foobar.c
|
|
222
|
! foobar.c
|
|
|
223
|
? bar.c
|
|
223
|
? bar.c
|
|
|
224
|
? foo.c
|
|
224
|
? foo.c
|
|
|
225
|
$ hg addremove
|
|
225
|
$ hg addremove
|
|
|
226
|
adding bar.c
|
|
226
|
adding bar.c
|
|
|
227
|
adding foo.c
|
|
227
|
adding foo.c
|
|
|
228
|
removing foobar.c
|
|
228
|
removing foobar.c
|
|
|
229
|
$ hg status
|
|
229
|
$ hg status
|
|
|
230
|
A bar.c
|
|
230
|
A bar.c
|
|
|
231
|
A foo.c
|
|
231
|
A foo.c
|
|
|
232
|
R foobar.c
|
|
232
|
R foobar.c
|
|
|
233
|
|
|
233
|
|
|
|
234
|
- A file foobar.c was moved to foo.c without using :hg:`rename`.
|
|
234
|
- A file foobar.c was moved to foo.c without using :hg:`rename`.
|
|
|
235
|
Afterwards, it was edited slightly::
|
|
235
|
Afterwards, it was edited slightly::
|
|
|
236
|
|
|
236
|
|
|
|
237
|
$ ls
|
|
237
|
$ ls
|
|
|
238
|
foo.c
|
|
238
|
foo.c
|
|
|
239
|
$ hg status
|
|
239
|
$ hg status
|
|
|
240
|
! foobar.c
|
|
240
|
! foobar.c
|
|
|
241
|
? foo.c
|
|
241
|
? foo.c
|
|
|
242
|
$ hg addremove --similarity 90
|
|
242
|
$ hg addremove --similarity 90
|
|
|
243
|
removing foobar.c
|
|
243
|
removing foobar.c
|
|
|
244
|
adding foo.c
|
|
244
|
adding foo.c
|
|
|
245
|
recording removal of foobar.c as rename to foo.c (94% similar)
|
|
245
|
recording removal of foobar.c as rename to foo.c (94% similar)
|
|
|
246
|
$ hg status -C
|
|
246
|
$ hg status -C
|
|
|
247
|
A foo.c
|
|
247
|
A foo.c
|
|
|
248
|
foobar.c
|
|
248
|
foobar.c
|
|
|
249
|
R foobar.c
|
|
249
|
R foobar.c
|
|
|
250
|
|
|
250
|
|
|
|
251
|
Returns 0 if all files are successfully added.
|
|
251
|
Returns 0 if all files are successfully added.
|
|
|
252
|
"""
|
|
252
|
"""
|
|
|
253
|
opts = pycompat.byteskwargs(opts)
|
|
253
|
opts = pycompat.byteskwargs(opts)
|
|
|
254
|
if not opts.get('similarity'):
|
|
254
|
if not opts.get('similarity'):
|
|
|
255
|
opts['similarity'] = '100'
|
|
255
|
opts['similarity'] = '100'
|
|
|
256
|
matcher = scmutil.match(repo[None], pats, opts)
|
|
256
|
matcher = scmutil.match(repo[None], pats, opts)
|
|
|
257
|
return scmutil.addremove(repo, matcher, "", opts)
|
|
257
|
return scmutil.addremove(repo, matcher, "", opts)
|
|
|
258
|
|
|
258
|
|
|
|
259
|
@command('annotate|blame',
|
|
259
|
@command('annotate|blame',
|
|
|
260
|
[('r', 'rev', '', _('annotate the specified revision'), _('REV')),
|
|
260
|
[('r', 'rev', '', _('annotate the specified revision'), _('REV')),
|
|
|
261
|
('', 'follow', None,
|
|
261
|
('', 'follow', None,
|
|
|
262
|
_('follow copies/renames and list the filename (DEPRECATED)')),
|
|
262
|
_('follow copies/renames and list the filename (DEPRECATED)')),
|
|
|
263
|
('', 'no-follow', None, _("don't follow copies and renames")),
|
|
263
|
('', 'no-follow', None, _("don't follow copies and renames")),
|
|
|
264
|
('a', 'text', None, _('treat all files as text')),
|
|
264
|
('a', 'text', None, _('treat all files as text')),
|
|
|
265
|
('u', 'user', None, _('list the author (long with -v)')),
|
|
265
|
('u', 'user', None, _('list the author (long with -v)')),
|
|
|
266
|
('f', 'file', None, _('list the filename')),
|
|
266
|
('f', 'file', None, _('list the filename')),
|
|
|
267
|
('d', 'date', None, _('list the date (short with -q)')),
|
|
267
|
('d', 'date', None, _('list the date (short with -q)')),
|
|
|
268
|
('n', 'number', None, _('list the revision number (default)')),
|
|
268
|
('n', 'number', None, _('list the revision number (default)')),
|
|
|
269
|
('c', 'changeset', None, _('list the changeset')),
|
|
269
|
('c', 'changeset', None, _('list the changeset')),
|
|
|
270
|
('l', 'line-number', None, _('show line number at the first appearance')),
|
|
270
|
('l', 'line-number', None, _('show line number at the first appearance')),
|
|
|
271
|
('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
|
|
271
|
('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
|
|
|
272
|
] + diffwsopts + walkopts + formatteropts,
|
|
272
|
] + diffwsopts + walkopts + formatteropts,
|
|
|
273
|
_('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
|
|
273
|
_('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
|
|
|
274
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
274
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
275
|
helpbasic=True, inferrepo=True)
|
|
275
|
helpbasic=True, inferrepo=True)
|
|
|
276
|
def annotate(ui, repo, *pats, **opts):
|
|
276
|
def annotate(ui, repo, *pats, **opts):
|
|
|
277
|
"""show changeset information by line for each file
|
|
277
|
"""show changeset information by line for each file
|
|
|
278
|
|
|
278
|
|
|
|
279
|
List changes in files, showing the revision id responsible for
|
|
279
|
List changes in files, showing the revision id responsible for
|
|
|
280
|
each line.
|
|
280
|
each line.
|
|
|
281
|
|
|
281
|
|
|
|
282
|
This command is useful for discovering when a change was made and
|
|
282
|
This command is useful for discovering when a change was made and
|
|
|
283
|
by whom.
|
|
283
|
by whom.
|
|
|
284
|
|
|
284
|
|
|
|
285
|
If you include --file, --user, or --date, the revision number is
|
|
285
|
If you include --file, --user, or --date, the revision number is
|
|
|
286
|
suppressed unless you also include --number.
|
|
286
|
suppressed unless you also include --number.
|
|
|
287
|
|
|
287
|
|
|
|
288
|
Without the -a/--text option, annotate will avoid processing files
|
|
288
|
Without the -a/--text option, annotate will avoid processing files
|
|
|
289
|
it detects as binary. With -a, annotate will annotate the file
|
|
289
|
it detects as binary. With -a, annotate will annotate the file
|
|
|
290
|
anyway, although the results will probably be neither useful
|
|
290
|
anyway, although the results will probably be neither useful
|
|
|
291
|
nor desirable.
|
|
291
|
nor desirable.
|
|
|
292
|
|
|
292
|
|
|
|
293
|
.. container:: verbose
|
|
293
|
.. container:: verbose
|
|
|
294
|
|
|
294
|
|
|
|
295
|
Template:
|
|
295
|
Template:
|
|
|
296
|
|
|
296
|
|
|
|
297
|
The following keywords are supported in addition to the common template
|
|
297
|
The following keywords are supported in addition to the common template
|
|
|
298
|
keywords and functions. See also :hg:`help templates`.
|
|
298
|
keywords and functions. See also :hg:`help templates`.
|
|
|
299
|
|
|
299
|
|
|
|
300
|
:lines: List of lines with annotation data.
|
|
300
|
:lines: List of lines with annotation data.
|
|
|
301
|
:path: String. Repository-absolute path of the specified file.
|
|
301
|
:path: String. Repository-absolute path of the specified file.
|
|
|
302
|
|
|
302
|
|
|
|
303
|
And each entry of ``{lines}`` provides the following sub-keywords in
|
|
303
|
And each entry of ``{lines}`` provides the following sub-keywords in
|
|
|
304
|
addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
|
|
304
|
addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
|
|
|
305
|
|
|
305
|
|
|
|
306
|
:line: String. Line content.
|
|
306
|
:line: String. Line content.
|
|
|
307
|
:lineno: Integer. Line number at that revision.
|
|
307
|
:lineno: Integer. Line number at that revision.
|
|
|
308
|
:path: String. Repository-absolute path of the file at that revision.
|
|
308
|
:path: String. Repository-absolute path of the file at that revision.
|
|
|
309
|
|
|
309
|
|
|
|
310
|
See :hg:`help templates.operators` for the list expansion syntax.
|
|
310
|
See :hg:`help templates.operators` for the list expansion syntax.
|
|
|
311
|
|
|
311
|
|
|
|
312
|
Returns 0 on success.
|
|
312
|
Returns 0 on success.
|
|
|
313
|
"""
|
|
313
|
"""
|
|
|
314
|
opts = pycompat.byteskwargs(opts)
|
|
314
|
opts = pycompat.byteskwargs(opts)
|
|
|
315
|
if not pats:
|
|
315
|
if not pats:
|
|
|
316
|
raise error.Abort(_('at least one filename or pattern is required'))
|
|
316
|
raise error.Abort(_('at least one filename or pattern is required'))
|
|
|
317
|
|
|
317
|
|
|
|
318
|
if opts.get('follow'):
|
|
318
|
if opts.get('follow'):
|
|
|
319
|
# --follow is deprecated and now just an alias for -f/--file
|
|
319
|
# --follow is deprecated and now just an alias for -f/--file
|
|
|
320
|
# to mimic the behavior of Mercurial before version 1.5
|
|
320
|
# to mimic the behavior of Mercurial before version 1.5
|
|
|
321
|
opts['file'] = True
|
|
321
|
opts['file'] = True
|
|
|
322
|
|
|
322
|
|
|
|
323
|
if (not opts.get('user') and not opts.get('changeset')
|
|
323
|
if (not opts.get('user') and not opts.get('changeset')
|
|
|
324
|
and not opts.get('date') and not opts.get('file')):
|
|
324
|
and not opts.get('date') and not opts.get('file')):
|
|
|
325
|
opts['number'] = True
|
|
325
|
opts['number'] = True
|
|
|
326
|
|
|
326
|
|
|
|
327
|
linenumber = opts.get('line_number') is not None
|
|
327
|
linenumber = opts.get('line_number') is not None
|
|
|
328
|
if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
|
|
328
|
if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
|
|
|
329
|
raise error.Abort(_('at least one of -n/-c is required for -l'))
|
|
329
|
raise error.Abort(_('at least one of -n/-c is required for -l'))
|
|
|
330
|
|
|
330
|
|
|
|
331
|
rev = opts.get('rev')
|
|
331
|
rev = opts.get('rev')
|
|
|
332
|
if rev:
|
|
332
|
if rev:
|
|
|
333
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
333
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
334
|
ctx = scmutil.revsingle(repo, rev)
|
|
334
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
335
|
|
|
335
|
|
|
|
336
|
ui.pager('annotate')
|
|
336
|
ui.pager('annotate')
|
|
|
337
|
rootfm = ui.formatter('annotate', opts)
|
|
337
|
rootfm = ui.formatter('annotate', opts)
|
|
|
338
|
if ui.debugflag:
|
|
338
|
if ui.debugflag:
|
|
|
339
|
shorthex = pycompat.identity
|
|
339
|
shorthex = pycompat.identity
|
|
|
340
|
else:
|
|
340
|
else:
|
|
|
341
|
def shorthex(h):
|
|
341
|
def shorthex(h):
|
|
|
342
|
return h[:12]
|
|
342
|
return h[:12]
|
|
|
343
|
if ui.quiet:
|
|
343
|
if ui.quiet:
|
|
|
344
|
datefunc = dateutil.shortdate
|
|
344
|
datefunc = dateutil.shortdate
|
|
|
345
|
else:
|
|
345
|
else:
|
|
|
346
|
datefunc = dateutil.datestr
|
|
346
|
datefunc = dateutil.datestr
|
|
|
347
|
if ctx.rev() is None:
|
|
347
|
if ctx.rev() is None:
|
|
|
348
|
if opts.get('changeset'):
|
|
348
|
if opts.get('changeset'):
|
|
|
349
|
# omit "+" suffix which is appended to node hex
|
|
349
|
# omit "+" suffix which is appended to node hex
|
|
|
350
|
def formatrev(rev):
|
|
350
|
def formatrev(rev):
|
|
|
351
|
if rev == wdirrev:
|
|
351
|
if rev == wdirrev:
|
|
|
352
|
return '%d' % ctx.p1().rev()
|
|
352
|
return '%d' % ctx.p1().rev()
|
|
|
353
|
else:
|
|
353
|
else:
|
|
|
354
|
return '%d' % rev
|
|
354
|
return '%d' % rev
|
|
|
355
|
else:
|
|
355
|
else:
|
|
|
356
|
def formatrev(rev):
|
|
356
|
def formatrev(rev):
|
|
|
357
|
if rev == wdirrev:
|
|
357
|
if rev == wdirrev:
|
|
|
358
|
return '%d+' % ctx.p1().rev()
|
|
358
|
return '%d+' % ctx.p1().rev()
|
|
|
359
|
else:
|
|
359
|
else:
|
|
|
360
|
return '%d ' % rev
|
|
360
|
return '%d ' % rev
|
|
|
361
|
def formathex(h):
|
|
361
|
def formathex(h):
|
|
|
362
|
if h == wdirhex:
|
|
362
|
if h == wdirhex:
|
|
|
363
|
return '%s+' % shorthex(hex(ctx.p1().node()))
|
|
363
|
return '%s+' % shorthex(hex(ctx.p1().node()))
|
|
|
364
|
else:
|
|
364
|
else:
|
|
|
365
|
return '%s ' % shorthex(h)
|
|
365
|
return '%s ' % shorthex(h)
|
|
|
366
|
else:
|
|
366
|
else:
|
|
|
367
|
formatrev = b'%d'.__mod__
|
|
367
|
formatrev = b'%d'.__mod__
|
|
|
368
|
formathex = shorthex
|
|
368
|
formathex = shorthex
|
|
|
369
|
|
|
369
|
|
|
|
370
|
opmap = [
|
|
370
|
opmap = [
|
|
|
371
|
('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
|
|
371
|
('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
|
|
|
372
|
('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
|
|
372
|
('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
|
|
|
373
|
('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
|
|
373
|
('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
|
|
|
374
|
('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
|
|
374
|
('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
|
|
|
375
|
('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
|
|
375
|
('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
|
|
|
376
|
('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
|
|
376
|
('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
|
|
|
377
|
]
|
|
377
|
]
|
|
|
378
|
opnamemap = {
|
|
378
|
opnamemap = {
|
|
|
379
|
'rev': 'number',
|
|
379
|
'rev': 'number',
|
|
|
380
|
'node': 'changeset',
|
|
380
|
'node': 'changeset',
|
|
|
381
|
'path': 'file',
|
|
381
|
'path': 'file',
|
|
|
382
|
'lineno': 'line_number',
|
|
382
|
'lineno': 'line_number',
|
|
|
383
|
}
|
|
383
|
}
|
|
|
384
|
|
|
384
|
|
|
|
385
|
if rootfm.isplain():
|
|
385
|
if rootfm.isplain():
|
|
|
386
|
def makefunc(get, fmt):
|
|
386
|
def makefunc(get, fmt):
|
|
|
387
|
return lambda x: fmt(get(x))
|
|
387
|
return lambda x: fmt(get(x))
|
|
|
388
|
else:
|
|
388
|
else:
|
|
|
389
|
def makefunc(get, fmt):
|
|
389
|
def makefunc(get, fmt):
|
|
|
390
|
return get
|
|
390
|
return get
|
|
|
391
|
datahint = rootfm.datahint()
|
|
391
|
datahint = rootfm.datahint()
|
|
|
392
|
funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
|
|
392
|
funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
|
|
|
393
|
if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
|
|
393
|
if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
|
|
|
394
|
funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
|
|
394
|
funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
|
|
|
395
|
fields = ' '.join(fn for fn, sep, get, fmt in opmap
|
|
395
|
fields = ' '.join(fn for fn, sep, get, fmt in opmap
|
|
|
396
|
if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
|
|
396
|
if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
|
|
|
397
|
|
|
397
|
|
|
|
398
|
def bad(x, y):
|
|
398
|
def bad(x, y):
|
|
|
399
|
raise error.Abort("%s: %s" % (x, y))
|
|
399
|
raise error.Abort("%s: %s" % (x, y))
|
|
|
400
|
|
|
400
|
|
|
|
401
|
m = scmutil.match(ctx, pats, opts, badfn=bad)
|
|
401
|
m = scmutil.match(ctx, pats, opts, badfn=bad)
|
|
|
402
|
|
|
402
|
|
|
|
403
|
follow = not opts.get('no_follow')
|
|
403
|
follow = not opts.get('no_follow')
|
|
|
404
|
diffopts = patch.difffeatureopts(ui, opts, section='annotate',
|
|
404
|
diffopts = patch.difffeatureopts(ui, opts, section='annotate',
|
|
|
405
|
whitespace=True)
|
|
405
|
whitespace=True)
|
|
|
406
|
skiprevs = opts.get('skip')
|
|
406
|
skiprevs = opts.get('skip')
|
|
|
407
|
if skiprevs:
|
|
407
|
if skiprevs:
|
|
|
408
|
skiprevs = scmutil.revrange(repo, skiprevs)
|
|
408
|
skiprevs = scmutil.revrange(repo, skiprevs)
|
|
|
409
|
|
|
409
|
|
|
|
410
|
for abs in ctx.walk(m):
|
|
410
|
for abs in ctx.walk(m):
|
|
|
411
|
fctx = ctx[abs]
|
|
411
|
fctx = ctx[abs]
|
|
|
412
|
rootfm.startitem()
|
|
412
|
rootfm.startitem()
|
|
|
413
|
rootfm.data(path=abs)
|
|
413
|
rootfm.data(path=abs)
|
|
|
414
|
if not opts.get('text') and fctx.isbinary():
|
|
414
|
if not opts.get('text') and fctx.isbinary():
|
|
|
415
|
rootfm.plain(_("%s: binary file\n") % m.rel(abs))
|
|
415
|
rootfm.plain(_("%s: binary file\n") % m.rel(abs))
|
|
|
416
|
continue
|
|
416
|
continue
|
|
|
417
|
|
|
417
|
|
|
|
418
|
fm = rootfm.nested('lines', tmpl='{rev}: {line}')
|
|
418
|
fm = rootfm.nested('lines', tmpl='{rev}: {line}')
|
|
|
419
|
lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
|
|
419
|
lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
|
|
|
420
|
diffopts=diffopts)
|
|
420
|
diffopts=diffopts)
|
|
|
421
|
if not lines:
|
|
421
|
if not lines:
|
|
|
422
|
fm.end()
|
|
422
|
fm.end()
|
|
|
423
|
continue
|
|
423
|
continue
|
|
|
424
|
formats = []
|
|
424
|
formats = []
|
|
|
425
|
pieces = []
|
|
425
|
pieces = []
|
|
|
426
|
|
|
426
|
|
|
|
427
|
for f, sep in funcmap:
|
|
427
|
for f, sep in funcmap:
|
|
|
428
|
l = [f(n) for n in lines]
|
|
428
|
l = [f(n) for n in lines]
|
|
|
429
|
if fm.isplain():
|
|
429
|
if fm.isplain():
|
|
|
430
|
sizes = [encoding.colwidth(x) for x in l]
|
|
430
|
sizes = [encoding.colwidth(x) for x in l]
|
|
|
431
|
ml = max(sizes)
|
|
431
|
ml = max(sizes)
|
|
|
432
|
formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
|
|
432
|
formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
|
|
|
433
|
else:
|
|
433
|
else:
|
|
|
434
|
formats.append(['%s' for x in l])
|
|
434
|
formats.append(['%s' for x in l])
|
|
|
435
|
pieces.append(l)
|
|
435
|
pieces.append(l)
|
|
|
436
|
|
|
436
|
|
|
|
437
|
for f, p, n in zip(zip(*formats), zip(*pieces), lines):
|
|
437
|
for f, p, n in zip(zip(*formats), zip(*pieces), lines):
|
|
|
438
|
fm.startitem()
|
|
438
|
fm.startitem()
|
|
|
439
|
fm.context(fctx=n.fctx)
|
|
439
|
fm.context(fctx=n.fctx)
|
|
|
440
|
fm.write(fields, "".join(f), *p)
|
|
440
|
fm.write(fields, "".join(f), *p)
|
|
|
441
|
if n.skip:
|
|
441
|
if n.skip:
|
|
|
442
|
fmt = "* %s"
|
|
442
|
fmt = "* %s"
|
|
|
443
|
else:
|
|
443
|
else:
|
|
|
444
|
fmt = ": %s"
|
|
444
|
fmt = ": %s"
|
|
|
445
|
fm.write('line', fmt, n.text)
|
|
445
|
fm.write('line', fmt, n.text)
|
|
|
446
|
|
|
446
|
|
|
|
447
|
if not lines[-1].text.endswith('\n'):
|
|
447
|
if not lines[-1].text.endswith('\n'):
|
|
|
448
|
fm.plain('\n')
|
|
448
|
fm.plain('\n')
|
|
|
449
|
fm.end()
|
|
449
|
fm.end()
|
|
|
450
|
|
|
450
|
|
|
|
451
|
rootfm.end()
|
|
451
|
rootfm.end()
|
|
|
452
|
|
|
452
|
|
|
|
453
|
@command('archive',
|
|
453
|
@command('archive',
|
|
|
454
|
[('', 'no-decode', None, _('do not pass files through decoders')),
|
|
454
|
[('', 'no-decode', None, _('do not pass files through decoders')),
|
|
|
455
|
('p', 'prefix', '', _('directory prefix for files in archive'),
|
|
455
|
('p', 'prefix', '', _('directory prefix for files in archive'),
|
|
|
456
|
_('PREFIX')),
|
|
456
|
_('PREFIX')),
|
|
|
457
|
('r', 'rev', '', _('revision to distribute'), _('REV')),
|
|
457
|
('r', 'rev', '', _('revision to distribute'), _('REV')),
|
|
|
458
|
('t', 'type', '', _('type of distribution to create'), _('TYPE')),
|
|
458
|
('t', 'type', '', _('type of distribution to create'), _('TYPE')),
|
|
|
459
|
] + subrepoopts + walkopts,
|
|
459
|
] + subrepoopts + walkopts,
|
|
|
460
|
_('[OPTION]... DEST'),
|
|
460
|
_('[OPTION]... DEST'),
|
|
|
461
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
461
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
462
|
def archive(ui, repo, dest, **opts):
|
|
462
|
def archive(ui, repo, dest, **opts):
|
|
|
463
|
'''create an unversioned archive of a repository revision
|
|
463
|
'''create an unversioned archive of a repository revision
|
|
|
464
|
|
|
464
|
|
|
|
465
|
By default, the revision used is the parent of the working
|
|
465
|
By default, the revision used is the parent of the working
|
|
|
466
|
directory; use -r/--rev to specify a different revision.
|
|
466
|
directory; use -r/--rev to specify a different revision.
|
|
|
467
|
|
|
467
|
|
|
|
468
|
The archive type is automatically detected based on file
|
|
468
|
The archive type is automatically detected based on file
|
|
|
469
|
extension (to override, use -t/--type).
|
|
469
|
extension (to override, use -t/--type).
|
|
|
470
|
|
|
470
|
|
|
|
471
|
.. container:: verbose
|
|
471
|
.. container:: verbose
|
|
|
472
|
|
|
472
|
|
|
|
473
|
Examples:
|
|
473
|
Examples:
|
|
|
474
|
|
|
474
|
|
|
|
475
|
- create a zip file containing the 1.0 release::
|
|
475
|
- create a zip file containing the 1.0 release::
|
|
|
476
|
|
|
476
|
|
|
|
477
|
hg archive -r 1.0 project-1.0.zip
|
|
477
|
hg archive -r 1.0 project-1.0.zip
|
|
|
478
|
|
|
478
|
|
|
|
479
|
- create a tarball excluding .hg files::
|
|
479
|
- create a tarball excluding .hg files::
|
|
|
480
|
|
|
480
|
|
|
|
481
|
hg archive project.tar.gz -X ".hg*"
|
|
481
|
hg archive project.tar.gz -X ".hg*"
|
|
|
482
|
|
|
482
|
|
|
|
483
|
Valid types are:
|
|
483
|
Valid types are:
|
|
|
484
|
|
|
484
|
|
|
|
485
|
:``files``: a directory full of files (default)
|
|
485
|
:``files``: a directory full of files (default)
|
|
|
486
|
:``tar``: tar archive, uncompressed
|
|
486
|
:``tar``: tar archive, uncompressed
|
|
|
487
|
:``tbz2``: tar archive, compressed using bzip2
|
|
487
|
:``tbz2``: tar archive, compressed using bzip2
|
|
|
488
|
:``tgz``: tar archive, compressed using gzip
|
|
488
|
:``tgz``: tar archive, compressed using gzip
|
|
|
489
|
:``uzip``: zip archive, uncompressed
|
|
489
|
:``uzip``: zip archive, uncompressed
|
|
|
490
|
:``zip``: zip archive, compressed using deflate
|
|
490
|
:``zip``: zip archive, compressed using deflate
|
|
|
491
|
|
|
491
|
|
|
|
492
|
The exact name of the destination archive or directory is given
|
|
492
|
The exact name of the destination archive or directory is given
|
|
|
493
|
using a format string; see :hg:`help export` for details.
|
|
493
|
using a format string; see :hg:`help export` for details.
|
|
|
494
|
|
|
494
|
|
|
|
495
|
Each member added to an archive file has a directory prefix
|
|
495
|
Each member added to an archive file has a directory prefix
|
|
|
496
|
prepended. Use -p/--prefix to specify a format string for the
|
|
496
|
prepended. Use -p/--prefix to specify a format string for the
|
|
|
497
|
prefix. The default is the basename of the archive, with suffixes
|
|
497
|
prefix. The default is the basename of the archive, with suffixes
|
|
|
498
|
removed.
|
|
498
|
removed.
|
|
|
499
|
|
|
499
|
|
|
|
500
|
Returns 0 on success.
|
|
500
|
Returns 0 on success.
|
|
|
501
|
'''
|
|
501
|
'''
|
|
|
502
|
|
|
502
|
|
|
|
503
|
opts = pycompat.byteskwargs(opts)
|
|
503
|
opts = pycompat.byteskwargs(opts)
|
|
|
504
|
rev = opts.get('rev')
|
|
504
|
rev = opts.get('rev')
|
|
|
505
|
if rev:
|
|
505
|
if rev:
|
|
|
506
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
506
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
507
|
ctx = scmutil.revsingle(repo, rev)
|
|
507
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
508
|
if not ctx:
|
|
508
|
if not ctx:
|
|
|
509
|
raise error.Abort(_('no working directory: please specify a revision'))
|
|
509
|
raise error.Abort(_('no working directory: please specify a revision'))
|
|
|
510
|
node = ctx.node()
|
|
510
|
node = ctx.node()
|
|
|
511
|
dest = cmdutil.makefilename(ctx, dest)
|
|
511
|
dest = cmdutil.makefilename(ctx, dest)
|
|
|
512
|
if os.path.realpath(dest) == repo.root:
|
|
512
|
if os.path.realpath(dest) == repo.root:
|
|
|
513
|
raise error.Abort(_('repository root cannot be destination'))
|
|
513
|
raise error.Abort(_('repository root cannot be destination'))
|
|
|
514
|
|
|
514
|
|
|
|
515
|
kind = opts.get('type') or archival.guesskind(dest) or 'files'
|
|
515
|
kind = opts.get('type') or archival.guesskind(dest) or 'files'
|
|
|
516
|
prefix = opts.get('prefix')
|
|
516
|
prefix = opts.get('prefix')
|
|
|
517
|
|
|
517
|
|
|
|
518
|
if dest == '-':
|
|
518
|
if dest == '-':
|
|
|
519
|
if kind == 'files':
|
|
519
|
if kind == 'files':
|
|
|
520
|
raise error.Abort(_('cannot archive plain files to stdout'))
|
|
520
|
raise error.Abort(_('cannot archive plain files to stdout'))
|
|
|
521
|
dest = cmdutil.makefileobj(ctx, dest)
|
|
521
|
dest = cmdutil.makefileobj(ctx, dest)
|
|
|
522
|
if not prefix:
|
|
522
|
if not prefix:
|
|
|
523
|
prefix = os.path.basename(repo.root) + '-%h'
|
|
523
|
prefix = os.path.basename(repo.root) + '-%h'
|
|
|
524
|
|
|
524
|
|
|
|
525
|
prefix = cmdutil.makefilename(ctx, prefix)
|
|
525
|
prefix = cmdutil.makefilename(ctx, prefix)
|
|
|
526
|
match = scmutil.match(ctx, [], opts)
|
|
526
|
match = scmutil.match(ctx, [], opts)
|
|
|
527
|
archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
|
|
527
|
archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
|
|
|
528
|
match, prefix, subrepos=opts.get('subrepos'))
|
|
528
|
match, prefix, subrepos=opts.get('subrepos'))
|
|
|
529
|
|
|
529
|
|
|
|
530
|
@command('backout',
|
|
530
|
@command('backout',
|
|
|
531
|
[('', 'merge', None, _('merge with old dirstate parent after backout')),
|
|
531
|
[('', 'merge', None, _('merge with old dirstate parent after backout')),
|
|
|
532
|
('', 'commit', None,
|
|
532
|
('', 'commit', None,
|
|
|
533
|
_('commit if no conflicts were encountered (DEPRECATED)')),
|
|
533
|
_('commit if no conflicts were encountered (DEPRECATED)')),
|
|
|
534
|
('', 'no-commit', None, _('do not commit')),
|
|
534
|
('', 'no-commit', None, _('do not commit')),
|
|
|
535
|
('', 'parent', '',
|
|
535
|
('', 'parent', '',
|
|
|
536
|
_('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
|
|
536
|
_('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
|
|
|
537
|
('r', 'rev', '', _('revision to backout'), _('REV')),
|
|
537
|
('r', 'rev', '', _('revision to backout'), _('REV')),
|
|
|
538
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
538
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
|
539
|
] + mergetoolopts + walkopts + commitopts + commitopts2,
|
|
539
|
] + mergetoolopts + walkopts + commitopts + commitopts2,
|
|
|
540
|
_('[OPTION]... [-r] REV'),
|
|
540
|
_('[OPTION]... [-r] REV'),
|
|
|
541
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
|
|
541
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
|
|
|
542
|
def backout(ui, repo, node=None, rev=None, **opts):
|
|
542
|
def backout(ui, repo, node=None, rev=None, **opts):
|
|
|
543
|
'''reverse effect of earlier changeset
|
|
543
|
'''reverse effect of earlier changeset
|
|
|
544
|
|
|
544
|
|
|
|
545
|
Prepare a new changeset with the effect of REV undone in the
|
|
545
|
Prepare a new changeset with the effect of REV undone in the
|
|
|
546
|
current working directory. If no conflicts were encountered,
|
|
546
|
current working directory. If no conflicts were encountered,
|
|
|
547
|
it will be committed immediately.
|
|
547
|
it will be committed immediately.
|
|
|
548
|
|
|
548
|
|
|
|
549
|
If REV is the parent of the working directory, then this new changeset
|
|
549
|
If REV is the parent of the working directory, then this new changeset
|
|
|
550
|
is committed automatically (unless --no-commit is specified).
|
|
550
|
is committed automatically (unless --no-commit is specified).
|
|
|
551
|
|
|
551
|
|
|
|
552
|
.. note::
|
|
552
|
.. note::
|
|
|
553
|
|
|
553
|
|
|
|
554
|
:hg:`backout` cannot be used to fix either an unwanted or
|
|
554
|
:hg:`backout` cannot be used to fix either an unwanted or
|
|
|
555
|
incorrect merge.
|
|
555
|
incorrect merge.
|
|
|
556
|
|
|
556
|
|
|
|
557
|
.. container:: verbose
|
|
557
|
.. container:: verbose
|
|
|
558
|
|
|
558
|
|
|
|
559
|
Examples:
|
|
559
|
Examples:
|
|
|
560
|
|
|
560
|
|
|
|
561
|
- Reverse the effect of the parent of the working directory.
|
|
561
|
- Reverse the effect of the parent of the working directory.
|
|
|
562
|
This backout will be committed immediately::
|
|
562
|
This backout will be committed immediately::
|
|
|
563
|
|
|
563
|
|
|
|
564
|
hg backout -r .
|
|
564
|
hg backout -r .
|
|
|
565
|
|
|
565
|
|
|
|
566
|
- Reverse the effect of previous bad revision 23::
|
|
566
|
- Reverse the effect of previous bad revision 23::
|
|
|
567
|
|
|
567
|
|
|
|
568
|
hg backout -r 23
|
|
568
|
hg backout -r 23
|
|
|
569
|
|
|
569
|
|
|
|
570
|
- Reverse the effect of previous bad revision 23 and
|
|
570
|
- Reverse the effect of previous bad revision 23 and
|
|
|
571
|
leave changes uncommitted::
|
|
571
|
leave changes uncommitted::
|
|
|
572
|
|
|
572
|
|
|
|
573
|
hg backout -r 23 --no-commit
|
|
573
|
hg backout -r 23 --no-commit
|
|
|
574
|
hg commit -m "Backout revision 23"
|
|
574
|
hg commit -m "Backout revision 23"
|
|
|
575
|
|
|
575
|
|
|
|
576
|
By default, the pending changeset will have one parent,
|
|
576
|
By default, the pending changeset will have one parent,
|
|
|
577
|
maintaining a linear history. With --merge, the pending
|
|
577
|
maintaining a linear history. With --merge, the pending
|
|
|
578
|
changeset will instead have two parents: the old parent of the
|
|
578
|
changeset will instead have two parents: the old parent of the
|
|
|
579
|
working directory and a new child of REV that simply undoes REV.
|
|
579
|
working directory and a new child of REV that simply undoes REV.
|
|
|
580
|
|
|
580
|
|
|
|
581
|
Before version 1.7, the behavior without --merge was equivalent
|
|
581
|
Before version 1.7, the behavior without --merge was equivalent
|
|
|
582
|
to specifying --merge followed by :hg:`update --clean .` to
|
|
582
|
to specifying --merge followed by :hg:`update --clean .` to
|
|
|
583
|
cancel the merge and leave the child of REV as a head to be
|
|
583
|
cancel the merge and leave the child of REV as a head to be
|
|
|
584
|
merged separately.
|
|
584
|
merged separately.
|
|
|
585
|
|
|
585
|
|
|
|
586
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
586
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
587
|
|
|
587
|
|
|
|
588
|
See :hg:`help revert` for a way to restore files to the state
|
|
588
|
See :hg:`help revert` for a way to restore files to the state
|
|
|
589
|
of another revision.
|
|
589
|
of another revision.
|
|
|
590
|
|
|
590
|
|
|
|
591
|
Returns 0 on success, 1 if nothing to backout or there are unresolved
|
|
591
|
Returns 0 on success, 1 if nothing to backout or there are unresolved
|
|
|
592
|
files.
|
|
592
|
files.
|
|
|
593
|
'''
|
|
593
|
'''
|
|
|
594
|
with repo.wlock(), repo.lock():
|
|
594
|
with repo.wlock(), repo.lock():
|
|
|
595
|
return _dobackout(ui, repo, node, rev, **opts)
|
|
595
|
return _dobackout(ui, repo, node, rev, **opts)
|
|
|
596
|
|
|
596
|
|
|
|
597
|
def _dobackout(ui, repo, node=None, rev=None, **opts):
|
|
597
|
def _dobackout(ui, repo, node=None, rev=None, **opts):
|
|
|
598
|
opts = pycompat.byteskwargs(opts)
|
|
598
|
opts = pycompat.byteskwargs(opts)
|
|
|
599
|
if opts.get('commit') and opts.get('no_commit'):
|
|
599
|
if opts.get('commit') and opts.get('no_commit'):
|
|
|
600
|
raise error.Abort(_("cannot use --commit with --no-commit"))
|
|
600
|
raise error.Abort(_("cannot use --commit with --no-commit"))
|
|
|
601
|
if opts.get('merge') and opts.get('no_commit'):
|
|
601
|
if opts.get('merge') and opts.get('no_commit'):
|
|
|
602
|
raise error.Abort(_("cannot use --merge with --no-commit"))
|
|
602
|
raise error.Abort(_("cannot use --merge with --no-commit"))
|
|
|
603
|
|
|
603
|
|
|
|
604
|
if rev and node:
|
|
604
|
if rev and node:
|
|
|
605
|
raise error.Abort(_("please specify just one revision"))
|
|
605
|
raise error.Abort(_("please specify just one revision"))
|
|
|
606
|
|
|
606
|
|
|
|
607
|
if not rev:
|
|
607
|
if not rev:
|
|
|
608
|
rev = node
|
|
608
|
rev = node
|
|
|
609
|
|
|
609
|
|
|
|
610
|
if not rev:
|
|
610
|
if not rev:
|
|
|
611
|
raise error.Abort(_("please specify a revision to backout"))
|
|
611
|
raise error.Abort(_("please specify a revision to backout"))
|
|
|
612
|
|
|
612
|
|
|
|
613
|
date = opts.get('date')
|
|
613
|
date = opts.get('date')
|
|
|
614
|
if date:
|
|
614
|
if date:
|
|
|
615
|
opts['date'] = dateutil.parsedate(date)
|
|
615
|
opts['date'] = dateutil.parsedate(date)
|
|
|
616
|
|
|
616
|
|
|
|
617
|
cmdutil.checkunfinished(repo)
|
|
617
|
cmdutil.checkunfinished(repo)
|
|
|
618
|
cmdutil.bailifchanged(repo)
|
|
618
|
cmdutil.bailifchanged(repo)
|
|
|
619
|
node = scmutil.revsingle(repo, rev).node()
|
|
619
|
node = scmutil.revsingle(repo, rev).node()
|
|
|
620
|
|
|
620
|
|
|
|
621
|
op1, op2 = repo.dirstate.parents()
|
|
621
|
op1, op2 = repo.dirstate.parents()
|
|
|
622
|
if not repo.changelog.isancestor(node, op1):
|
|
622
|
if not repo.changelog.isancestor(node, op1):
|
|
|
623
|
raise error.Abort(_('cannot backout change that is not an ancestor'))
|
|
623
|
raise error.Abort(_('cannot backout change that is not an ancestor'))
|
|
|
624
|
|
|
624
|
|
|
|
625
|
p1, p2 = repo.changelog.parents(node)
|
|
625
|
p1, p2 = repo.changelog.parents(node)
|
|
|
626
|
if p1 == nullid:
|
|
626
|
if p1 == nullid:
|
|
|
627
|
raise error.Abort(_('cannot backout a change with no parents'))
|
|
627
|
raise error.Abort(_('cannot backout a change with no parents'))
|
|
|
628
|
if p2 != nullid:
|
|
628
|
if p2 != nullid:
|
|
|
629
|
if not opts.get('parent'):
|
|
629
|
if not opts.get('parent'):
|
|
|
630
|
raise error.Abort(_('cannot backout a merge changeset'))
|
|
630
|
raise error.Abort(_('cannot backout a merge changeset'))
|
|
|
631
|
p = repo.lookup(opts['parent'])
|
|
631
|
p = repo.lookup(opts['parent'])
|
|
|
632
|
if p not in (p1, p2):
|
|
632
|
if p not in (p1, p2):
|
|
|
633
|
raise error.Abort(_('%s is not a parent of %s') %
|
|
633
|
raise error.Abort(_('%s is not a parent of %s') %
|
|
|
634
|
(short(p), short(node)))
|
|
634
|
(short(p), short(node)))
|
|
|
635
|
parent = p
|
|
635
|
parent = p
|
|
|
636
|
else:
|
|
636
|
else:
|
|
|
637
|
if opts.get('parent'):
|
|
637
|
if opts.get('parent'):
|
|
|
638
|
raise error.Abort(_('cannot use --parent on non-merge changeset'))
|
|
638
|
raise error.Abort(_('cannot use --parent on non-merge changeset'))
|
|
|
639
|
parent = p1
|
|
639
|
parent = p1
|
|
|
640
|
|
|
640
|
|
|
|
641
|
# the backout should appear on the same branch
|
|
641
|
# the backout should appear on the same branch
|
|
|
642
|
branch = repo.dirstate.branch()
|
|
642
|
branch = repo.dirstate.branch()
|
|
|
643
|
bheads = repo.branchheads(branch)
|
|
643
|
bheads = repo.branchheads(branch)
|
|
|
644
|
rctx = scmutil.revsingle(repo, hex(parent))
|
|
644
|
rctx = scmutil.revsingle(repo, hex(parent))
|
|
|
645
|
if not opts.get('merge') and op1 != node:
|
|
645
|
if not opts.get('merge') and op1 != node:
|
|
|
646
|
with dirstateguard.dirstateguard(repo, 'backout'):
|
|
646
|
with dirstateguard.dirstateguard(repo, 'backout'):
|
|
|
647
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
647
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
648
|
with ui.configoverride(overrides, 'backout'):
|
|
648
|
with ui.configoverride(overrides, 'backout'):
|
|
|
649
|
stats = mergemod.update(repo, parent, branchmerge=True,
|
|
649
|
stats = mergemod.update(repo, parent, branchmerge=True,
|
|
|
650
|
force=True, ancestor=node,
|
|
650
|
force=True, ancestor=node,
|
|
|
651
|
mergeancestor=False)
|
|
651
|
mergeancestor=False)
|
|
|
652
|
repo.setparents(op1, op2)
|
|
652
|
repo.setparents(op1, op2)
|
|
|
653
|
hg._showstats(repo, stats)
|
|
653
|
hg._showstats(repo, stats)
|
|
|
654
|
if stats.unresolvedcount:
|
|
654
|
if stats.unresolvedcount:
|
|
|
655
|
repo.ui.status(_("use 'hg resolve' to retry unresolved "
|
|
655
|
repo.ui.status(_("use 'hg resolve' to retry unresolved "
|
|
|
656
|
"file merges\n"))
|
|
656
|
"file merges\n"))
|
|
|
657
|
return 1
|
|
657
|
return 1
|
|
|
658
|
else:
|
|
658
|
else:
|
|
|
659
|
hg.clean(repo, node, show_stats=False)
|
|
659
|
hg.clean(repo, node, show_stats=False)
|
|
|
660
|
repo.dirstate.setbranch(branch)
|
|
660
|
repo.dirstate.setbranch(branch)
|
|
|
661
|
cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
|
|
661
|
cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
|
|
|
662
|
|
|
662
|
|
|
|
663
|
if opts.get('no_commit'):
|
|
663
|
if opts.get('no_commit'):
|
|
|
664
|
msg = _("changeset %s backed out, "
|
|
664
|
msg = _("changeset %s backed out, "
|
|
|
665
|
"don't forget to commit.\n")
|
|
665
|
"don't forget to commit.\n")
|
|
|
666
|
ui.status(msg % short(node))
|
|
666
|
ui.status(msg % short(node))
|
|
|
667
|
return 0
|
|
667
|
return 0
|
|
|
668
|
|
|
668
|
|
|
|
669
|
def commitfunc(ui, repo, message, match, opts):
|
|
669
|
def commitfunc(ui, repo, message, match, opts):
|
|
|
670
|
editform = 'backout'
|
|
670
|
editform = 'backout'
|
|
|
671
|
e = cmdutil.getcommiteditor(editform=editform,
|
|
671
|
e = cmdutil.getcommiteditor(editform=editform,
|
|
|
672
|
**pycompat.strkwargs(opts))
|
|
672
|
**pycompat.strkwargs(opts))
|
|
|
673
|
if not message:
|
|
673
|
if not message:
|
|
|
674
|
# we don't translate commit messages
|
|
674
|
# we don't translate commit messages
|
|
|
675
|
message = "Backed out changeset %s" % short(node)
|
|
675
|
message = "Backed out changeset %s" % short(node)
|
|
|
676
|
e = cmdutil.getcommiteditor(edit=True, editform=editform)
|
|
676
|
e = cmdutil.getcommiteditor(edit=True, editform=editform)
|
|
|
677
|
return repo.commit(message, opts.get('user'), opts.get('date'),
|
|
677
|
return repo.commit(message, opts.get('user'), opts.get('date'),
|
|
|
678
|
match, editor=e)
|
|
678
|
match, editor=e)
|
|
|
679
|
newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
|
|
679
|
newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
|
|
|
680
|
if not newnode:
|
|
680
|
if not newnode:
|
|
|
681
|
ui.status(_("nothing changed\n"))
|
|
681
|
ui.status(_("nothing changed\n"))
|
|
|
682
|
return 1
|
|
682
|
return 1
|
|
|
683
|
cmdutil.commitstatus(repo, newnode, branch, bheads)
|
|
683
|
cmdutil.commitstatus(repo, newnode, branch, bheads)
|
|
|
684
|
|
|
684
|
|
|
|
685
|
def nice(node):
|
|
685
|
def nice(node):
|
|
|
686
|
return '%d:%s' % (repo.changelog.rev(node), short(node))
|
|
686
|
return '%d:%s' % (repo.changelog.rev(node), short(node))
|
|
|
687
|
ui.status(_('changeset %s backs out changeset %s\n') %
|
|
687
|
ui.status(_('changeset %s backs out changeset %s\n') %
|
|
|
688
|
(nice(repo.changelog.tip()), nice(node)))
|
|
688
|
(nice(repo.changelog.tip()), nice(node)))
|
|
|
689
|
if opts.get('merge') and op1 != node:
|
|
689
|
if opts.get('merge') and op1 != node:
|
|
|
690
|
hg.clean(repo, op1, show_stats=False)
|
|
690
|
hg.clean(repo, op1, show_stats=False)
|
|
|
691
|
ui.status(_('merging with changeset %s\n')
|
|
691
|
ui.status(_('merging with changeset %s\n')
|
|
|
692
|
% nice(repo.changelog.tip()))
|
|
692
|
% nice(repo.changelog.tip()))
|
|
|
693
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
693
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
694
|
with ui.configoverride(overrides, 'backout'):
|
|
694
|
with ui.configoverride(overrides, 'backout'):
|
|
|
695
|
return hg.merge(repo, hex(repo.changelog.tip()))
|
|
695
|
return hg.merge(repo, hex(repo.changelog.tip()))
|
|
|
696
|
return 0
|
|
696
|
return 0
|
|
|
697
|
|
|
697
|
|
|
|
698
|
@command('bisect',
|
|
698
|
@command('bisect',
|
|
|
699
|
[('r', 'reset', False, _('reset bisect state')),
|
|
699
|
[('r', 'reset', False, _('reset bisect state')),
|
|
|
700
|
('g', 'good', False, _('mark changeset good')),
|
|
700
|
('g', 'good', False, _('mark changeset good')),
|
|
|
701
|
('b', 'bad', False, _('mark changeset bad')),
|
|
701
|
('b', 'bad', False, _('mark changeset bad')),
|
|
|
702
|
('s', 'skip', False, _('skip testing changeset')),
|
|
702
|
('s', 'skip', False, _('skip testing changeset')),
|
|
|
703
|
('e', 'extend', False, _('extend the bisect range')),
|
|
703
|
('e', 'extend', False, _('extend the bisect range')),
|
|
|
704
|
('c', 'command', '', _('use command to check changeset state'), _('CMD')),
|
|
704
|
('c', 'command', '', _('use command to check changeset state'), _('CMD')),
|
|
|
705
|
('U', 'noupdate', False, _('do not update to target'))],
|
|
705
|
('U', 'noupdate', False, _('do not update to target'))],
|
|
|
706
|
_("[-gbsr] [-U] [-c CMD] [REV]"),
|
|
706
|
_("[-gbsr] [-U] [-c CMD] [REV]"),
|
|
|
707
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
|
|
707
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
|
|
|
708
|
def bisect(ui, repo, rev=None, extra=None, command=None,
|
|
708
|
def bisect(ui, repo, rev=None, extra=None, command=None,
|
|
|
709
|
reset=None, good=None, bad=None, skip=None, extend=None,
|
|
709
|
reset=None, good=None, bad=None, skip=None, extend=None,
|
|
|
710
|
noupdate=None):
|
|
710
|
noupdate=None):
|
|
|
711
|
"""subdivision search of changesets
|
|
711
|
"""subdivision search of changesets
|
|
|
712
|
|
|
712
|
|
|
|
713
|
This command helps to find changesets which introduce problems. To
|
|
713
|
This command helps to find changesets which introduce problems. To
|
|
|
714
|
use, mark the earliest changeset you know exhibits the problem as
|
|
714
|
use, mark the earliest changeset you know exhibits the problem as
|
|
|
715
|
bad, then mark the latest changeset which is free from the problem
|
|
715
|
bad, then mark the latest changeset which is free from the problem
|
|
|
716
|
as good. Bisect will update your working directory to a revision
|
|
716
|
as good. Bisect will update your working directory to a revision
|
|
|
717
|
for testing (unless the -U/--noupdate option is specified). Once
|
|
717
|
for testing (unless the -U/--noupdate option is specified). Once
|
|
|
718
|
you have performed tests, mark the working directory as good or
|
|
718
|
you have performed tests, mark the working directory as good or
|
|
|
719
|
bad, and bisect will either update to another candidate changeset
|
|
719
|
bad, and bisect will either update to another candidate changeset
|
|
|
720
|
or announce that it has found the bad revision.
|
|
720
|
or announce that it has found the bad revision.
|
|
|
721
|
|
|
721
|
|
|
|
722
|
As a shortcut, you can also use the revision argument to mark a
|
|
722
|
As a shortcut, you can also use the revision argument to mark a
|
|
|
723
|
revision as good or bad without checking it out first.
|
|
723
|
revision as good or bad without checking it out first.
|
|
|
724
|
|
|
724
|
|
|
|
725
|
If you supply a command, it will be used for automatic bisection.
|
|
725
|
If you supply a command, it will be used for automatic bisection.
|
|
|
726
|
The environment variable HG_NODE will contain the ID of the
|
|
726
|
The environment variable HG_NODE will contain the ID of the
|
|
|
727
|
changeset being tested. The exit status of the command will be
|
|
727
|
changeset being tested. The exit status of the command will be
|
|
|
728
|
used to mark revisions as good or bad: status 0 means good, 125
|
|
728
|
used to mark revisions as good or bad: status 0 means good, 125
|
|
|
729
|
means to skip the revision, 127 (command not found) will abort the
|
|
729
|
means to skip the revision, 127 (command not found) will abort the
|
|
|
730
|
bisection, and any other non-zero exit status means the revision
|
|
730
|
bisection, and any other non-zero exit status means the revision
|
|
|
731
|
is bad.
|
|
731
|
is bad.
|
|
|
732
|
|
|
732
|
|
|
|
733
|
.. container:: verbose
|
|
733
|
.. container:: verbose
|
|
|
734
|
|
|
734
|
|
|
|
735
|
Some examples:
|
|
735
|
Some examples:
|
|
|
736
|
|
|
736
|
|
|
|
737
|
- start a bisection with known bad revision 34, and good revision 12::
|
|
737
|
- start a bisection with known bad revision 34, and good revision 12::
|
|
|
738
|
|
|
738
|
|
|
|
739
|
hg bisect --bad 34
|
|
739
|
hg bisect --bad 34
|
|
|
740
|
hg bisect --good 12
|
|
740
|
hg bisect --good 12
|
|
|
741
|
|
|
741
|
|
|
|
742
|
- advance the current bisection by marking current revision as good or
|
|
742
|
- advance the current bisection by marking current revision as good or
|
|
|
743
|
bad::
|
|
743
|
bad::
|
|
|
744
|
|
|
744
|
|
|
|
745
|
hg bisect --good
|
|
745
|
hg bisect --good
|
|
|
746
|
hg bisect --bad
|
|
746
|
hg bisect --bad
|
|
|
747
|
|
|
747
|
|
|
|
748
|
- mark the current revision, or a known revision, to be skipped (e.g. if
|
|
748
|
- mark the current revision, or a known revision, to be skipped (e.g. if
|
|
|
749
|
that revision is not usable because of another issue)::
|
|
749
|
that revision is not usable because of another issue)::
|
|
|
750
|
|
|
750
|
|
|
|
751
|
hg bisect --skip
|
|
751
|
hg bisect --skip
|
|
|
752
|
hg bisect --skip 23
|
|
752
|
hg bisect --skip 23
|
|
|
753
|
|
|
753
|
|
|
|
754
|
- skip all revisions that do not touch directories ``foo`` or ``bar``::
|
|
754
|
- skip all revisions that do not touch directories ``foo`` or ``bar``::
|
|
|
755
|
|
|
755
|
|
|
|
756
|
hg bisect --skip "!( file('path:foo') & file('path:bar') )"
|
|
756
|
hg bisect --skip "!( file('path:foo') & file('path:bar') )"
|
|
|
757
|
|
|
757
|
|
|
|
758
|
- forget the current bisection::
|
|
758
|
- forget the current bisection::
|
|
|
759
|
|
|
759
|
|
|
|
760
|
hg bisect --reset
|
|
760
|
hg bisect --reset
|
|
|
761
|
|
|
761
|
|
|
|
762
|
- use 'make && make tests' to automatically find the first broken
|
|
762
|
- use 'make && make tests' to automatically find the first broken
|
|
|
763
|
revision::
|
|
763
|
revision::
|
|
|
764
|
|
|
764
|
|
|
|
765
|
hg bisect --reset
|
|
765
|
hg bisect --reset
|
|
|
766
|
hg bisect --bad 34
|
|
766
|
hg bisect --bad 34
|
|
|
767
|
hg bisect --good 12
|
|
767
|
hg bisect --good 12
|
|
|
768
|
hg bisect --command "make && make tests"
|
|
768
|
hg bisect --command "make && make tests"
|
|
|
769
|
|
|
769
|
|
|
|
770
|
- see all changesets whose states are already known in the current
|
|
770
|
- see all changesets whose states are already known in the current
|
|
|
771
|
bisection::
|
|
771
|
bisection::
|
|
|
772
|
|
|
772
|
|
|
|
773
|
hg log -r "bisect(pruned)"
|
|
773
|
hg log -r "bisect(pruned)"
|
|
|
774
|
|
|
774
|
|
|
|
775
|
- see the changeset currently being bisected (especially useful
|
|
775
|
- see the changeset currently being bisected (especially useful
|
|
|
776
|
if running with -U/--noupdate)::
|
|
776
|
if running with -U/--noupdate)::
|
|
|
777
|
|
|
777
|
|
|
|
778
|
hg log -r "bisect(current)"
|
|
778
|
hg log -r "bisect(current)"
|
|
|
779
|
|
|
779
|
|
|
|
780
|
- see all changesets that took part in the current bisection::
|
|
780
|
- see all changesets that took part in the current bisection::
|
|
|
781
|
|
|
781
|
|
|
|
782
|
hg log -r "bisect(range)"
|
|
782
|
hg log -r "bisect(range)"
|
|
|
783
|
|
|
783
|
|
|
|
784
|
- you can even get a nice graph::
|
|
784
|
- you can even get a nice graph::
|
|
|
785
|
|
|
785
|
|
|
|
786
|
hg log --graph -r "bisect(range)"
|
|
786
|
hg log --graph -r "bisect(range)"
|
|
|
787
|
|
|
787
|
|
|
|
788
|
See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
|
|
788
|
See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
|
|
|
789
|
|
|
789
|
|
|
|
790
|
Returns 0 on success.
|
|
790
|
Returns 0 on success.
|
|
|
791
|
"""
|
|
791
|
"""
|
|
|
792
|
# backward compatibility
|
|
792
|
# backward compatibility
|
|
|
793
|
if rev in "good bad reset init".split():
|
|
793
|
if rev in "good bad reset init".split():
|
|
|
794
|
ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
|
|
794
|
ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
|
|
|
795
|
cmd, rev, extra = rev, extra, None
|
|
795
|
cmd, rev, extra = rev, extra, None
|
|
|
796
|
if cmd == "good":
|
|
796
|
if cmd == "good":
|
|
|
797
|
good = True
|
|
797
|
good = True
|
|
|
798
|
elif cmd == "bad":
|
|
798
|
elif cmd == "bad":
|
|
|
799
|
bad = True
|
|
799
|
bad = True
|
|
|
800
|
else:
|
|
800
|
else:
|
|
|
801
|
reset = True
|
|
801
|
reset = True
|
|
|
802
|
elif extra:
|
|
802
|
elif extra:
|
|
|
803
|
raise error.Abort(_('incompatible arguments'))
|
|
803
|
raise error.Abort(_('incompatible arguments'))
|
|
|
804
|
|
|
804
|
|
|
|
805
|
incompatibles = {
|
|
805
|
incompatibles = {
|
|
|
806
|
'--bad': bad,
|
|
806
|
'--bad': bad,
|
|
|
807
|
'--command': bool(command),
|
|
807
|
'--command': bool(command),
|
|
|
808
|
'--extend': extend,
|
|
808
|
'--extend': extend,
|
|
|
809
|
'--good': good,
|
|
809
|
'--good': good,
|
|
|
810
|
'--reset': reset,
|
|
810
|
'--reset': reset,
|
|
|
811
|
'--skip': skip,
|
|
811
|
'--skip': skip,
|
|
|
812
|
}
|
|
812
|
}
|
|
|
813
|
|
|
813
|
|
|
|
814
|
enabled = [x for x in incompatibles if incompatibles[x]]
|
|
814
|
enabled = [x for x in incompatibles if incompatibles[x]]
|
|
|
815
|
|
|
815
|
|
|
|
816
|
if len(enabled) > 1:
|
|
816
|
if len(enabled) > 1:
|
|
|
817
|
raise error.Abort(_('%s and %s are incompatible') %
|
|
817
|
raise error.Abort(_('%s and %s are incompatible') %
|
|
|
818
|
tuple(sorted(enabled)[0:2]))
|
|
818
|
tuple(sorted(enabled)[0:2]))
|
|
|
819
|
|
|
819
|
|
|
|
820
|
if reset:
|
|
820
|
if reset:
|
|
|
821
|
hbisect.resetstate(repo)
|
|
821
|
hbisect.resetstate(repo)
|
|
|
822
|
return
|
|
822
|
return
|
|
|
823
|
|
|
823
|
|
|
|
824
|
state = hbisect.load_state(repo)
|
|
824
|
state = hbisect.load_state(repo)
|
|
|
825
|
|
|
825
|
|
|
|
826
|
# update state
|
|
826
|
# update state
|
|
|
827
|
if good or bad or skip:
|
|
827
|
if good or bad or skip:
|
|
|
828
|
if rev:
|
|
828
|
if rev:
|
|
|
829
|
nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
|
|
829
|
nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
|
|
|
830
|
else:
|
|
830
|
else:
|
|
|
831
|
nodes = [repo.lookup('.')]
|
|
831
|
nodes = [repo.lookup('.')]
|
|
|
832
|
if good:
|
|
832
|
if good:
|
|
|
833
|
state['good'] += nodes
|
|
833
|
state['good'] += nodes
|
|
|
834
|
elif bad:
|
|
834
|
elif bad:
|
|
|
835
|
state['bad'] += nodes
|
|
835
|
state['bad'] += nodes
|
|
|
836
|
elif skip:
|
|
836
|
elif skip:
|
|
|
837
|
state['skip'] += nodes
|
|
837
|
state['skip'] += nodes
|
|
|
838
|
hbisect.save_state(repo, state)
|
|
838
|
hbisect.save_state(repo, state)
|
|
|
839
|
if not (state['good'] and state['bad']):
|
|
839
|
if not (state['good'] and state['bad']):
|
|
|
840
|
return
|
|
840
|
return
|
|
|
841
|
|
|
841
|
|
|
|
842
|
def mayupdate(repo, node, show_stats=True):
|
|
842
|
def mayupdate(repo, node, show_stats=True):
|
|
|
843
|
"""common used update sequence"""
|
|
843
|
"""common used update sequence"""
|
|
|
844
|
if noupdate:
|
|
844
|
if noupdate:
|
|
|
845
|
return
|
|
845
|
return
|
|
|
846
|
cmdutil.checkunfinished(repo)
|
|
846
|
cmdutil.checkunfinished(repo)
|
|
|
847
|
cmdutil.bailifchanged(repo)
|
|
847
|
cmdutil.bailifchanged(repo)
|
|
|
848
|
return hg.clean(repo, node, show_stats=show_stats)
|
|
848
|
return hg.clean(repo, node, show_stats=show_stats)
|
|
|
849
|
|
|
849
|
|
|
|
850
|
displayer = logcmdutil.changesetdisplayer(ui, repo, {})
|
|
850
|
displayer = logcmdutil.changesetdisplayer(ui, repo, {})
|
|
|
851
|
|
|
851
|
|
|
|
852
|
if command:
|
|
852
|
if command:
|
|
|
853
|
changesets = 1
|
|
853
|
changesets = 1
|
|
|
854
|
if noupdate:
|
|
854
|
if noupdate:
|
|
|
855
|
try:
|
|
855
|
try:
|
|
|
856
|
node = state['current'][0]
|
|
856
|
node = state['current'][0]
|
|
|
857
|
except LookupError:
|
|
857
|
except LookupError:
|
|
|
858
|
raise error.Abort(_('current bisect revision is unknown - '
|
|
858
|
raise error.Abort(_('current bisect revision is unknown - '
|
|
|
859
|
'start a new bisect to fix'))
|
|
859
|
'start a new bisect to fix'))
|
|
|
860
|
else:
|
|
860
|
else:
|
|
|
861
|
node, p2 = repo.dirstate.parents()
|
|
861
|
node, p2 = repo.dirstate.parents()
|
|
|
862
|
if p2 != nullid:
|
|
862
|
if p2 != nullid:
|
|
|
863
|
raise error.Abort(_('current bisect revision is a merge'))
|
|
863
|
raise error.Abort(_('current bisect revision is a merge'))
|
|
|
864
|
if rev:
|
|
864
|
if rev:
|
|
|
865
|
node = repo[scmutil.revsingle(repo, rev, node)].node()
|
|
865
|
node = repo[scmutil.revsingle(repo, rev, node)].node()
|
|
|
866
|
try:
|
|
866
|
try:
|
|
|
867
|
while changesets:
|
|
867
|
while changesets:
|
|
|
868
|
# update state
|
|
868
|
# update state
|
|
|
869
|
state['current'] = [node]
|
|
869
|
state['current'] = [node]
|
|
|
870
|
hbisect.save_state(repo, state)
|
|
870
|
hbisect.save_state(repo, state)
|
|
|
871
|
status = ui.system(command, environ={'HG_NODE': hex(node)},
|
|
871
|
status = ui.system(command, environ={'HG_NODE': hex(node)},
|
|
|
872
|
blockedtag='bisect_check')
|
|
872
|
blockedtag='bisect_check')
|
|
|
873
|
if status == 125:
|
|
873
|
if status == 125:
|
|
|
874
|
transition = "skip"
|
|
874
|
transition = "skip"
|
|
|
875
|
elif status == 0:
|
|
875
|
elif status == 0:
|
|
|
876
|
transition = "good"
|
|
876
|
transition = "good"
|
|
|
877
|
# status < 0 means process was killed
|
|
877
|
# status < 0 means process was killed
|
|
|
878
|
elif status == 127:
|
|
878
|
elif status == 127:
|
|
|
879
|
raise error.Abort(_("failed to execute %s") % command)
|
|
879
|
raise error.Abort(_("failed to execute %s") % command)
|
|
|
880
|
elif status < 0:
|
|
880
|
elif status < 0:
|
|
|
881
|
raise error.Abort(_("%s killed") % command)
|
|
881
|
raise error.Abort(_("%s killed") % command)
|
|
|
882
|
else:
|
|
882
|
else:
|
|
|
883
|
transition = "bad"
|
|
883
|
transition = "bad"
|
|
|
884
|
state[transition].append(node)
|
|
884
|
state[transition].append(node)
|
|
|
885
|
ctx = repo[node]
|
|
885
|
ctx = repo[node]
|
|
|
886
|
ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
|
|
886
|
ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
|
|
|
887
|
transition))
|
|
887
|
transition))
|
|
|
888
|
hbisect.checkstate(state)
|
|
888
|
hbisect.checkstate(state)
|
|
|
889
|
# bisect
|
|
889
|
# bisect
|
|
|
890
|
nodes, changesets, bgood = hbisect.bisect(repo, state)
|
|
890
|
nodes, changesets, bgood = hbisect.bisect(repo, state)
|
|
|
891
|
# update to next check
|
|
891
|
# update to next check
|
|
|
892
|
node = nodes[0]
|
|
892
|
node = nodes[0]
|
|
|
893
|
mayupdate(repo, node, show_stats=False)
|
|
893
|
mayupdate(repo, node, show_stats=False)
|
|
|
894
|
finally:
|
|
894
|
finally:
|
|
|
895
|
state['current'] = [node]
|
|
895
|
state['current'] = [node]
|
|
|
896
|
hbisect.save_state(repo, state)
|
|
896
|
hbisect.save_state(repo, state)
|
|
|
897
|
hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
|
|
897
|
hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
|
|
|
898
|
return
|
|
898
|
return
|
|
|
899
|
|
|
899
|
|
|
|
900
|
hbisect.checkstate(state)
|
|
900
|
hbisect.checkstate(state)
|
|
|
901
|
|
|
901
|
|
|
|
902
|
# actually bisect
|
|
902
|
# actually bisect
|
|
|
903
|
nodes, changesets, good = hbisect.bisect(repo, state)
|
|
903
|
nodes, changesets, good = hbisect.bisect(repo, state)
|
|
|
904
|
if extend:
|
|
904
|
if extend:
|
|
|
905
|
if not changesets:
|
|
905
|
if not changesets:
|
|
|
906
|
extendnode = hbisect.extendrange(repo, state, nodes, good)
|
|
906
|
extendnode = hbisect.extendrange(repo, state, nodes, good)
|
|
|
907
|
if extendnode is not None:
|
|
907
|
if extendnode is not None:
|
|
|
908
|
ui.write(_("Extending search to changeset %d:%s\n")
|
|
908
|
ui.write(_("Extending search to changeset %d:%s\n")
|
|
|
909
|
% (extendnode.rev(), extendnode))
|
|
909
|
% (extendnode.rev(), extendnode))
|
|
|
910
|
state['current'] = [extendnode.node()]
|
|
910
|
state['current'] = [extendnode.node()]
|
|
|
911
|
hbisect.save_state(repo, state)
|
|
911
|
hbisect.save_state(repo, state)
|
|
|
912
|
return mayupdate(repo, extendnode.node())
|
|
912
|
return mayupdate(repo, extendnode.node())
|
|
|
913
|
raise error.Abort(_("nothing to extend"))
|
|
913
|
raise error.Abort(_("nothing to extend"))
|
|
|
914
|
|
|
914
|
|
|
|
915
|
if changesets == 0:
|
|
915
|
if changesets == 0:
|
|
|
916
|
hbisect.printresult(ui, repo, state, displayer, nodes, good)
|
|
916
|
hbisect.printresult(ui, repo, state, displayer, nodes, good)
|
|
|
917
|
else:
|
|
917
|
else:
|
|
|
918
|
assert len(nodes) == 1 # only a single node can be tested next
|
|
918
|
assert len(nodes) == 1 # only a single node can be tested next
|
|
|
919
|
node = nodes[0]
|
|
919
|
node = nodes[0]
|
|
|
920
|
# compute the approximate number of remaining tests
|
|
920
|
# compute the approximate number of remaining tests
|
|
|
921
|
tests, size = 0, 2
|
|
921
|
tests, size = 0, 2
|
|
|
922
|
while size <= changesets:
|
|
922
|
while size <= changesets:
|
|
|
923
|
tests, size = tests + 1, size * 2
|
|
923
|
tests, size = tests + 1, size * 2
|
|
|
924
|
rev = repo.changelog.rev(node)
|
|
924
|
rev = repo.changelog.rev(node)
|
|
|
925
|
ui.write(_("Testing changeset %d:%s "
|
|
925
|
ui.write(_("Testing changeset %d:%s "
|
|
|
926
|
"(%d changesets remaining, ~%d tests)\n")
|
|
926
|
"(%d changesets remaining, ~%d tests)\n")
|
|
|
927
|
% (rev, short(node), changesets, tests))
|
|
927
|
% (rev, short(node), changesets, tests))
|
|
|
928
|
state['current'] = [node]
|
|
928
|
state['current'] = [node]
|
|
|
929
|
hbisect.save_state(repo, state)
|
|
929
|
hbisect.save_state(repo, state)
|
|
|
930
|
return mayupdate(repo, node)
|
|
930
|
return mayupdate(repo, node)
|
|
|
931
|
|
|
931
|
|
|
|
932
|
@command('bookmarks|bookmark',
|
|
932
|
@command('bookmarks|bookmark',
|
|
|
933
|
[('f', 'force', False, _('force')),
|
|
933
|
[('f', 'force', False, _('force')),
|
|
|
934
|
('r', 'rev', '', _('revision for bookmark action'), _('REV')),
|
|
934
|
('r', 'rev', '', _('revision for bookmark action'), _('REV')),
|
|
|
935
|
('d', 'delete', False, _('delete a given bookmark')),
|
|
935
|
('d', 'delete', False, _('delete a given bookmark')),
|
|
|
936
|
('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
|
|
936
|
('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
|
|
|
937
|
('i', 'inactive', False, _('mark a bookmark inactive')),
|
|
937
|
('i', 'inactive', False, _('mark a bookmark inactive')),
|
|
|
938
|
('l', 'list', False, _('list existing bookmarks')),
|
|
938
|
('l', 'list', False, _('list existing bookmarks')),
|
|
|
939
|
] + formatteropts,
|
|
939
|
] + formatteropts,
|
|
|
940
|
_('hg bookmarks [OPTIONS]... [NAME]...'),
|
|
940
|
_('hg bookmarks [OPTIONS]... [NAME]...'),
|
|
|
941
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
941
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
942
|
def bookmark(ui, repo, *names, **opts):
|
|
942
|
def bookmark(ui, repo, *names, **opts):
|
|
|
943
|
'''create a new bookmark or list existing bookmarks
|
|
943
|
'''create a new bookmark or list existing bookmarks
|
|
|
944
|
|
|
944
|
|
|
|
945
|
Bookmarks are labels on changesets to help track lines of development.
|
|
945
|
Bookmarks are labels on changesets to help track lines of development.
|
|
|
946
|
Bookmarks are unversioned and can be moved, renamed and deleted.
|
|
946
|
Bookmarks are unversioned and can be moved, renamed and deleted.
|
|
|
947
|
Deleting or moving a bookmark has no effect on the associated changesets.
|
|
947
|
Deleting or moving a bookmark has no effect on the associated changesets.
|
|
|
948
|
|
|
948
|
|
|
|
949
|
Creating or updating to a bookmark causes it to be marked as 'active'.
|
|
949
|
Creating or updating to a bookmark causes it to be marked as 'active'.
|
|
|
950
|
The active bookmark is indicated with a '*'.
|
|
950
|
The active bookmark is indicated with a '*'.
|
|
|
951
|
When a commit is made, the active bookmark will advance to the new commit.
|
|
951
|
When a commit is made, the active bookmark will advance to the new commit.
|
|
|
952
|
A plain :hg:`update` will also advance an active bookmark, if possible.
|
|
952
|
A plain :hg:`update` will also advance an active bookmark, if possible.
|
|
|
953
|
Updating away from a bookmark will cause it to be deactivated.
|
|
953
|
Updating away from a bookmark will cause it to be deactivated.
|
|
|
954
|
|
|
954
|
|
|
|
955
|
Bookmarks can be pushed and pulled between repositories (see
|
|
955
|
Bookmarks can be pushed and pulled between repositories (see
|
|
|
956
|
:hg:`help push` and :hg:`help pull`). If a shared bookmark has
|
|
956
|
:hg:`help push` and :hg:`help pull`). If a shared bookmark has
|
|
|
957
|
diverged, a new 'divergent bookmark' of the form 'name@path' will
|
|
957
|
diverged, a new 'divergent bookmark' of the form 'name@path' will
|
|
|
958
|
be created. Using :hg:`merge` will resolve the divergence.
|
|
958
|
be created. Using :hg:`merge` will resolve the divergence.
|
|
|
959
|
|
|
959
|
|
|
|
960
|
Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
|
|
960
|
Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
|
|
|
961
|
the active bookmark's name.
|
|
961
|
the active bookmark's name.
|
|
|
962
|
|
|
962
|
|
|
|
963
|
A bookmark named '@' has the special property that :hg:`clone` will
|
|
963
|
A bookmark named '@' has the special property that :hg:`clone` will
|
|
|
964
|
check it out by default if it exists.
|
|
964
|
check it out by default if it exists.
|
|
|
965
|
|
|
965
|
|
|
|
966
|
.. container:: verbose
|
|
966
|
.. container:: verbose
|
|
|
967
|
|
|
967
|
|
|
|
968
|
Template:
|
|
968
|
Template:
|
|
|
969
|
|
|
969
|
|
|
|
970
|
The following keywords are supported in addition to the common template
|
|
970
|
The following keywords are supported in addition to the common template
|
|
|
971
|
keywords and functions such as ``{bookmark}``. See also
|
|
971
|
keywords and functions such as ``{bookmark}``. See also
|
|
|
972
|
:hg:`help templates`.
|
|
972
|
:hg:`help templates`.
|
|
|
973
|
|
|
973
|
|
|
|
974
|
:active: Boolean. True if the bookmark is active.
|
|
974
|
:active: Boolean. True if the bookmark is active.
|
|
|
975
|
|
|
975
|
|
|
|
976
|
Examples:
|
|
976
|
Examples:
|
|
|
977
|
|
|
977
|
|
|
|
978
|
- create an active bookmark for a new line of development::
|
|
978
|
- create an active bookmark for a new line of development::
|
|
|
979
|
|
|
979
|
|
|
|
980
|
hg book new-feature
|
|
980
|
hg book new-feature
|
|
|
981
|
|
|
981
|
|
|
|
982
|
- create an inactive bookmark as a place marker::
|
|
982
|
- create an inactive bookmark as a place marker::
|
|
|
983
|
|
|
983
|
|
|
|
984
|
hg book -i reviewed
|
|
984
|
hg book -i reviewed
|
|
|
985
|
|
|
985
|
|
|
|
986
|
- create an inactive bookmark on another changeset::
|
|
986
|
- create an inactive bookmark on another changeset::
|
|
|
987
|
|
|
987
|
|
|
|
988
|
hg book -r .^ tested
|
|
988
|
hg book -r .^ tested
|
|
|
989
|
|
|
989
|
|
|
|
990
|
- rename bookmark turkey to dinner::
|
|
990
|
- rename bookmark turkey to dinner::
|
|
|
991
|
|
|
991
|
|
|
|
992
|
hg book -m turkey dinner
|
|
992
|
hg book -m turkey dinner
|
|
|
993
|
|
|
993
|
|
|
|
994
|
- move the '@' bookmark from another branch::
|
|
994
|
- move the '@' bookmark from another branch::
|
|
|
995
|
|
|
995
|
|
|
|
996
|
hg book -f @
|
|
996
|
hg book -f @
|
|
|
997
|
|
|
997
|
|
|
|
998
|
- print only the active bookmark name::
|
|
998
|
- print only the active bookmark name::
|
|
|
999
|
|
|
999
|
|
|
|
1000
|
hg book -ql .
|
|
1000
|
hg book -ql .
|
|
|
1001
|
'''
|
|
1001
|
'''
|
|
|
1002
|
opts = pycompat.byteskwargs(opts)
|
|
1002
|
opts = pycompat.byteskwargs(opts)
|
|
|
1003
|
force = opts.get('force')
|
|
1003
|
force = opts.get('force')
|
|
|
1004
|
rev = opts.get('rev')
|
|
1004
|
rev = opts.get('rev')
|
|
|
1005
|
inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
|
|
1005
|
inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
|
|
|
1006
|
|
|
1006
|
|
|
|
1007
|
selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
|
|
1007
|
selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
|
|
|
1008
|
if len(selactions) > 1:
|
|
1008
|
if len(selactions) > 1:
|
|
|
1009
|
raise error.Abort(_('--%s and --%s are incompatible')
|
|
1009
|
raise error.Abort(_('--%s and --%s are incompatible')
|
|
|
1010
|
% tuple(selactions[:2]))
|
|
1010
|
% tuple(selactions[:2]))
|
|
|
1011
|
if selactions:
|
|
1011
|
if selactions:
|
|
|
1012
|
action = selactions[0]
|
|
1012
|
action = selactions[0]
|
|
|
1013
|
elif names or rev:
|
|
1013
|
elif names or rev:
|
|
|
1014
|
action = 'add'
|
|
1014
|
action = 'add'
|
|
|
1015
|
elif inactive:
|
|
1015
|
elif inactive:
|
|
|
1016
|
action = 'inactive' # meaning deactivate
|
|
1016
|
action = 'inactive' # meaning deactivate
|
|
|
1017
|
else:
|
|
1017
|
else:
|
|
|
1018
|
action = 'list'
|
|
1018
|
action = 'list'
|
|
|
1019
|
|
|
1019
|
|
|
|
1020
|
if rev and action in {'delete', 'rename', 'list'}:
|
|
1020
|
if rev and action in {'delete', 'rename', 'list'}:
|
|
|
1021
|
raise error.Abort(_("--rev is incompatible with --%s") % action)
|
|
1021
|
raise error.Abort(_("--rev is incompatible with --%s") % action)
|
|
|
1022
|
if inactive and action in {'delete', 'list'}:
|
|
1022
|
if inactive and action in {'delete', 'list'}:
|
|
|
1023
|
raise error.Abort(_("--inactive is incompatible with --%s") % action)
|
|
1023
|
raise error.Abort(_("--inactive is incompatible with --%s") % action)
|
|
|
1024
|
if not names and action in {'add', 'delete'}:
|
|
1024
|
if not names and action in {'add', 'delete'}:
|
|
|
1025
|
raise error.Abort(_("bookmark name required"))
|
|
1025
|
raise error.Abort(_("bookmark name required"))
|
|
|
1026
|
|
|
1026
|
|
|
|
1027
|
if action in {'add', 'delete', 'rename', 'inactive'}:
|
|
1027
|
if action in {'add', 'delete', 'rename', 'inactive'}:
|
|
|
1028
|
with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
|
|
1028
|
with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
|
|
|
1029
|
if action == 'delete':
|
|
1029
|
if action == 'delete':
|
|
|
1030
|
names = pycompat.maplist(repo._bookmarks.expandname, names)
|
|
1030
|
names = pycompat.maplist(repo._bookmarks.expandname, names)
|
|
|
1031
|
bookmarks.delete(repo, tr, names)
|
|
1031
|
bookmarks.delete(repo, tr, names)
|
|
|
1032
|
elif action == 'rename':
|
|
1032
|
elif action == 'rename':
|
|
|
1033
|
if not names:
|
|
1033
|
if not names:
|
|
|
1034
|
raise error.Abort(_("new bookmark name required"))
|
|
1034
|
raise error.Abort(_("new bookmark name required"))
|
|
|
1035
|
elif len(names) > 1:
|
|
1035
|
elif len(names) > 1:
|
|
|
1036
|
raise error.Abort(_("only one new bookmark name allowed"))
|
|
1036
|
raise error.Abort(_("only one new bookmark name allowed"))
|
|
|
1037
|
oldname = repo._bookmarks.expandname(opts['rename'])
|
|
1037
|
oldname = repo._bookmarks.expandname(opts['rename'])
|
|
|
1038
|
bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
|
|
1038
|
bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
|
|
|
1039
|
elif action == 'add':
|
|
1039
|
elif action == 'add':
|
|
|
1040
|
bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
|
|
1040
|
bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
|
|
|
1041
|
elif action == 'inactive':
|
|
1041
|
elif action == 'inactive':
|
|
|
1042
|
if len(repo._bookmarks) == 0:
|
|
1042
|
if len(repo._bookmarks) == 0:
|
|
|
1043
|
ui.status(_("no bookmarks set\n"))
|
|
1043
|
ui.status(_("no bookmarks set\n"))
|
|
|
1044
|
elif not repo._activebookmark:
|
|
1044
|
elif not repo._activebookmark:
|
|
|
1045
|
ui.status(_("no active bookmark\n"))
|
|
1045
|
ui.status(_("no active bookmark\n"))
|
|
|
1046
|
else:
|
|
1046
|
else:
|
|
|
1047
|
bookmarks.deactivate(repo)
|
|
1047
|
bookmarks.deactivate(repo)
|
|
|
1048
|
elif action == 'list':
|
|
1048
|
elif action == 'list':
|
|
|
1049
|
names = pycompat.maplist(repo._bookmarks.expandname, names)
|
|
1049
|
names = pycompat.maplist(repo._bookmarks.expandname, names)
|
|
|
1050
|
with ui.formatter('bookmarks', opts) as fm:
|
|
1050
|
with ui.formatter('bookmarks', opts) as fm:
|
|
|
1051
|
bookmarks.printbookmarks(ui, repo, fm, names)
|
|
1051
|
bookmarks.printbookmarks(ui, repo, fm, names)
|
|
|
1052
|
else:
|
|
1052
|
else:
|
|
|
1053
|
raise error.ProgrammingError('invalid action: %s' % action)
|
|
1053
|
raise error.ProgrammingError('invalid action: %s' % action)
|
|
|
1054
|
|
|
1054
|
|
|
|
1055
|
@command('branch',
|
|
1055
|
@command('branch',
|
|
|
1056
|
[('f', 'force', None,
|
|
1056
|
[('f', 'force', None,
|
|
|
1057
|
_('set branch name even if it shadows an existing branch')),
|
|
1057
|
_('set branch name even if it shadows an existing branch')),
|
|
|
1058
|
('C', 'clean', None, _('reset branch name to parent branch name')),
|
|
1058
|
('C', 'clean', None, _('reset branch name to parent branch name')),
|
|
|
1059
|
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
|
|
1059
|
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
|
|
|
1060
|
],
|
|
1060
|
],
|
|
|
1061
|
_('[-fC] [NAME]'),
|
|
1061
|
_('[-fC] [NAME]'),
|
|
|
1062
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
1062
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
1063
|
def branch(ui, repo, label=None, **opts):
|
|
1063
|
def branch(ui, repo, label=None, **opts):
|
|
|
1064
|
"""set or show the current branch name
|
|
1064
|
"""set or show the current branch name
|
|
|
1065
|
|
|
1065
|
|
|
|
1066
|
.. note::
|
|
1066
|
.. note::
|
|
|
1067
|
|
|
1067
|
|
|
|
1068
|
Branch names are permanent and global. Use :hg:`bookmark` to create a
|
|
1068
|
Branch names are permanent and global. Use :hg:`bookmark` to create a
|
|
|
1069
|
light-weight bookmark instead. See :hg:`help glossary` for more
|
|
1069
|
light-weight bookmark instead. See :hg:`help glossary` for more
|
|
|
1070
|
information about named branches and bookmarks.
|
|
1070
|
information about named branches and bookmarks.
|
|
|
1071
|
|
|
1071
|
|
|
|
1072
|
With no argument, show the current branch name. With one argument,
|
|
1072
|
With no argument, show the current branch name. With one argument,
|
|
|
1073
|
set the working directory branch name (the branch will not exist
|
|
1073
|
set the working directory branch name (the branch will not exist
|
|
|
1074
|
in the repository until the next commit). Standard practice
|
|
1074
|
in the repository until the next commit). Standard practice
|
|
|
1075
|
recommends that primary development take place on the 'default'
|
|
1075
|
recommends that primary development take place on the 'default'
|
|
|
1076
|
branch.
|
|
1076
|
branch.
|
|
|
1077
|
|
|
1077
|
|
|
|
1078
|
Unless -f/--force is specified, branch will not let you set a
|
|
1078
|
Unless -f/--force is specified, branch will not let you set a
|
|
|
1079
|
branch name that already exists.
|
|
1079
|
branch name that already exists.
|
|
|
1080
|
|
|
1080
|
|
|
|
1081
|
Use -C/--clean to reset the working directory branch to that of
|
|
1081
|
Use -C/--clean to reset the working directory branch to that of
|
|
|
1082
|
the parent of the working directory, negating a previous branch
|
|
1082
|
the parent of the working directory, negating a previous branch
|
|
|
1083
|
change.
|
|
1083
|
change.
|
|
|
1084
|
|
|
1084
|
|
|
|
1085
|
Use the command :hg:`update` to switch to an existing branch. Use
|
|
1085
|
Use the command :hg:`update` to switch to an existing branch. Use
|
|
|
1086
|
:hg:`commit --close-branch` to mark this branch head as closed.
|
|
1086
|
:hg:`commit --close-branch` to mark this branch head as closed.
|
|
|
1087
|
When all heads of a branch are closed, the branch will be
|
|
1087
|
When all heads of a branch are closed, the branch will be
|
|
|
1088
|
considered closed.
|
|
1088
|
considered closed.
|
|
|
1089
|
|
|
1089
|
|
|
|
1090
|
Returns 0 on success.
|
|
1090
|
Returns 0 on success.
|
|
|
1091
|
"""
|
|
1091
|
"""
|
|
|
1092
|
opts = pycompat.byteskwargs(opts)
|
|
1092
|
opts = pycompat.byteskwargs(opts)
|
|
|
1093
|
revs = opts.get('rev')
|
|
1093
|
revs = opts.get('rev')
|
|
|
1094
|
if label:
|
|
1094
|
if label:
|
|
|
1095
|
label = label.strip()
|
|
1095
|
label = label.strip()
|
|
|
1096
|
|
|
1096
|
|
|
|
1097
|
if not opts.get('clean') and not label:
|
|
1097
|
if not opts.get('clean') and not label:
|
|
|
1098
|
if revs:
|
|
1098
|
if revs:
|
|
|
1099
|
raise error.Abort(_("no branch name specified for the revisions"))
|
|
1099
|
raise error.Abort(_("no branch name specified for the revisions"))
|
|
|
1100
|
ui.write("%s\n" % repo.dirstate.branch())
|
|
1100
|
ui.write("%s\n" % repo.dirstate.branch())
|
|
|
1101
|
return
|
|
1101
|
return
|
|
|
1102
|
|
|
1102
|
|
|
|
1103
|
with repo.wlock():
|
|
1103
|
with repo.wlock():
|
|
|
1104
|
if opts.get('clean'):
|
|
1104
|
if opts.get('clean'):
|
|
|
1105
|
label = repo[None].p1().branch()
|
|
1105
|
label = repo[None].p1().branch()
|
|
|
1106
|
repo.dirstate.setbranch(label)
|
|
1106
|
repo.dirstate.setbranch(label)
|
|
|
1107
|
ui.status(_('reset working directory to branch %s\n') % label)
|
|
1107
|
ui.status(_('reset working directory to branch %s\n') % label)
|
|
|
1108
|
elif label:
|
|
1108
|
elif label:
|
|
|
1109
|
|
|
1109
|
|
|
|
1110
|
scmutil.checknewlabel(repo, label, 'branch')
|
|
1110
|
scmutil.checknewlabel(repo, label, 'branch')
|
|
|
1111
|
if revs:
|
|
1111
|
if revs:
|
|
|
1112
|
return cmdutil.changebranch(ui, repo, revs, label)
|
|
1112
|
return cmdutil.changebranch(ui, repo, revs, label)
|
|
|
1113
|
|
|
1113
|
|
|
|
1114
|
if not opts.get('force') and label in repo.branchmap():
|
|
1114
|
if not opts.get('force') and label in repo.branchmap():
|
|
|
1115
|
if label not in [p.branch() for p in repo[None].parents()]:
|
|
1115
|
if label not in [p.branch() for p in repo[None].parents()]:
|
|
|
1116
|
raise error.Abort(_('a branch of the same name already'
|
|
1116
|
raise error.Abort(_('a branch of the same name already'
|
|
|
1117
|
' exists'),
|
|
1117
|
' exists'),
|
|
|
1118
|
# i18n: "it" refers to an existing branch
|
|
1118
|
# i18n: "it" refers to an existing branch
|
|
|
1119
|
hint=_("use 'hg update' to switch to it"))
|
|
1119
|
hint=_("use 'hg update' to switch to it"))
|
|
|
1120
|
|
|
1120
|
|
|
|
1121
|
repo.dirstate.setbranch(label)
|
|
1121
|
repo.dirstate.setbranch(label)
|
|
|
1122
|
ui.status(_('marked working directory as branch %s\n') % label)
|
|
1122
|
ui.status(_('marked working directory as branch %s\n') % label)
|
|
|
1123
|
|
|
1123
|
|
|
|
1124
|
# find any open named branches aside from default
|
|
1124
|
# find any open named branches aside from default
|
|
|
1125
|
others = [n for n, h, t, c in repo.branchmap().iterbranches()
|
|
1125
|
others = [n for n, h, t, c in repo.branchmap().iterbranches()
|
|
|
1126
|
if n != "default" and not c]
|
|
1126
|
if n != "default" and not c]
|
|
|
1127
|
if not others:
|
|
1127
|
if not others:
|
|
|
1128
|
ui.status(_('(branches are permanent and global, '
|
|
1128
|
ui.status(_('(branches are permanent and global, '
|
|
|
1129
|
'did you want a bookmark?)\n'))
|
|
1129
|
'did you want a bookmark?)\n'))
|
|
|
1130
|
|
|
1130
|
|
|
|
1131
|
@command('branches',
|
|
1131
|
@command('branches',
|
|
|
1132
|
[('a', 'active', False,
|
|
1132
|
[('a', 'active', False,
|
|
|
1133
|
_('show only branches that have unmerged heads (DEPRECATED)')),
|
|
1133
|
_('show only branches that have unmerged heads (DEPRECATED)')),
|
|
|
1134
|
('c', 'closed', False, _('show normal and closed branches')),
|
|
1134
|
('c', 'closed', False, _('show normal and closed branches')),
|
|
|
1135
|
('r', 'rev', [], _('show branch name(s) of the given rev'))
|
|
1135
|
('r', 'rev', [], _('show branch name(s) of the given rev'))
|
|
|
1136
|
] + formatteropts,
|
|
1136
|
] + formatteropts,
|
|
|
1137
|
_('[-c]'),
|
|
1137
|
_('[-c]'),
|
|
|
1138
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
|
|
1138
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
|
|
|
1139
|
intents={INTENT_READONLY})
|
|
1139
|
intents={INTENT_READONLY})
|
|
|
1140
|
def branches(ui, repo, active=False, closed=False, **opts):
|
|
1140
|
def branches(ui, repo, active=False, closed=False, **opts):
|
|
|
1141
|
"""list repository named branches
|
|
1141
|
"""list repository named branches
|
|
|
1142
|
|
|
1142
|
|
|
|
1143
|
List the repository's named branches, indicating which ones are
|
|
1143
|
List the repository's named branches, indicating which ones are
|
|
|
1144
|
inactive. If -c/--closed is specified, also list branches which have
|
|
1144
|
inactive. If -c/--closed is specified, also list branches which have
|
|
|
1145
|
been marked closed (see :hg:`commit --close-branch`).
|
|
1145
|
been marked closed (see :hg:`commit --close-branch`).
|
|
|
1146
|
|
|
1146
|
|
|
|
1147
|
Use the command :hg:`update` to switch to an existing branch.
|
|
1147
|
Use the command :hg:`update` to switch to an existing branch.
|
|
|
1148
|
|
|
1148
|
|
|
|
1149
|
.. container:: verbose
|
|
1149
|
.. container:: verbose
|
|
|
1150
|
|
|
1150
|
|
|
|
1151
|
Template:
|
|
1151
|
Template:
|
|
|
1152
|
|
|
1152
|
|
|
|
1153
|
The following keywords are supported in addition to the common template
|
|
1153
|
The following keywords are supported in addition to the common template
|
|
|
1154
|
keywords and functions such as ``{branch}``. See also
|
|
1154
|
keywords and functions such as ``{branch}``. See also
|
|
|
1155
|
:hg:`help templates`.
|
|
1155
|
:hg:`help templates`.
|
|
|
1156
|
|
|
1156
|
|
|
|
1157
|
:active: Boolean. True if the branch is active.
|
|
1157
|
:active: Boolean. True if the branch is active.
|
|
|
1158
|
:closed: Boolean. True if the branch is closed.
|
|
1158
|
:closed: Boolean. True if the branch is closed.
|
|
|
1159
|
:current: Boolean. True if it is the current branch.
|
|
1159
|
:current: Boolean. True if it is the current branch.
|
|
|
1160
|
|
|
1160
|
|
|
|
1161
|
Returns 0.
|
|
1161
|
Returns 0.
|
|
|
1162
|
"""
|
|
1162
|
"""
|
|
|
1163
|
|
|
1163
|
|
|
|
1164
|
opts = pycompat.byteskwargs(opts)
|
|
1164
|
opts = pycompat.byteskwargs(opts)
|
|
|
1165
|
revs = opts.get('rev')
|
|
1165
|
revs = opts.get('rev')
|
|
|
1166
|
selectedbranches = None
|
|
1166
|
selectedbranches = None
|
|
|
1167
|
if revs:
|
|
1167
|
if revs:
|
|
|
1168
|
revs = scmutil.revrange(repo, revs)
|
|
1168
|
revs = scmutil.revrange(repo, revs)
|
|
|
1169
|
getbi = repo.revbranchcache().branchinfo
|
|
1169
|
getbi = repo.revbranchcache().branchinfo
|
|
|
1170
|
selectedbranches = {getbi(r)[0] for r in revs}
|
|
1170
|
selectedbranches = {getbi(r)[0] for r in revs}
|
|
|
1171
|
|
|
1171
|
|
|
|
1172
|
ui.pager('branches')
|
|
1172
|
ui.pager('branches')
|
|
|
1173
|
fm = ui.formatter('branches', opts)
|
|
1173
|
fm = ui.formatter('branches', opts)
|
|
|
1174
|
hexfunc = fm.hexfunc
|
|
1174
|
hexfunc = fm.hexfunc
|
|
|
1175
|
|
|
1175
|
|
|
|
1176
|
allheads = set(repo.heads())
|
|
1176
|
allheads = set(repo.heads())
|
|
|
1177
|
branches = []
|
|
1177
|
branches = []
|
|
|
1178
|
for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
|
|
1178
|
for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
|
|
|
1179
|
if selectedbranches is not None and tag not in selectedbranches:
|
|
1179
|
if selectedbranches is not None and tag not in selectedbranches:
|
|
|
1180
|
continue
|
|
1180
|
continue
|
|
|
1181
|
isactive = False
|
|
1181
|
isactive = False
|
|
|
1182
|
if not isclosed:
|
|
1182
|
if not isclosed:
|
|
|
1183
|
openheads = set(repo.branchmap().iteropen(heads))
|
|
1183
|
openheads = set(repo.branchmap().iteropen(heads))
|
|
|
1184
|
isactive = bool(openheads & allheads)
|
|
1184
|
isactive = bool(openheads & allheads)
|
|
|
1185
|
branches.append((tag, repo[tip], isactive, not isclosed))
|
|
1185
|
branches.append((tag, repo[tip], isactive, not isclosed))
|
|
|
1186
|
branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
|
|
1186
|
branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
|
|
|
1187
|
reverse=True)
|
|
1187
|
reverse=True)
|
|
|
1188
|
|
|
1188
|
|
|
|
1189
|
for tag, ctx, isactive, isopen in branches:
|
|
1189
|
for tag, ctx, isactive, isopen in branches:
|
|
|
1190
|
if active and not isactive:
|
|
1190
|
if active and not isactive:
|
|
|
1191
|
continue
|
|
1191
|
continue
|
|
|
1192
|
if isactive:
|
|
1192
|
if isactive:
|
|
|
1193
|
label = 'branches.active'
|
|
1193
|
label = 'branches.active'
|
|
|
1194
|
notice = ''
|
|
1194
|
notice = ''
|
|
|
1195
|
elif not isopen:
|
|
1195
|
elif not isopen:
|
|
|
1196
|
if not closed:
|
|
1196
|
if not closed:
|
|
|
1197
|
continue
|
|
1197
|
continue
|
|
|
1198
|
label = 'branches.closed'
|
|
1198
|
label = 'branches.closed'
|
|
|
1199
|
notice = _(' (closed)')
|
|
1199
|
notice = _(' (closed)')
|
|
|
1200
|
else:
|
|
1200
|
else:
|
|
|
1201
|
label = 'branches.inactive'
|
|
1201
|
label = 'branches.inactive'
|
|
|
1202
|
notice = _(' (inactive)')
|
|
1202
|
notice = _(' (inactive)')
|
|
|
1203
|
current = (tag == repo.dirstate.branch())
|
|
1203
|
current = (tag == repo.dirstate.branch())
|
|
|
1204
|
if current:
|
|
1204
|
if current:
|
|
|
1205
|
label = 'branches.current'
|
|
1205
|
label = 'branches.current'
|
|
|
1206
|
|
|
1206
|
|
|
|
1207
|
fm.startitem()
|
|
1207
|
fm.startitem()
|
|
|
1208
|
fm.write('branch', '%s', tag, label=label)
|
|
1208
|
fm.write('branch', '%s', tag, label=label)
|
|
|
1209
|
rev = ctx.rev()
|
|
1209
|
rev = ctx.rev()
|
|
|
1210
|
padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
|
|
1210
|
padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
|
|
|
1211
|
fmt = ' ' * padsize + ' %d:%s'
|
|
1211
|
fmt = ' ' * padsize + ' %d:%s'
|
|
|
1212
|
fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
|
|
1212
|
fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
|
|
|
1213
|
label='log.changeset changeset.%s' % ctx.phasestr())
|
|
1213
|
label='log.changeset changeset.%s' % ctx.phasestr())
|
|
|
1214
|
fm.context(ctx=ctx)
|
|
1214
|
fm.context(ctx=ctx)
|
|
|
1215
|
fm.data(active=isactive, closed=not isopen, current=current)
|
|
1215
|
fm.data(active=isactive, closed=not isopen, current=current)
|
|
|
1216
|
if not ui.quiet:
|
|
1216
|
if not ui.quiet:
|
|
|
1217
|
fm.plain(notice)
|
|
1217
|
fm.plain(notice)
|
|
|
1218
|
fm.plain('\n')
|
|
1218
|
fm.plain('\n')
|
|
|
1219
|
fm.end()
|
|
1219
|
fm.end()
|
|
|
1220
|
|
|
1220
|
|
|
|
1221
|
@command('bundle',
|
|
1221
|
@command('bundle',
|
|
|
1222
|
[('f', 'force', None, _('run even when the destination is unrelated')),
|
|
1222
|
[('f', 'force', None, _('run even when the destination is unrelated')),
|
|
|
1223
|
('r', 'rev', [], _('a changeset intended to be added to the destination'),
|
|
1223
|
('r', 'rev', [], _('a changeset intended to be added to the destination'),
|
|
|
1224
|
_('REV')),
|
|
1224
|
_('REV')),
|
|
|
1225
|
('b', 'branch', [], _('a specific branch you would like to bundle'),
|
|
1225
|
('b', 'branch', [], _('a specific branch you would like to bundle'),
|
|
|
1226
|
_('BRANCH')),
|
|
1226
|
_('BRANCH')),
|
|
|
1227
|
('', 'base', [],
|
|
1227
|
('', 'base', [],
|
|
|
1228
|
_('a base changeset assumed to be available at the destination'),
|
|
1228
|
_('a base changeset assumed to be available at the destination'),
|
|
|
1229
|
_('REV')),
|
|
1229
|
_('REV')),
|
|
|
1230
|
('a', 'all', None, _('bundle all changesets in the repository')),
|
|
1230
|
('a', 'all', None, _('bundle all changesets in the repository')),
|
|
|
1231
|
('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
|
|
1231
|
('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
|
|
|
1232
|
] + remoteopts,
|
|
1232
|
] + remoteopts,
|
|
|
1233
|
_('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
|
|
1233
|
_('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
|
|
|
1234
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
1234
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
1235
|
def bundle(ui, repo, fname, dest=None, **opts):
|
|
1235
|
def bundle(ui, repo, fname, dest=None, **opts):
|
|
|
1236
|
"""create a bundle file
|
|
1236
|
"""create a bundle file
|
|
|
1237
|
|
|
1237
|
|
|
|
1238
|
Generate a bundle file containing data to be transferred to another
|
|
1238
|
Generate a bundle file containing data to be transferred to another
|
|
|
1239
|
repository.
|
|
1239
|
repository.
|
|
|
1240
|
|
|
1240
|
|
|
|
1241
|
To create a bundle containing all changesets, use -a/--all
|
|
1241
|
To create a bundle containing all changesets, use -a/--all
|
|
|
1242
|
(or --base null). Otherwise, hg assumes the destination will have
|
|
1242
|
(or --base null). Otherwise, hg assumes the destination will have
|
|
|
1243
|
all the nodes you specify with --base parameters. Otherwise, hg
|
|
1243
|
all the nodes you specify with --base parameters. Otherwise, hg
|
|
|
1244
|
will assume the repository has all the nodes in destination, or
|
|
1244
|
will assume the repository has all the nodes in destination, or
|
|
|
1245
|
default-push/default if no destination is specified, where destination
|
|
1245
|
default-push/default if no destination is specified, where destination
|
|
|
1246
|
is the repository you provide through DEST option.
|
|
1246
|
is the repository you provide through DEST option.
|
|
|
1247
|
|
|
1247
|
|
|
|
1248
|
You can change bundle format with the -t/--type option. See
|
|
1248
|
You can change bundle format with the -t/--type option. See
|
|
|
1249
|
:hg:`help bundlespec` for documentation on this format. By default,
|
|
1249
|
:hg:`help bundlespec` for documentation on this format. By default,
|
|
|
1250
|
the most appropriate format is used and compression defaults to
|
|
1250
|
the most appropriate format is used and compression defaults to
|
|
|
1251
|
bzip2.
|
|
1251
|
bzip2.
|
|
|
1252
|
|
|
1252
|
|
|
|
1253
|
The bundle file can then be transferred using conventional means
|
|
1253
|
The bundle file can then be transferred using conventional means
|
|
|
1254
|
and applied to another repository with the unbundle or pull
|
|
1254
|
and applied to another repository with the unbundle or pull
|
|
|
1255
|
command. This is useful when direct push and pull are not
|
|
1255
|
command. This is useful when direct push and pull are not
|
|
|
1256
|
available or when exporting an entire repository is undesirable.
|
|
1256
|
available or when exporting an entire repository is undesirable.
|
|
|
1257
|
|
|
1257
|
|
|
|
1258
|
Applying bundles preserves all changeset contents including
|
|
1258
|
Applying bundles preserves all changeset contents including
|
|
|
1259
|
permissions, copy/rename information, and revision history.
|
|
1259
|
permissions, copy/rename information, and revision history.
|
|
|
1260
|
|
|
1260
|
|
|
|
1261
|
Returns 0 on success, 1 if no changes found.
|
|
1261
|
Returns 0 on success, 1 if no changes found.
|
|
|
1262
|
"""
|
|
1262
|
"""
|
|
|
1263
|
opts = pycompat.byteskwargs(opts)
|
|
1263
|
opts = pycompat.byteskwargs(opts)
|
|
|
1264
|
revs = None
|
|
1264
|
revs = None
|
|
|
1265
|
if 'rev' in opts:
|
|
1265
|
if 'rev' in opts:
|
|
|
1266
|
revstrings = opts['rev']
|
|
1266
|
revstrings = opts['rev']
|
|
|
1267
|
revs = scmutil.revrange(repo, revstrings)
|
|
1267
|
revs = scmutil.revrange(repo, revstrings)
|
|
|
1268
|
if revstrings and not revs:
|
|
1268
|
if revstrings and not revs:
|
|
|
1269
|
raise error.Abort(_('no commits to bundle'))
|
|
1269
|
raise error.Abort(_('no commits to bundle'))
|
|
|
1270
|
|
|
1270
|
|
|
|
1271
|
bundletype = opts.get('type', 'bzip2').lower()
|
|
1271
|
bundletype = opts.get('type', 'bzip2').lower()
|
|
|
1272
|
try:
|
|
1272
|
try:
|
|
|
1273
|
bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
|
|
1273
|
bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
|
|
|
1274
|
except error.UnsupportedBundleSpecification as e:
|
|
1274
|
except error.UnsupportedBundleSpecification as e:
|
|
|
1275
|
raise error.Abort(pycompat.bytestr(e),
|
|
1275
|
raise error.Abort(pycompat.bytestr(e),
|
|
|
1276
|
hint=_("see 'hg help bundlespec' for supported "
|
|
1276
|
hint=_("see 'hg help bundlespec' for supported "
|
|
|
1277
|
"values for --type"))
|
|
1277
|
"values for --type"))
|
|
|
1278
|
cgversion = bundlespec.contentopts["cg.version"]
|
|
1278
|
cgversion = bundlespec.contentopts["cg.version"]
|
|
|
1279
|
|
|
1279
|
|
|
|
1280
|
# Packed bundles are a pseudo bundle format for now.
|
|
1280
|
# Packed bundles are a pseudo bundle format for now.
|
|
|
1281
|
if cgversion == 's1':
|
|
1281
|
if cgversion == 's1':
|
|
|
1282
|
raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
|
|
1282
|
raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
|
|
|
1283
|
hint=_("use 'hg debugcreatestreamclonebundle'"))
|
|
1283
|
hint=_("use 'hg debugcreatestreamclonebundle'"))
|
|
|
1284
|
|
|
1284
|
|
|
|
1285
|
if opts.get('all'):
|
|
1285
|
if opts.get('all'):
|
|
|
1286
|
if dest:
|
|
1286
|
if dest:
|
|
|
1287
|
raise error.Abort(_("--all is incompatible with specifying "
|
|
1287
|
raise error.Abort(_("--all is incompatible with specifying "
|
|
|
1288
|
"a destination"))
|
|
1288
|
"a destination"))
|
|
|
1289
|
if opts.get('base'):
|
|
1289
|
if opts.get('base'):
|
|
|
1290
|
ui.warn(_("ignoring --base because --all was specified\n"))
|
|
1290
|
ui.warn(_("ignoring --base because --all was specified\n"))
|
|
|
1291
|
base = [nullrev]
|
|
1291
|
base = [nullrev]
|
|
|
1292
|
else:
|
|
1292
|
else:
|
|
|
1293
|
base = scmutil.revrange(repo, opts.get('base'))
|
|
1293
|
base = scmutil.revrange(repo, opts.get('base'))
|
|
|
1294
|
if cgversion not in changegroup.supportedoutgoingversions(repo):
|
|
1294
|
if cgversion not in changegroup.supportedoutgoingversions(repo):
|
|
|
1295
|
raise error.Abort(_("repository does not support bundle version %s") %
|
|
1295
|
raise error.Abort(_("repository does not support bundle version %s") %
|
|
|
1296
|
cgversion)
|
|
1296
|
cgversion)
|
|
|
1297
|
|
|
1297
|
|
|
|
1298
|
if base:
|
|
1298
|
if base:
|
|
|
1299
|
if dest:
|
|
1299
|
if dest:
|
|
|
1300
|
raise error.Abort(_("--base is incompatible with specifying "
|
|
1300
|
raise error.Abort(_("--base is incompatible with specifying "
|
|
|
1301
|
"a destination"))
|
|
1301
|
"a destination"))
|
|
|
1302
|
common = [repo[rev].node() for rev in base]
|
|
1302
|
common = [repo[rev].node() for rev in base]
|
|
|
1303
|
heads = [repo[r].node() for r in revs] if revs else None
|
|
1303
|
heads = [repo[r].node() for r in revs] if revs else None
|
|
|
1304
|
outgoing = discovery.outgoing(repo, common, heads)
|
|
1304
|
outgoing = discovery.outgoing(repo, common, heads)
|
|
|
1305
|
else:
|
|
1305
|
else:
|
|
|
1306
|
dest = ui.expandpath(dest or 'default-push', dest or 'default')
|
|
1306
|
dest = ui.expandpath(dest or 'default-push', dest or 'default')
|
|
|
1307
|
dest, branches = hg.parseurl(dest, opts.get('branch'))
|
|
1307
|
dest, branches = hg.parseurl(dest, opts.get('branch'))
|
|
|
1308
|
other = hg.peer(repo, opts, dest)
|
|
1308
|
other = hg.peer(repo, opts, dest)
|
|
|
1309
|
revs = [repo[r].hex() for r in revs]
|
|
1309
|
revs = [repo[r].hex() for r in revs]
|
|
|
1310
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
|
|
1310
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
|
|
|
1311
|
heads = revs and pycompat.maplist(repo.lookup, revs) or revs
|
|
1311
|
heads = revs and pycompat.maplist(repo.lookup, revs) or revs
|
|
|
1312
|
outgoing = discovery.findcommonoutgoing(repo, other,
|
|
1312
|
outgoing = discovery.findcommonoutgoing(repo, other,
|
|
|
1313
|
onlyheads=heads,
|
|
1313
|
onlyheads=heads,
|
|
|
1314
|
force=opts.get('force'),
|
|
1314
|
force=opts.get('force'),
|
|
|
1315
|
portable=True)
|
|
1315
|
portable=True)
|
|
|
1316
|
|
|
1316
|
|
|
|
1317
|
if not outgoing.missing:
|
|
1317
|
if not outgoing.missing:
|
|
|
1318
|
scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
|
|
1318
|
scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
|
|
|
1319
|
return 1
|
|
1319
|
return 1
|
|
|
1320
|
|
|
1320
|
|
|
|
1321
|
if cgversion == '01': #bundle1
|
|
1321
|
if cgversion == '01': #bundle1
|
|
|
1322
|
bversion = 'HG10' + bundlespec.wirecompression
|
|
1322
|
bversion = 'HG10' + bundlespec.wirecompression
|
|
|
1323
|
bcompression = None
|
|
1323
|
bcompression = None
|
|
|
1324
|
elif cgversion in ('02', '03'):
|
|
1324
|
elif cgversion in ('02', '03'):
|
|
|
1325
|
bversion = 'HG20'
|
|
1325
|
bversion = 'HG20'
|
|
|
1326
|
bcompression = bundlespec.wirecompression
|
|
1326
|
bcompression = bundlespec.wirecompression
|
|
|
1327
|
else:
|
|
1327
|
else:
|
|
|
1328
|
raise error.ProgrammingError(
|
|
1328
|
raise error.ProgrammingError(
|
|
|
1329
|
'bundle: unexpected changegroup version %s' % cgversion)
|
|
1329
|
'bundle: unexpected changegroup version %s' % cgversion)
|
|
|
1330
|
|
|
1330
|
|
|
|
1331
|
# TODO compression options should be derived from bundlespec parsing.
|
|
1331
|
# TODO compression options should be derived from bundlespec parsing.
|
|
|
1332
|
# This is a temporary hack to allow adjusting bundle compression
|
|
1332
|
# This is a temporary hack to allow adjusting bundle compression
|
|
|
1333
|
# level without a) formalizing the bundlespec changes to declare it
|
|
1333
|
# level without a) formalizing the bundlespec changes to declare it
|
|
|
1334
|
# b) introducing a command flag.
|
|
1334
|
# b) introducing a command flag.
|
|
|
1335
|
compopts = {}
|
|
1335
|
compopts = {}
|
|
|
1336
|
complevel = ui.configint('experimental',
|
|
1336
|
complevel = ui.configint('experimental',
|
|
|
1337
|
'bundlecomplevel.' + bundlespec.compression)
|
|
1337
|
'bundlecomplevel.' + bundlespec.compression)
|
|
|
1338
|
if complevel is None:
|
|
1338
|
if complevel is None:
|
|
|
1339
|
complevel = ui.configint('experimental', 'bundlecomplevel')
|
|
1339
|
complevel = ui.configint('experimental', 'bundlecomplevel')
|
|
|
1340
|
if complevel is not None:
|
|
1340
|
if complevel is not None:
|
|
|
1341
|
compopts['level'] = complevel
|
|
1341
|
compopts['level'] = complevel
|
|
|
1342
|
|
|
1342
|
|
|
|
1343
|
# Allow overriding the bundling of obsmarker in phases through
|
|
1343
|
# Allow overriding the bundling of obsmarker in phases through
|
|
|
1344
|
# configuration while we don't have a bundle version that include them
|
|
1344
|
# configuration while we don't have a bundle version that include them
|
|
|
1345
|
if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
|
|
1345
|
if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
|
|
|
1346
|
bundlespec.contentopts['obsolescence'] = True
|
|
1346
|
bundlespec.contentopts['obsolescence'] = True
|
|
|
1347
|
if repo.ui.configbool('experimental', 'bundle-phases'):
|
|
1347
|
if repo.ui.configbool('experimental', 'bundle-phases'):
|
|
|
1348
|
bundlespec.contentopts['phases'] = True
|
|
1348
|
bundlespec.contentopts['phases'] = True
|
|
|
1349
|
|
|
1349
|
|
|
|
1350
|
bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
|
|
1350
|
bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
|
|
|
1351
|
bundlespec.contentopts, compression=bcompression,
|
|
1351
|
bundlespec.contentopts, compression=bcompression,
|
|
|
1352
|
compopts=compopts)
|
|
1352
|
compopts=compopts)
|
|
|
1353
|
|
|
1353
|
|
|
|
1354
|
@command('cat',
|
|
1354
|
@command('cat',
|
|
|
1355
|
[('o', 'output', '',
|
|
1355
|
[('o', 'output', '',
|
|
|
1356
|
_('print output to file with formatted name'), _('FORMAT')),
|
|
1356
|
_('print output to file with formatted name'), _('FORMAT')),
|
|
|
1357
|
('r', 'rev', '', _('print the given revision'), _('REV')),
|
|
1357
|
('r', 'rev', '', _('print the given revision'), _('REV')),
|
|
|
1358
|
('', 'decode', None, _('apply any matching decode filter')),
|
|
1358
|
('', 'decode', None, _('apply any matching decode filter')),
|
|
|
1359
|
] + walkopts + formatteropts,
|
|
1359
|
] + walkopts + formatteropts,
|
|
|
1360
|
_('[OPTION]... FILE...'),
|
|
1360
|
_('[OPTION]... FILE...'),
|
|
|
1361
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
1361
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
1362
|
inferrepo=True,
|
|
1362
|
inferrepo=True,
|
|
|
1363
|
intents={INTENT_READONLY})
|
|
1363
|
intents={INTENT_READONLY})
|
|
|
1364
|
def cat(ui, repo, file1, *pats, **opts):
|
|
1364
|
def cat(ui, repo, file1, *pats, **opts):
|
|
|
1365
|
"""output the current or given revision of files
|
|
1365
|
"""output the current or given revision of files
|
|
|
1366
|
|
|
1366
|
|
|
|
1367
|
Print the specified files as they were at the given revision. If
|
|
1367
|
Print the specified files as they were at the given revision. If
|
|
|
1368
|
no revision is given, the parent of the working directory is used.
|
|
1368
|
no revision is given, the parent of the working directory is used.
|
|
|
1369
|
|
|
1369
|
|
|
|
1370
|
Output may be to a file, in which case the name of the file is
|
|
1370
|
Output may be to a file, in which case the name of the file is
|
|
|
1371
|
given using a template string. See :hg:`help templates`. In addition
|
|
1371
|
given using a template string. See :hg:`help templates`. In addition
|
|
|
1372
|
to the common template keywords, the following formatting rules are
|
|
1372
|
to the common template keywords, the following formatting rules are
|
|
|
1373
|
supported:
|
|
1373
|
supported:
|
|
|
1374
|
|
|
1374
|
|
|
|
1375
|
:``%%``: literal "%" character
|
|
1375
|
:``%%``: literal "%" character
|
|
|
1376
|
:``%s``: basename of file being printed
|
|
1376
|
:``%s``: basename of file being printed
|
|
|
1377
|
:``%d``: dirname of file being printed, or '.' if in repository root
|
|
1377
|
:``%d``: dirname of file being printed, or '.' if in repository root
|
|
|
1378
|
:``%p``: root-relative path name of file being printed
|
|
1378
|
:``%p``: root-relative path name of file being printed
|
|
|
1379
|
:``%H``: changeset hash (40 hexadecimal digits)
|
|
1379
|
:``%H``: changeset hash (40 hexadecimal digits)
|
|
|
1380
|
:``%R``: changeset revision number
|
|
1380
|
:``%R``: changeset revision number
|
|
|
1381
|
:``%h``: short-form changeset hash (12 hexadecimal digits)
|
|
1381
|
:``%h``: short-form changeset hash (12 hexadecimal digits)
|
|
|
1382
|
:``%r``: zero-padded changeset revision number
|
|
1382
|
:``%r``: zero-padded changeset revision number
|
|
|
1383
|
:``%b``: basename of the exporting repository
|
|
1383
|
:``%b``: basename of the exporting repository
|
|
|
1384
|
:``\\``: literal "\\" character
|
|
1384
|
:``\\``: literal "\\" character
|
|
|
1385
|
|
|
1385
|
|
|
|
1386
|
.. container:: verbose
|
|
1386
|
.. container:: verbose
|
|
|
1387
|
|
|
1387
|
|
|
|
1388
|
Template:
|
|
1388
|
Template:
|
|
|
1389
|
|
|
1389
|
|
|
|
1390
|
The following keywords are supported in addition to the common template
|
|
1390
|
The following keywords are supported in addition to the common template
|
|
|
1391
|
keywords and functions. See also :hg:`help templates`.
|
|
1391
|
keywords and functions. See also :hg:`help templates`.
|
|
|
1392
|
|
|
1392
|
|
|
|
1393
|
:data: String. File content.
|
|
1393
|
:data: String. File content.
|
|
|
1394
|
:path: String. Repository-absolute path of the file.
|
|
1394
|
:path: String. Repository-absolute path of the file.
|
|
|
1395
|
|
|
1395
|
|
|
|
1396
|
Returns 0 on success.
|
|
1396
|
Returns 0 on success.
|
|
|
1397
|
"""
|
|
1397
|
"""
|
|
|
1398
|
opts = pycompat.byteskwargs(opts)
|
|
1398
|
opts = pycompat.byteskwargs(opts)
|
|
|
1399
|
rev = opts.get('rev')
|
|
1399
|
rev = opts.get('rev')
|
|
|
1400
|
if rev:
|
|
1400
|
if rev:
|
|
|
1401
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
1401
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
1402
|
ctx = scmutil.revsingle(repo, rev)
|
|
1402
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
1403
|
m = scmutil.match(ctx, (file1,) + pats, opts)
|
|
1403
|
m = scmutil.match(ctx, (file1,) + pats, opts)
|
|
|
1404
|
fntemplate = opts.pop('output', '')
|
|
1404
|
fntemplate = opts.pop('output', '')
|
|
|
1405
|
if cmdutil.isstdiofilename(fntemplate):
|
|
1405
|
if cmdutil.isstdiofilename(fntemplate):
|
|
|
1406
|
fntemplate = ''
|
|
1406
|
fntemplate = ''
|
|
|
1407
|
|
|
1407
|
|
|
|
1408
|
if fntemplate:
|
|
1408
|
if fntemplate:
|
|
|
1409
|
fm = formatter.nullformatter(ui, 'cat', opts)
|
|
1409
|
fm = formatter.nullformatter(ui, 'cat', opts)
|
|
|
1410
|
else:
|
|
1410
|
else:
|
|
|
1411
|
ui.pager('cat')
|
|
1411
|
ui.pager('cat')
|
|
|
1412
|
fm = ui.formatter('cat', opts)
|
|
1412
|
fm = ui.formatter('cat', opts)
|
|
|
1413
|
with fm:
|
|
1413
|
with fm:
|
|
|
1414
|
return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
|
|
1414
|
return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
|
|
|
1415
|
**pycompat.strkwargs(opts))
|
|
1415
|
**pycompat.strkwargs(opts))
|
|
|
1416
|
|
|
1416
|
|
|
|
1417
|
@command('clone',
|
|
1417
|
@command('clone',
|
|
|
1418
|
[('U', 'noupdate', None, _('the clone will include an empty working '
|
|
1418
|
[('U', 'noupdate', None, _('the clone will include an empty working '
|
|
|
1419
|
'directory (only a repository)')),
|
|
1419
|
'directory (only a repository)')),
|
|
|
1420
|
('u', 'updaterev', '', _('revision, tag, or branch to check out'),
|
|
1420
|
('u', 'updaterev', '', _('revision, tag, or branch to check out'),
|
|
|
1421
|
_('REV')),
|
|
1421
|
_('REV')),
|
|
|
1422
|
('r', 'rev', [], _('do not clone everything, but include this changeset'
|
|
1422
|
('r', 'rev', [], _('do not clone everything, but include this changeset'
|
|
|
1423
|
' and its ancestors'), _('REV')),
|
|
1423
|
' and its ancestors'), _('REV')),
|
|
|
1424
|
('b', 'branch', [], _('do not clone everything, but include this branch\'s'
|
|
1424
|
('b', 'branch', [], _('do not clone everything, but include this branch\'s'
|
|
|
1425
|
' changesets and their ancestors'), _('BRANCH')),
|
|
1425
|
' changesets and their ancestors'), _('BRANCH')),
|
|
|
1426
|
('', 'pull', None, _('use pull protocol to copy metadata')),
|
|
1426
|
('', 'pull', None, _('use pull protocol to copy metadata')),
|
|
|
1427
|
('', 'uncompressed', None,
|
|
1427
|
('', 'uncompressed', None,
|
|
|
1428
|
_('an alias to --stream (DEPRECATED)')),
|
|
1428
|
_('an alias to --stream (DEPRECATED)')),
|
|
|
1429
|
('', 'stream', None,
|
|
1429
|
('', 'stream', None,
|
|
|
1430
|
_('clone with minimal data processing')),
|
|
1430
|
_('clone with minimal data processing')),
|
|
|
1431
|
] + remoteopts,
|
|
1431
|
] + remoteopts,
|
|
|
1432
|
_('[OPTION]... SOURCE [DEST]'),
|
|
1432
|
_('[OPTION]... SOURCE [DEST]'),
|
|
|
1433
|
helpcategory=command.CATEGORY_REPO_CREATION,
|
|
1433
|
helpcategory=command.CATEGORY_REPO_CREATION,
|
|
|
1434
|
helpbasic=True, norepo=True)
|
|
1434
|
helpbasic=True, norepo=True)
|
|
|
1435
|
def clone(ui, source, dest=None, **opts):
|
|
1435
|
def clone(ui, source, dest=None, **opts):
|
|
|
1436
|
"""make a copy of an existing repository
|
|
1436
|
"""make a copy of an existing repository
|
|
|
1437
|
|
|
1437
|
|
|
|
1438
|
Create a copy of an existing repository in a new directory.
|
|
1438
|
Create a copy of an existing repository in a new directory.
|
|
|
1439
|
|
|
1439
|
|
|
|
1440
|
If no destination directory name is specified, it defaults to the
|
|
1440
|
If no destination directory name is specified, it defaults to the
|
|
|
1441
|
basename of the source.
|
|
1441
|
basename of the source.
|
|
|
1442
|
|
|
1442
|
|
|
|
1443
|
The location of the source is added to the new repository's
|
|
1443
|
The location of the source is added to the new repository's
|
|
|
1444
|
``.hg/hgrc`` file, as the default to be used for future pulls.
|
|
1444
|
``.hg/hgrc`` file, as the default to be used for future pulls.
|
|
|
1445
|
|
|
1445
|
|
|
|
1446
|
Only local paths and ``ssh://`` URLs are supported as
|
|
1446
|
Only local paths and ``ssh://`` URLs are supported as
|
|
|
1447
|
destinations. For ``ssh://`` destinations, no working directory or
|
|
1447
|
destinations. For ``ssh://`` destinations, no working directory or
|
|
|
1448
|
``.hg/hgrc`` will be created on the remote side.
|
|
1448
|
``.hg/hgrc`` will be created on the remote side.
|
|
|
1449
|
|
|
1449
|
|
|
|
1450
|
If the source repository has a bookmark called '@' set, that
|
|
1450
|
If the source repository has a bookmark called '@' set, that
|
|
|
1451
|
revision will be checked out in the new repository by default.
|
|
1451
|
revision will be checked out in the new repository by default.
|
|
|
1452
|
|
|
1452
|
|
|
|
1453
|
To check out a particular version, use -u/--update, or
|
|
1453
|
To check out a particular version, use -u/--update, or
|
|
|
1454
|
-U/--noupdate to create a clone with no working directory.
|
|
1454
|
-U/--noupdate to create a clone with no working directory.
|
|
|
1455
|
|
|
1455
|
|
|
|
1456
|
To pull only a subset of changesets, specify one or more revisions
|
|
1456
|
To pull only a subset of changesets, specify one or more revisions
|
|
|
1457
|
identifiers with -r/--rev or branches with -b/--branch. The
|
|
1457
|
identifiers with -r/--rev or branches with -b/--branch. The
|
|
|
1458
|
resulting clone will contain only the specified changesets and
|
|
1458
|
resulting clone will contain only the specified changesets and
|
|
|
1459
|
their ancestors. These options (or 'clone src#rev dest') imply
|
|
1459
|
their ancestors. These options (or 'clone src#rev dest') imply
|
|
|
1460
|
--pull, even for local source repositories.
|
|
1460
|
--pull, even for local source repositories.
|
|
|
1461
|
|
|
1461
|
|
|
|
1462
|
In normal clone mode, the remote normalizes repository data into a common
|
|
1462
|
In normal clone mode, the remote normalizes repository data into a common
|
|
|
1463
|
exchange format and the receiving end translates this data into its local
|
|
1463
|
exchange format and the receiving end translates this data into its local
|
|
|
1464
|
storage format. --stream activates a different clone mode that essentially
|
|
1464
|
storage format. --stream activates a different clone mode that essentially
|
|
|
1465
|
copies repository files from the remote with minimal data processing. This
|
|
1465
|
copies repository files from the remote with minimal data processing. This
|
|
|
1466
|
significantly reduces the CPU cost of a clone both remotely and locally.
|
|
1466
|
significantly reduces the CPU cost of a clone both remotely and locally.
|
|
|
1467
|
However, it often increases the transferred data size by 30-40%. This can
|
|
1467
|
However, it often increases the transferred data size by 30-40%. This can
|
|
|
1468
|
result in substantially faster clones where I/O throughput is plentiful,
|
|
1468
|
result in substantially faster clones where I/O throughput is plentiful,
|
|
|
1469
|
especially for larger repositories. A side-effect of --stream clones is
|
|
1469
|
especially for larger repositories. A side-effect of --stream clones is
|
|
|
1470
|
that storage settings and requirements on the remote are applied locally:
|
|
1470
|
that storage settings and requirements on the remote are applied locally:
|
|
|
1471
|
a modern client may inherit legacy or inefficient storage used by the
|
|
1471
|
a modern client may inherit legacy or inefficient storage used by the
|
|
|
1472
|
remote or a legacy Mercurial client may not be able to clone from a
|
|
1472
|
remote or a legacy Mercurial client may not be able to clone from a
|
|
|
1473
|
modern Mercurial remote.
|
|
1473
|
modern Mercurial remote.
|
|
|
1474
|
|
|
1474
|
|
|
|
1475
|
.. note::
|
|
1475
|
.. note::
|
|
|
1476
|
|
|
1476
|
|
|
|
1477
|
Specifying a tag will include the tagged changeset but not the
|
|
1477
|
Specifying a tag will include the tagged changeset but not the
|
|
|
1478
|
changeset containing the tag.
|
|
1478
|
changeset containing the tag.
|
|
|
1479
|
|
|
1479
|
|
|
|
1480
|
.. container:: verbose
|
|
1480
|
.. container:: verbose
|
|
|
1481
|
|
|
1481
|
|
|
|
1482
|
For efficiency, hardlinks are used for cloning whenever the
|
|
1482
|
For efficiency, hardlinks are used for cloning whenever the
|
|
|
1483
|
source and destination are on the same filesystem (note this
|
|
1483
|
source and destination are on the same filesystem (note this
|
|
|
1484
|
applies only to the repository data, not to the working
|
|
1484
|
applies only to the repository data, not to the working
|
|
|
1485
|
directory). Some filesystems, such as AFS, implement hardlinking
|
|
1485
|
directory). Some filesystems, such as AFS, implement hardlinking
|
|
|
1486
|
incorrectly, but do not report errors. In these cases, use the
|
|
1486
|
incorrectly, but do not report errors. In these cases, use the
|
|
|
1487
|
--pull option to avoid hardlinking.
|
|
1487
|
--pull option to avoid hardlinking.
|
|
|
1488
|
|
|
1488
|
|
|
|
1489
|
Mercurial will update the working directory to the first applicable
|
|
1489
|
Mercurial will update the working directory to the first applicable
|
|
|
1490
|
revision from this list:
|
|
1490
|
revision from this list:
|
|
|
1491
|
|
|
1491
|
|
|
|
1492
|
a) null if -U or the source repository has no changesets
|
|
1492
|
a) null if -U or the source repository has no changesets
|
|
|
1493
|
b) if -u . and the source repository is local, the first parent of
|
|
1493
|
b) if -u . and the source repository is local, the first parent of
|
|
|
1494
|
the source repository's working directory
|
|
1494
|
the source repository's working directory
|
|
|
1495
|
c) the changeset specified with -u (if a branch name, this means the
|
|
1495
|
c) the changeset specified with -u (if a branch name, this means the
|
|
|
1496
|
latest head of that branch)
|
|
1496
|
latest head of that branch)
|
|
|
1497
|
d) the changeset specified with -r
|
|
1497
|
d) the changeset specified with -r
|
|
|
1498
|
e) the tipmost head specified with -b
|
|
1498
|
e) the tipmost head specified with -b
|
|
|
1499
|
f) the tipmost head specified with the url#branch source syntax
|
|
1499
|
f) the tipmost head specified with the url#branch source syntax
|
|
|
1500
|
g) the revision marked with the '@' bookmark, if present
|
|
1500
|
g) the revision marked with the '@' bookmark, if present
|
|
|
1501
|
h) the tipmost head of the default branch
|
|
1501
|
h) the tipmost head of the default branch
|
|
|
1502
|
i) tip
|
|
1502
|
i) tip
|
|
|
1503
|
|
|
1503
|
|
|
|
1504
|
When cloning from servers that support it, Mercurial may fetch
|
|
1504
|
When cloning from servers that support it, Mercurial may fetch
|
|
|
1505
|
pre-generated data from a server-advertised URL or inline from the
|
|
1505
|
pre-generated data from a server-advertised URL or inline from the
|
|
|
1506
|
same stream. When this is done, hooks operating on incoming changesets
|
|
1506
|
same stream. When this is done, hooks operating on incoming changesets
|
|
|
1507
|
and changegroups may fire more than once, once for each pre-generated
|
|
1507
|
and changegroups may fire more than once, once for each pre-generated
|
|
|
1508
|
bundle and as well as for any additional remaining data. In addition,
|
|
1508
|
bundle and as well as for any additional remaining data. In addition,
|
|
|
1509
|
if an error occurs, the repository may be rolled back to a partial
|
|
1509
|
if an error occurs, the repository may be rolled back to a partial
|
|
|
1510
|
clone. This behavior may change in future releases.
|
|
1510
|
clone. This behavior may change in future releases.
|
|
|
1511
|
See :hg:`help -e clonebundles` for more.
|
|
1511
|
See :hg:`help -e clonebundles` for more.
|
|
|
1512
|
|
|
1512
|
|
|
|
1513
|
Examples:
|
|
1513
|
Examples:
|
|
|
1514
|
|
|
1514
|
|
|
|
1515
|
- clone a remote repository to a new directory named hg/::
|
|
1515
|
- clone a remote repository to a new directory named hg/::
|
|
|
1516
|
|
|
1516
|
|
|
|
1517
|
hg clone https://www.mercurial-scm.org/repo/hg/
|
|
1517
|
hg clone https://www.mercurial-scm.org/repo/hg/
|
|
|
1518
|
|
|
1518
|
|
|
|
1519
|
- create a lightweight local clone::
|
|
1519
|
- create a lightweight local clone::
|
|
|
1520
|
|
|
1520
|
|
|
|
1521
|
hg clone project/ project-feature/
|
|
1521
|
hg clone project/ project-feature/
|
|
|
1522
|
|
|
1522
|
|
|
|
1523
|
- clone from an absolute path on an ssh server (note double-slash)::
|
|
1523
|
- clone from an absolute path on an ssh server (note double-slash)::
|
|
|
1524
|
|
|
1524
|
|
|
|
1525
|
hg clone ssh://user@server//home/projects/alpha/
|
|
1525
|
hg clone ssh://user@server//home/projects/alpha/
|
|
|
1526
|
|
|
1526
|
|
|
|
1527
|
- do a streaming clone while checking out a specified version::
|
|
1527
|
- do a streaming clone while checking out a specified version::
|
|
|
1528
|
|
|
1528
|
|
|
|
1529
|
hg clone --stream http://server/repo -u 1.5
|
|
1529
|
hg clone --stream http://server/repo -u 1.5
|
|
|
1530
|
|
|
1530
|
|
|
|
1531
|
- create a repository without changesets after a particular revision::
|
|
1531
|
- create a repository without changesets after a particular revision::
|
|
|
1532
|
|
|
1532
|
|
|
|
1533
|
hg clone -r 04e544 experimental/ good/
|
|
1533
|
hg clone -r 04e544 experimental/ good/
|
|
|
1534
|
|
|
1534
|
|
|
|
1535
|
- clone (and track) a particular named branch::
|
|
1535
|
- clone (and track) a particular named branch::
|
|
|
1536
|
|
|
1536
|
|
|
|
1537
|
hg clone https://www.mercurial-scm.org/repo/hg/#stable
|
|
1537
|
hg clone https://www.mercurial-scm.org/repo/hg/#stable
|
|
|
1538
|
|
|
1538
|
|
|
|
1539
|
See :hg:`help urls` for details on specifying URLs.
|
|
1539
|
See :hg:`help urls` for details on specifying URLs.
|
|
|
1540
|
|
|
1540
|
|
|
|
1541
|
Returns 0 on success.
|
|
1541
|
Returns 0 on success.
|
|
|
1542
|
"""
|
|
1542
|
"""
|
|
|
1543
|
opts = pycompat.byteskwargs(opts)
|
|
1543
|
opts = pycompat.byteskwargs(opts)
|
|
|
1544
|
if opts.get('noupdate') and opts.get('updaterev'):
|
|
1544
|
if opts.get('noupdate') and opts.get('updaterev'):
|
|
|
1545
|
raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
|
|
1545
|
raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
|
|
|
1546
|
|
|
1546
|
|
|
|
1547
|
# --include/--exclude can come from narrow or sparse.
|
|
1547
|
# --include/--exclude can come from narrow or sparse.
|
|
|
1548
|
includepats, excludepats = None, None
|
|
1548
|
includepats, excludepats = None, None
|
|
|
1549
|
|
|
1549
|
|
|
|
1550
|
# hg.clone() differentiates between None and an empty set. So make sure
|
|
1550
|
# hg.clone() differentiates between None and an empty set. So make sure
|
|
|
1551
|
# patterns are sets if narrow is requested without patterns.
|
|
1551
|
# patterns are sets if narrow is requested without patterns.
|
|
|
1552
|
if opts.get('narrow'):
|
|
1552
|
if opts.get('narrow'):
|
|
|
1553
|
includepats = set()
|
|
1553
|
includepats = set()
|
|
|
1554
|
excludepats = set()
|
|
1554
|
excludepats = set()
|
|
|
1555
|
|
|
1555
|
|
|
|
1556
|
if opts.get('include'):
|
|
1556
|
if opts.get('include'):
|
|
|
1557
|
includepats = narrowspec.parsepatterns(opts.get('include'))
|
|
1557
|
includepats = narrowspec.parsepatterns(opts.get('include'))
|
|
|
1558
|
if opts.get('exclude'):
|
|
1558
|
if opts.get('exclude'):
|
|
|
1559
|
excludepats = narrowspec.parsepatterns(opts.get('exclude'))
|
|
1559
|
excludepats = narrowspec.parsepatterns(opts.get('exclude'))
|
|
|
1560
|
|
|
1560
|
|
|
|
1561
|
r = hg.clone(ui, opts, source, dest,
|
|
1561
|
r = hg.clone(ui, opts, source, dest,
|
|
|
1562
|
pull=opts.get('pull'),
|
|
1562
|
pull=opts.get('pull'),
|
|
|
1563
|
stream=opts.get('stream') or opts.get('uncompressed'),
|
|
1563
|
stream=opts.get('stream') or opts.get('uncompressed'),
|
|
|
1564
|
revs=opts.get('rev'),
|
|
1564
|
revs=opts.get('rev'),
|
|
|
1565
|
update=opts.get('updaterev') or not opts.get('noupdate'),
|
|
1565
|
update=opts.get('updaterev') or not opts.get('noupdate'),
|
|
|
1566
|
branch=opts.get('branch'),
|
|
1566
|
branch=opts.get('branch'),
|
|
|
1567
|
shareopts=opts.get('shareopts'),
|
|
1567
|
shareopts=opts.get('shareopts'),
|
|
|
1568
|
storeincludepats=includepats,
|
|
1568
|
storeincludepats=includepats,
|
|
|
1569
|
storeexcludepats=excludepats,
|
|
1569
|
storeexcludepats=excludepats,
|
|
|
1570
|
depth=opts.get('depth') or None)
|
|
1570
|
depth=opts.get('depth') or None)
|
|
|
1571
|
|
|
1571
|
|
|
|
1572
|
return r is None
|
|
1572
|
return r is None
|
|
|
1573
|
|
|
1573
|
|
|
|
1574
|
@command('commit|ci',
|
|
1574
|
@command('commit|ci',
|
|
|
1575
|
[('A', 'addremove', None,
|
|
1575
|
[('A', 'addremove', None,
|
|
|
1576
|
_('mark new/missing files as added/removed before committing')),
|
|
1576
|
_('mark new/missing files as added/removed before committing')),
|
|
|
1577
|
('', 'close-branch', None,
|
|
1577
|
('', 'close-branch', None,
|
|
|
1578
|
_('mark a branch head as closed')),
|
|
1578
|
_('mark a branch head as closed')),
|
|
|
1579
|
('', 'amend', None, _('amend the parent of the working directory')),
|
|
1579
|
('', 'amend', None, _('amend the parent of the working directory')),
|
|
|
1580
|
('s', 'secret', None, _('use the secret phase for committing')),
|
|
1580
|
('s', 'secret', None, _('use the secret phase for committing')),
|
|
|
1581
|
('e', 'edit', None, _('invoke editor on commit messages')),
|
|
1581
|
('e', 'edit', None, _('invoke editor on commit messages')),
|
|
|
1582
|
('i', 'interactive', None, _('use interactive mode')),
|
|
1582
|
('i', 'interactive', None, _('use interactive mode')),
|
|
|
1583
|
] + walkopts + commitopts + commitopts2 + subrepoopts,
|
|
1583
|
] + walkopts + commitopts + commitopts2 + subrepoopts,
|
|
|
1584
|
_('[OPTION]... [FILE]...'),
|
|
1584
|
_('[OPTION]... [FILE]...'),
|
|
|
1585
|
helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
|
|
1585
|
helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
|
|
|
1586
|
inferrepo=True)
|
|
1586
|
inferrepo=True)
|
|
|
1587
|
def commit(ui, repo, *pats, **opts):
|
|
1587
|
def commit(ui, repo, *pats, **opts):
|
|
|
1588
|
"""commit the specified files or all outstanding changes
|
|
1588
|
"""commit the specified files or all outstanding changes
|
|
|
1589
|
|
|
1589
|
|
|
|
1590
|
Commit changes to the given files into the repository. Unlike a
|
|
1590
|
Commit changes to the given files into the repository. Unlike a
|
|
|
1591
|
centralized SCM, this operation is a local operation. See
|
|
1591
|
centralized SCM, this operation is a local operation. See
|
|
|
1592
|
:hg:`push` for a way to actively distribute your changes.
|
|
1592
|
:hg:`push` for a way to actively distribute your changes.
|
|
|
1593
|
|
|
1593
|
|
|
|
1594
|
If a list of files is omitted, all changes reported by :hg:`status`
|
|
1594
|
If a list of files is omitted, all changes reported by :hg:`status`
|
|
|
1595
|
will be committed.
|
|
1595
|
will be committed.
|
|
|
1596
|
|
|
1596
|
|
|
|
1597
|
If you are committing the result of a merge, do not provide any
|
|
1597
|
If you are committing the result of a merge, do not provide any
|
|
|
1598
|
filenames or -I/-X filters.
|
|
1598
|
filenames or -I/-X filters.
|
|
|
1599
|
|
|
1599
|
|
|
|
1600
|
If no commit message is specified, Mercurial starts your
|
|
1600
|
If no commit message is specified, Mercurial starts your
|
|
|
1601
|
configured editor where you can enter a message. In case your
|
|
1601
|
configured editor where you can enter a message. In case your
|
|
|
1602
|
commit fails, you will find a backup of your message in
|
|
1602
|
commit fails, you will find a backup of your message in
|
|
|
1603
|
``.hg/last-message.txt``.
|
|
1603
|
``.hg/last-message.txt``.
|
|
|
1604
|
|
|
1604
|
|
|
|
1605
|
The --close-branch flag can be used to mark the current branch
|
|
1605
|
The --close-branch flag can be used to mark the current branch
|
|
|
1606
|
head closed. When all heads of a branch are closed, the branch
|
|
1606
|
head closed. When all heads of a branch are closed, the branch
|
|
|
1607
|
will be considered closed and no longer listed.
|
|
1607
|
will be considered closed and no longer listed.
|
|
|
1608
|
|
|
1608
|
|
|
|
1609
|
The --amend flag can be used to amend the parent of the
|
|
1609
|
The --amend flag can be used to amend the parent of the
|
|
|
1610
|
working directory with a new commit that contains the changes
|
|
1610
|
working directory with a new commit that contains the changes
|
|
|
1611
|
in the parent in addition to those currently reported by :hg:`status`,
|
|
1611
|
in the parent in addition to those currently reported by :hg:`status`,
|
|
|
1612
|
if there are any. The old commit is stored in a backup bundle in
|
|
1612
|
if there are any. The old commit is stored in a backup bundle in
|
|
|
1613
|
``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
|
|
1613
|
``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
|
|
|
1614
|
on how to restore it).
|
|
1614
|
on how to restore it).
|
|
|
1615
|
|
|
1615
|
|
|
|
1616
|
Message, user and date are taken from the amended commit unless
|
|
1616
|
Message, user and date are taken from the amended commit unless
|
|
|
1617
|
specified. When a message isn't specified on the command line,
|
|
1617
|
specified. When a message isn't specified on the command line,
|
|
|
1618
|
the editor will open with the message of the amended commit.
|
|
1618
|
the editor will open with the message of the amended commit.
|
|
|
1619
|
|
|
1619
|
|
|
|
1620
|
It is not possible to amend public changesets (see :hg:`help phases`)
|
|
1620
|
It is not possible to amend public changesets (see :hg:`help phases`)
|
|
|
1621
|
or changesets that have children.
|
|
1621
|
or changesets that have children.
|
|
|
1622
|
|
|
1622
|
|
|
|
1623
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
1623
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
1624
|
|
|
1624
|
|
|
|
1625
|
Returns 0 on success, 1 if nothing changed.
|
|
1625
|
Returns 0 on success, 1 if nothing changed.
|
|
|
1626
|
|
|
1626
|
|
|
|
1627
|
.. container:: verbose
|
|
1627
|
.. container:: verbose
|
|
|
1628
|
|
|
1628
|
|
|
|
1629
|
Examples:
|
|
1629
|
Examples:
|
|
|
1630
|
|
|
1630
|
|
|
|
1631
|
- commit all files ending in .py::
|
|
1631
|
- commit all files ending in .py::
|
|
|
1632
|
|
|
1632
|
|
|
|
1633
|
hg commit --include "set:**.py"
|
|
1633
|
hg commit --include "set:**.py"
|
|
|
1634
|
|
|
1634
|
|
|
|
1635
|
- commit all non-binary files::
|
|
1635
|
- commit all non-binary files::
|
|
|
1636
|
|
|
1636
|
|
|
|
1637
|
hg commit --exclude "set:binary()"
|
|
1637
|
hg commit --exclude "set:binary()"
|
|
|
1638
|
|
|
1638
|
|
|
|
1639
|
- amend the current commit and set the date to now::
|
|
1639
|
- amend the current commit and set the date to now::
|
|
|
1640
|
|
|
1640
|
|
|
|
1641
|
hg commit --amend --date now
|
|
1641
|
hg commit --amend --date now
|
|
|
1642
|
"""
|
|
1642
|
"""
|
|
|
1643
|
with repo.wlock(), repo.lock():
|
|
1643
|
with repo.wlock(), repo.lock():
|
|
|
1644
|
return _docommit(ui, repo, *pats, **opts)
|
|
1644
|
return _docommit(ui, repo, *pats, **opts)
|
|
|
1645
|
|
|
1645
|
|
|
|
1646
|
def _docommit(ui, repo, *pats, **opts):
|
|
1646
|
def _docommit(ui, repo, *pats, **opts):
|
|
|
1647
|
if opts.get(r'interactive'):
|
|
1647
|
if opts.get(r'interactive'):
|
|
|
1648
|
opts.pop(r'interactive')
|
|
1648
|
opts.pop(r'interactive')
|
|
|
1649
|
ret = cmdutil.dorecord(ui, repo, commit, None, False,
|
|
1649
|
ret = cmdutil.dorecord(ui, repo, commit, None, False,
|
|
|
1650
|
cmdutil.recordfilter, *pats,
|
|
1650
|
cmdutil.recordfilter, *pats,
|
|
|
1651
|
**opts)
|
|
1651
|
**opts)
|
|
|
1652
|
# ret can be 0 (no changes to record) or the value returned by
|
|
1652
|
# ret can be 0 (no changes to record) or the value returned by
|
|
|
1653
|
# commit(), 1 if nothing changed or None on success.
|
|
1653
|
# commit(), 1 if nothing changed or None on success.
|
|
|
1654
|
return 1 if ret == 0 else ret
|
|
1654
|
return 1 if ret == 0 else ret
|
|
|
1655
|
|
|
1655
|
|
|
|
1656
|
opts = pycompat.byteskwargs(opts)
|
|
1656
|
opts = pycompat.byteskwargs(opts)
|
|
|
1657
|
if opts.get('subrepos'):
|
|
1657
|
if opts.get('subrepos'):
|
|
|
1658
|
if opts.get('amend'):
|
|
1658
|
if opts.get('amend'):
|
|
|
1659
|
raise error.Abort(_('cannot amend with --subrepos'))
|
|
1659
|
raise error.Abort(_('cannot amend with --subrepos'))
|
|
|
1660
|
# Let --subrepos on the command line override config setting.
|
|
1660
|
# Let --subrepos on the command line override config setting.
|
|
|
1661
|
ui.setconfig('ui', 'commitsubrepos', True, 'commit')
|
|
1661
|
ui.setconfig('ui', 'commitsubrepos', True, 'commit')
|
|
|
1662
|
|
|
1662
|
|
|
|
1663
|
cmdutil.checkunfinished(repo, commit=True)
|
|
1663
|
cmdutil.checkunfinished(repo, commit=True)
|
|
|
1664
|
|
|
1664
|
|
|
|
1665
|
branch = repo[None].branch()
|
|
1665
|
branch = repo[None].branch()
|
|
|
1666
|
bheads = repo.branchheads(branch)
|
|
1666
|
bheads = repo.branchheads(branch)
|
|
|
1667
|
|
|
1667
|
|
|
|
1668
|
extra = {}
|
|
1668
|
extra = {}
|
|
|
1669
|
if opts.get('close_branch'):
|
|
1669
|
if opts.get('close_branch'):
|
|
|
1670
|
extra['close'] = '1'
|
|
1670
|
extra['close'] = '1'
|
|
|
1671
|
|
|
1671
|
|
|
|
1672
|
if not bheads:
|
|
1672
|
if not bheads:
|
|
|
1673
|
raise error.Abort(_('can only close branch heads'))
|
|
1673
|
raise error.Abort(_('can only close branch heads'))
|
|
|
1674
|
elif opts.get('amend'):
|
|
1674
|
elif opts.get('amend'):
|
|
|
1675
|
if repo[None].parents()[0].p1().branch() != branch and \
|
|
1675
|
if repo[None].parents()[0].p1().branch() != branch and \
|
|
|
1676
|
repo[None].parents()[0].p2().branch() != branch:
|
|
1676
|
repo[None].parents()[0].p2().branch() != branch:
|
|
|
1677
|
raise error.Abort(_('can only close branch heads'))
|
|
1677
|
raise error.Abort(_('can only close branch heads'))
|
|
|
1678
|
|
|
1678
|
|
|
|
1679
|
if opts.get('amend'):
|
|
1679
|
if opts.get('amend'):
|
|
|
1680
|
if ui.configbool('ui', 'commitsubrepos'):
|
|
1680
|
if ui.configbool('ui', 'commitsubrepos'):
|
|
|
1681
|
raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
|
|
1681
|
raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
|
|
|
1682
|
|
|
1682
|
|
|
|
1683
|
old = repo['.']
|
|
1683
|
old = repo['.']
|
|
|
1684
|
rewriteutil.precheck(repo, [old.rev()], 'amend')
|
|
1684
|
rewriteutil.precheck(repo, [old.rev()], 'amend')
|
|
|
1685
|
|
|
1685
|
|
|
|
1686
|
# Currently histedit gets confused if an amend happens while histedit
|
|
1686
|
# Currently histedit gets confused if an amend happens while histedit
|
|
|
1687
|
# is in progress. Since we have a checkunfinished command, we are
|
|
1687
|
# is in progress. Since we have a checkunfinished command, we are
|
|
|
1688
|
# temporarily honoring it.
|
|
1688
|
# temporarily honoring it.
|
|
|
1689
|
#
|
|
1689
|
#
|
|
|
1690
|
# Note: eventually this guard will be removed. Please do not expect
|
|
1690
|
# Note: eventually this guard will be removed. Please do not expect
|
|
|
1691
|
# this behavior to remain.
|
|
1691
|
# this behavior to remain.
|
|
|
1692
|
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
1692
|
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
|
1693
|
cmdutil.checkunfinished(repo)
|
|
1693
|
cmdutil.checkunfinished(repo)
|
|
|
1694
|
|
|
1694
|
|
|
|
1695
|
node = cmdutil.amend(ui, repo, old, extra, pats, opts)
|
|
1695
|
node = cmdutil.amend(ui, repo, old, extra, pats, opts)
|
|
|
1696
|
if node == old.node():
|
|
1696
|
if node == old.node():
|
|
|
1697
|
ui.status(_("nothing changed\n"))
|
|
1697
|
ui.status(_("nothing changed\n"))
|
|
|
1698
|
return 1
|
|
1698
|
return 1
|
|
|
1699
|
else:
|
|
1699
|
else:
|
|
|
1700
|
def commitfunc(ui, repo, message, match, opts):
|
|
1700
|
def commitfunc(ui, repo, message, match, opts):
|
|
|
1701
|
overrides = {}
|
|
1701
|
overrides = {}
|
|
|
1702
|
if opts.get('secret'):
|
|
1702
|
if opts.get('secret'):
|
|
|
1703
|
overrides[('phases', 'new-commit')] = 'secret'
|
|
1703
|
overrides[('phases', 'new-commit')] = 'secret'
|
|
|
1704
|
|
|
1704
|
|
|
|
1705
|
baseui = repo.baseui
|
|
1705
|
baseui = repo.baseui
|
|
|
1706
|
with baseui.configoverride(overrides, 'commit'):
|
|
1706
|
with baseui.configoverride(overrides, 'commit'):
|
|
|
1707
|
with ui.configoverride(overrides, 'commit'):
|
|
1707
|
with ui.configoverride(overrides, 'commit'):
|
|
|
1708
|
editform = cmdutil.mergeeditform(repo[None],
|
|
1708
|
editform = cmdutil.mergeeditform(repo[None],
|
|
|
1709
|
'commit.normal')
|
|
1709
|
'commit.normal')
|
|
|
1710
|
editor = cmdutil.getcommiteditor(
|
|
1710
|
editor = cmdutil.getcommiteditor(
|
|
|
1711
|
editform=editform, **pycompat.strkwargs(opts))
|
|
1711
|
editform=editform, **pycompat.strkwargs(opts))
|
|
|
1712
|
return repo.commit(message,
|
|
1712
|
return repo.commit(message,
|
|
|
1713
|
opts.get('user'),
|
|
1713
|
opts.get('user'),
|
|
|
1714
|
opts.get('date'),
|
|
1714
|
opts.get('date'),
|
|
|
1715
|
match,
|
|
1715
|
match,
|
|
|
1716
|
editor=editor,
|
|
1716
|
editor=editor,
|
|
|
1717
|
extra=extra)
|
|
1717
|
extra=extra)
|
|
|
1718
|
|
|
1718
|
|
|
|
1719
|
node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
|
|
1719
|
node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
|
|
|
1720
|
|
|
1720
|
|
|
|
1721
|
if not node:
|
|
1721
|
if not node:
|
|
|
1722
|
stat = cmdutil.postcommitstatus(repo, pats, opts)
|
|
1722
|
stat = cmdutil.postcommitstatus(repo, pats, opts)
|
|
|
1723
|
if stat[3]:
|
|
1723
|
if stat[3]:
|
|
|
1724
|
ui.status(_("nothing changed (%d missing files, see "
|
|
1724
|
ui.status(_("nothing changed (%d missing files, see "
|
|
|
1725
|
"'hg status')\n") % len(stat[3]))
|
|
1725
|
"'hg status')\n") % len(stat[3]))
|
|
|
1726
|
else:
|
|
1726
|
else:
|
|
|
1727
|
ui.status(_("nothing changed\n"))
|
|
1727
|
ui.status(_("nothing changed\n"))
|
|
|
1728
|
return 1
|
|
1728
|
return 1
|
|
|
1729
|
|
|
1729
|
|
|
|
1730
|
cmdutil.commitstatus(repo, node, branch, bheads, opts)
|
|
1730
|
cmdutil.commitstatus(repo, node, branch, bheads, opts)
|
|
|
1731
|
|
|
1731
|
|
|
|
1732
|
@command('config|showconfig|debugconfig',
|
|
1732
|
@command('config|showconfig|debugconfig',
|
|
|
1733
|
[('u', 'untrusted', None, _('show untrusted configuration options')),
|
|
1733
|
[('u', 'untrusted', None, _('show untrusted configuration options')),
|
|
|
1734
|
('e', 'edit', None, _('edit user config')),
|
|
1734
|
('e', 'edit', None, _('edit user config')),
|
|
|
1735
|
('l', 'local', None, _('edit repository config')),
|
|
1735
|
('l', 'local', None, _('edit repository config')),
|
|
|
1736
|
('g', 'global', None, _('edit global config'))] + formatteropts,
|
|
1736
|
('g', 'global', None, _('edit global config'))] + formatteropts,
|
|
|
1737
|
_('[-u] [NAME]...'),
|
|
1737
|
_('[-u] [NAME]...'),
|
|
|
1738
|
helpcategory=command.CATEGORY_HELP,
|
|
1738
|
helpcategory=command.CATEGORY_HELP,
|
|
|
1739
|
optionalrepo=True,
|
|
1739
|
optionalrepo=True,
|
|
|
1740
|
intents={INTENT_READONLY})
|
|
1740
|
intents={INTENT_READONLY})
|
|
|
1741
|
def config(ui, repo, *values, **opts):
|
|
1741
|
def config(ui, repo, *values, **opts):
|
|
|
1742
|
"""show combined config settings from all hgrc files
|
|
1742
|
"""show combined config settings from all hgrc files
|
|
|
1743
|
|
|
1743
|
|
|
|
1744
|
With no arguments, print names and values of all config items.
|
|
1744
|
With no arguments, print names and values of all config items.
|
|
|
1745
|
|
|
1745
|
|
|
|
1746
|
With one argument of the form section.name, print just the value
|
|
1746
|
With one argument of the form section.name, print just the value
|
|
|
1747
|
of that config item.
|
|
1747
|
of that config item.
|
|
|
1748
|
|
|
1748
|
|
|
|
1749
|
With multiple arguments, print names and values of all config
|
|
1749
|
With multiple arguments, print names and values of all config
|
|
|
1750
|
items with matching section names or section.names.
|
|
1750
|
items with matching section names or section.names.
|
|
|
1751
|
|
|
1751
|
|
|
|
1752
|
With --edit, start an editor on the user-level config file. With
|
|
1752
|
With --edit, start an editor on the user-level config file. With
|
|
|
1753
|
--global, edit the system-wide config file. With --local, edit the
|
|
1753
|
--global, edit the system-wide config file. With --local, edit the
|
|
|
1754
|
repository-level config file.
|
|
1754
|
repository-level config file.
|
|
|
1755
|
|
|
1755
|
|
|
|
1756
|
With --debug, the source (filename and line number) is printed
|
|
1756
|
With --debug, the source (filename and line number) is printed
|
|
|
1757
|
for each config item.
|
|
1757
|
for each config item.
|
|
|
1758
|
|
|
1758
|
|
|
|
1759
|
See :hg:`help config` for more information about config files.
|
|
1759
|
See :hg:`help config` for more information about config files.
|
|
|
1760
|
|
|
1760
|
|
|
|
1761
|
.. container:: verbose
|
|
1761
|
.. container:: verbose
|
|
|
1762
|
|
|
1762
|
|
|
|
1763
|
Template:
|
|
1763
|
Template:
|
|
|
1764
|
|
|
1764
|
|
|
|
1765
|
The following keywords are supported. See also :hg:`help templates`.
|
|
1765
|
The following keywords are supported. See also :hg:`help templates`.
|
|
|
1766
|
|
|
1766
|
|
|
|
1767
|
:name: String. Config name.
|
|
1767
|
:name: String. Config name.
|
|
|
1768
|
:source: String. Filename and line number where the item is defined.
|
|
1768
|
:source: String. Filename and line number where the item is defined.
|
|
|
1769
|
:value: String. Config value.
|
|
1769
|
:value: String. Config value.
|
|
|
1770
|
|
|
1770
|
|
|
|
1771
|
Returns 0 on success, 1 if NAME does not exist.
|
|
1771
|
Returns 0 on success, 1 if NAME does not exist.
|
|
|
1772
|
|
|
1772
|
|
|
|
1773
|
"""
|
|
1773
|
"""
|
|
|
1774
|
|
|
1774
|
|
|
|
1775
|
opts = pycompat.byteskwargs(opts)
|
|
1775
|
opts = pycompat.byteskwargs(opts)
|
|
|
1776
|
if opts.get('edit') or opts.get('local') or opts.get('global'):
|
|
1776
|
if opts.get('edit') or opts.get('local') or opts.get('global'):
|
|
|
1777
|
if opts.get('local') and opts.get('global'):
|
|
1777
|
if opts.get('local') and opts.get('global'):
|
|
|
1778
|
raise error.Abort(_("can't use --local and --global together"))
|
|
1778
|
raise error.Abort(_("can't use --local and --global together"))
|
|
|
1779
|
|
|
1779
|
|
|
|
1780
|
if opts.get('local'):
|
|
1780
|
if opts.get('local'):
|
|
|
1781
|
if not repo:
|
|
1781
|
if not repo:
|
|
|
1782
|
raise error.Abort(_("can't use --local outside a repository"))
|
|
1782
|
raise error.Abort(_("can't use --local outside a repository"))
|
|
|
1783
|
paths = [repo.vfs.join('hgrc')]
|
|
1783
|
paths = [repo.vfs.join('hgrc')]
|
|
|
1784
|
elif opts.get('global'):
|
|
1784
|
elif opts.get('global'):
|
|
|
1785
|
paths = rcutil.systemrcpath()
|
|
1785
|
paths = rcutil.systemrcpath()
|
|
|
1786
|
else:
|
|
1786
|
else:
|
|
|
1787
|
paths = rcutil.userrcpath()
|
|
1787
|
paths = rcutil.userrcpath()
|
|
|
1788
|
|
|
1788
|
|
|
|
1789
|
for f in paths:
|
|
1789
|
for f in paths:
|
|
|
1790
|
if os.path.exists(f):
|
|
1790
|
if os.path.exists(f):
|
|
|
1791
|
break
|
|
1791
|
break
|
|
|
1792
|
else:
|
|
1792
|
else:
|
|
|
1793
|
if opts.get('global'):
|
|
1793
|
if opts.get('global'):
|
|
|
1794
|
samplehgrc = uimod.samplehgrcs['global']
|
|
1794
|
samplehgrc = uimod.samplehgrcs['global']
|
|
|
1795
|
elif opts.get('local'):
|
|
1795
|
elif opts.get('local'):
|
|
|
1796
|
samplehgrc = uimod.samplehgrcs['local']
|
|
1796
|
samplehgrc = uimod.samplehgrcs['local']
|
|
|
1797
|
else:
|
|
1797
|
else:
|
|
|
1798
|
samplehgrc = uimod.samplehgrcs['user']
|
|
1798
|
samplehgrc = uimod.samplehgrcs['user']
|
|
|
1799
|
|
|
1799
|
|
|
|
1800
|
f = paths[0]
|
|
1800
|
f = paths[0]
|
|
|
1801
|
fp = open(f, "wb")
|
|
1801
|
fp = open(f, "wb")
|
|
|
1802
|
fp.write(util.tonativeeol(samplehgrc))
|
|
1802
|
fp.write(util.tonativeeol(samplehgrc))
|
|
|
1803
|
fp.close()
|
|
1803
|
fp.close()
|
|
|
1804
|
|
|
1804
|
|
|
|
1805
|
editor = ui.geteditor()
|
|
1805
|
editor = ui.geteditor()
|
|
|
1806
|
ui.system("%s \"%s\"" % (editor, f),
|
|
1806
|
ui.system("%s \"%s\"" % (editor, f),
|
|
|
1807
|
onerr=error.Abort, errprefix=_("edit failed"),
|
|
1807
|
onerr=error.Abort, errprefix=_("edit failed"),
|
|
|
1808
|
blockedtag='config_edit')
|
|
1808
|
blockedtag='config_edit')
|
|
|
1809
|
return
|
|
1809
|
return
|
|
|
1810
|
ui.pager('config')
|
|
1810
|
ui.pager('config')
|
|
|
1811
|
fm = ui.formatter('config', opts)
|
|
1811
|
fm = ui.formatter('config', opts)
|
|
|
1812
|
for t, f in rcutil.rccomponents():
|
|
1812
|
for t, f in rcutil.rccomponents():
|
|
|
1813
|
if t == 'path':
|
|
1813
|
if t == 'path':
|
|
|
1814
|
ui.debug('read config from: %s\n' % f)
|
|
1814
|
ui.debug('read config from: %s\n' % f)
|
|
|
1815
|
elif t == 'items':
|
|
1815
|
elif t == 'items':
|
|
|
1816
|
for section, name, value, source in f:
|
|
1816
|
for section, name, value, source in f:
|
|
|
1817
|
ui.debug('set config by: %s\n' % source)
|
|
1817
|
ui.debug('set config by: %s\n' % source)
|
|
|
1818
|
else:
|
|
1818
|
else:
|
|
|
1819
|
raise error.ProgrammingError('unknown rctype: %s' % t)
|
|
1819
|
raise error.ProgrammingError('unknown rctype: %s' % t)
|
|
|
1820
|
untrusted = bool(opts.get('untrusted'))
|
|
1820
|
untrusted = bool(opts.get('untrusted'))
|
|
|
1821
|
|
|
1821
|
|
|
|
1822
|
selsections = selentries = []
|
|
1822
|
selsections = selentries = []
|
|
|
1823
|
if values:
|
|
1823
|
if values:
|
|
|
1824
|
selsections = [v for v in values if '.' not in v]
|
|
1824
|
selsections = [v for v in values if '.' not in v]
|
|
|
1825
|
selentries = [v for v in values if '.' in v]
|
|
1825
|
selentries = [v for v in values if '.' in v]
|
|
|
1826
|
uniquesel = (len(selentries) == 1 and not selsections)
|
|
1826
|
uniquesel = (len(selentries) == 1 and not selsections)
|
|
|
1827
|
selsections = set(selsections)
|
|
1827
|
selsections = set(selsections)
|
|
|
1828
|
selentries = set(selentries)
|
|
1828
|
selentries = set(selentries)
|
|
|
1829
|
|
|
1829
|
|
|
|
1830
|
matched = False
|
|
1830
|
matched = False
|
|
|
1831
|
for section, name, value in ui.walkconfig(untrusted=untrusted):
|
|
1831
|
for section, name, value in ui.walkconfig(untrusted=untrusted):
|
|
|
1832
|
source = ui.configsource(section, name, untrusted)
|
|
1832
|
source = ui.configsource(section, name, untrusted)
|
|
|
1833
|
value = pycompat.bytestr(value)
|
|
1833
|
value = pycompat.bytestr(value)
|
|
|
1834
|
if fm.isplain():
|
|
1834
|
if fm.isplain():
|
|
|
1835
|
source = source or 'none'
|
|
1835
|
source = source or 'none'
|
|
|
1836
|
value = value.replace('\n', '\\n')
|
|
1836
|
value = value.replace('\n', '\\n')
|
|
|
1837
|
entryname = section + '.' + name
|
|
1837
|
entryname = section + '.' + name
|
|
|
1838
|
if values and not (section in selsections or entryname in selentries):
|
|
1838
|
if values and not (section in selsections or entryname in selentries):
|
|
|
1839
|
continue
|
|
1839
|
continue
|
|
|
1840
|
fm.startitem()
|
|
1840
|
fm.startitem()
|
|
|
1841
|
fm.condwrite(ui.debugflag, 'source', '%s: ', source)
|
|
1841
|
fm.condwrite(ui.debugflag, 'source', '%s: ', source)
|
|
|
1842
|
if uniquesel:
|
|
1842
|
if uniquesel:
|
|
|
1843
|
fm.data(name=entryname)
|
|
1843
|
fm.data(name=entryname)
|
|
|
1844
|
fm.write('value', '%s\n', value)
|
|
1844
|
fm.write('value', '%s\n', value)
|
|
|
1845
|
else:
|
|
1845
|
else:
|
|
|
1846
|
fm.write('name value', '%s=%s\n', entryname, value)
|
|
1846
|
fm.write('name value', '%s=%s\n', entryname, value)
|
|
|
1847
|
matched = True
|
|
1847
|
matched = True
|
|
|
1848
|
fm.end()
|
|
1848
|
fm.end()
|
|
|
1849
|
if matched:
|
|
1849
|
if matched:
|
|
|
1850
|
return 0
|
|
1850
|
return 0
|
|
|
1851
|
return 1
|
|
1851
|
return 1
|
|
|
1852
|
|
|
1852
|
|
|
|
1853
|
@command('copy|cp',
|
|
1853
|
@command('copy|cp',
|
|
|
1854
|
[('A', 'after', None, _('record a copy that has already occurred')),
|
|
1854
|
[('A', 'after', None, _('record a copy that has already occurred')),
|
|
|
1855
|
('f', 'force', None, _('forcibly copy over an existing managed file')),
|
|
1855
|
('f', 'force', None, _('forcibly copy over an existing managed file')),
|
|
|
1856
|
] + walkopts + dryrunopts,
|
|
1856
|
] + walkopts + dryrunopts,
|
|
|
1857
|
_('[OPTION]... [SOURCE]... DEST'),
|
|
1857
|
_('[OPTION]... [SOURCE]... DEST'),
|
|
|
1858
|
helpcategory=command.CATEGORY_FILE_CONTENTS)
|
|
1858
|
helpcategory=command.CATEGORY_FILE_CONTENTS)
|
|
|
1859
|
def copy(ui, repo, *pats, **opts):
|
|
1859
|
def copy(ui, repo, *pats, **opts):
|
|
|
1860
|
"""mark files as copied for the next commit
|
|
1860
|
"""mark files as copied for the next commit
|
|
|
1861
|
|
|
1861
|
|
|
|
1862
|
Mark dest as having copies of source files. If dest is a
|
|
1862
|
Mark dest as having copies of source files. If dest is a
|
|
|
1863
|
directory, copies are put in that directory. If dest is a file,
|
|
1863
|
directory, copies are put in that directory. If dest is a file,
|
|
|
1864
|
the source must be a single file.
|
|
1864
|
the source must be a single file.
|
|
|
1865
|
|
|
1865
|
|
|
|
1866
|
By default, this command copies the contents of files as they
|
|
1866
|
By default, this command copies the contents of files as they
|
|
|
1867
|
exist in the working directory. If invoked with -A/--after, the
|
|
1867
|
exist in the working directory. If invoked with -A/--after, the
|
|
|
1868
|
operation is recorded, but no copying is performed.
|
|
1868
|
operation is recorded, but no copying is performed.
|
|
|
1869
|
|
|
1869
|
|
|
|
1870
|
This command takes effect with the next commit. To undo a copy
|
|
1870
|
This command takes effect with the next commit. To undo a copy
|
|
|
1871
|
before that, see :hg:`revert`.
|
|
1871
|
before that, see :hg:`revert`.
|
|
|
1872
|
|
|
1872
|
|
|
|
1873
|
Returns 0 on success, 1 if errors are encountered.
|
|
1873
|
Returns 0 on success, 1 if errors are encountered.
|
|
|
1874
|
"""
|
|
1874
|
"""
|
|
|
1875
|
opts = pycompat.byteskwargs(opts)
|
|
1875
|
opts = pycompat.byteskwargs(opts)
|
|
|
1876
|
with repo.wlock(False):
|
|
1876
|
with repo.wlock(False):
|
|
|
1877
|
return cmdutil.copy(ui, repo, pats, opts)
|
|
1877
|
return cmdutil.copy(ui, repo, pats, opts)
|
|
|
1878
|
|
|
1878
|
|
|
|
1879
|
@command(
|
|
1879
|
@command(
|
|
|
1880
|
'debugcommands', [], _('[COMMAND]'),
|
|
1880
|
'debugcommands', [], _('[COMMAND]'),
|
|
|
1881
|
helpcategory=command.CATEGORY_HELP,
|
|
1881
|
helpcategory=command.CATEGORY_HELP,
|
|
|
1882
|
norepo=True)
|
|
1882
|
norepo=True)
|
|
|
1883
|
def debugcommands(ui, cmd='', *args):
|
|
1883
|
def debugcommands(ui, cmd='', *args):
|
|
|
1884
|
"""list all available commands and options"""
|
|
1884
|
"""list all available commands and options"""
|
|
|
1885
|
for cmd, vals in sorted(table.iteritems()):
|
|
1885
|
for cmd, vals in sorted(table.iteritems()):
|
|
|
1886
|
cmd = cmd.split('|')[0]
|
|
1886
|
cmd = cmd.split('|')[0]
|
|
|
1887
|
opts = ', '.join([i[1] for i in vals[1]])
|
|
1887
|
opts = ', '.join([i[1] for i in vals[1]])
|
|
|
1888
|
ui.write('%s: %s\n' % (cmd, opts))
|
|
1888
|
ui.write('%s: %s\n' % (cmd, opts))
|
|
|
1889
|
|
|
1889
|
|
|
|
1890
|
@command('debugcomplete',
|
|
1890
|
@command('debugcomplete',
|
|
|
1891
|
[('o', 'options', None, _('show the command options'))],
|
|
1891
|
[('o', 'options', None, _('show the command options'))],
|
|
|
1892
|
_('[-o] CMD'),
|
|
1892
|
_('[-o] CMD'),
|
|
|
1893
|
helpcategory=command.CATEGORY_HELP,
|
|
1893
|
helpcategory=command.CATEGORY_HELP,
|
|
|
1894
|
norepo=True)
|
|
1894
|
norepo=True)
|
|
|
1895
|
def debugcomplete(ui, cmd='', **opts):
|
|
1895
|
def debugcomplete(ui, cmd='', **opts):
|
|
|
1896
|
"""returns the completion list associated with the given command"""
|
|
1896
|
"""returns the completion list associated with the given command"""
|
|
|
1897
|
|
|
1897
|
|
|
|
1898
|
if opts.get(r'options'):
|
|
1898
|
if opts.get(r'options'):
|
|
|
1899
|
options = []
|
|
1899
|
options = []
|
|
|
1900
|
otables = [globalopts]
|
|
1900
|
otables = [globalopts]
|
|
|
1901
|
if cmd:
|
|
1901
|
if cmd:
|
|
|
1902
|
aliases, entry = cmdutil.findcmd(cmd, table, False)
|
|
1902
|
aliases, entry = cmdutil.findcmd(cmd, table, False)
|
|
|
1903
|
otables.append(entry[1])
|
|
1903
|
otables.append(entry[1])
|
|
|
1904
|
for t in otables:
|
|
1904
|
for t in otables:
|
|
|
1905
|
for o in t:
|
|
1905
|
for o in t:
|
|
|
1906
|
if "(DEPRECATED)" in o[3]:
|
|
1906
|
if "(DEPRECATED)" in o[3]:
|
|
|
1907
|
continue
|
|
1907
|
continue
|
|
|
1908
|
if o[0]:
|
|
1908
|
if o[0]:
|
|
|
1909
|
options.append('-%s' % o[0])
|
|
1909
|
options.append('-%s' % o[0])
|
|
|
1910
|
options.append('--%s' % o[1])
|
|
1910
|
options.append('--%s' % o[1])
|
|
|
1911
|
ui.write("%s\n" % "\n".join(options))
|
|
1911
|
ui.write("%s\n" % "\n".join(options))
|
|
|
1912
|
return
|
|
1912
|
return
|
|
|
1913
|
|
|
1913
|
|
|
|
1914
|
cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
|
|
1914
|
cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
|
|
|
1915
|
if ui.verbose:
|
|
1915
|
if ui.verbose:
|
|
|
1916
|
cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
|
|
1916
|
cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
|
|
|
1917
|
ui.write("%s\n" % "\n".join(sorted(cmdlist)))
|
|
1917
|
ui.write("%s\n" % "\n".join(sorted(cmdlist)))
|
|
|
1918
|
|
|
1918
|
|
|
|
1919
|
@command('diff',
|
|
1919
|
@command('diff',
|
|
|
1920
|
[('r', 'rev', [], _('revision'), _('REV')),
|
|
1920
|
[('r', 'rev', [], _('revision'), _('REV')),
|
|
|
1921
|
('c', 'change', '', _('change made by revision'), _('REV'))
|
|
1921
|
('c', 'change', '', _('change made by revision'), _('REV'))
|
|
|
1922
|
] + diffopts + diffopts2 + walkopts + subrepoopts,
|
|
1922
|
] + diffopts + diffopts2 + walkopts + subrepoopts,
|
|
|
1923
|
_('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
|
|
1923
|
_('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
|
|
|
1924
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
1924
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
1925
|
helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
|
|
1925
|
helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
|
|
|
1926
|
def diff(ui, repo, *pats, **opts):
|
|
1926
|
def diff(ui, repo, *pats, **opts):
|
|
|
1927
|
"""diff repository (or selected files)
|
|
1927
|
"""diff repository (or selected files)
|
|
|
1928
|
|
|
1928
|
|
|
|
1929
|
Show differences between revisions for the specified files.
|
|
1929
|
Show differences between revisions for the specified files.
|
|
|
1930
|
|
|
1930
|
|
|
|
1931
|
Differences between files are shown using the unified diff format.
|
|
1931
|
Differences between files are shown using the unified diff format.
|
|
|
1932
|
|
|
1932
|
|
|
|
1933
|
.. note::
|
|
1933
|
.. note::
|
|
|
1934
|
|
|
1934
|
|
|
|
1935
|
:hg:`diff` may generate unexpected results for merges, as it will
|
|
1935
|
:hg:`diff` may generate unexpected results for merges, as it will
|
|
|
1936
|
default to comparing against the working directory's first
|
|
1936
|
default to comparing against the working directory's first
|
|
|
1937
|
parent changeset if no revisions are specified.
|
|
1937
|
parent changeset if no revisions are specified.
|
|
|
1938
|
|
|
1938
|
|
|
|
1939
|
When two revision arguments are given, then changes are shown
|
|
1939
|
When two revision arguments are given, then changes are shown
|
|
|
1940
|
between those revisions. If only one revision is specified then
|
|
1940
|
between those revisions. If only one revision is specified then
|
|
|
1941
|
that revision is compared to the working directory, and, when no
|
|
1941
|
that revision is compared to the working directory, and, when no
|
|
|
1942
|
revisions are specified, the working directory files are compared
|
|
1942
|
revisions are specified, the working directory files are compared
|
|
|
1943
|
to its first parent.
|
|
1943
|
to its first parent.
|
|
|
1944
|
|
|
1944
|
|
|
|
1945
|
Alternatively you can specify -c/--change with a revision to see
|
|
1945
|
Alternatively you can specify -c/--change with a revision to see
|
|
|
1946
|
the changes in that changeset relative to its first parent.
|
|
1946
|
the changes in that changeset relative to its first parent.
|
|
|
1947
|
|
|
1947
|
|
|
|
1948
|
Without the -a/--text option, diff will avoid generating diffs of
|
|
1948
|
Without the -a/--text option, diff will avoid generating diffs of
|
|
|
1949
|
files it detects as binary. With -a, diff will generate a diff
|
|
1949
|
files it detects as binary. With -a, diff will generate a diff
|
|
|
1950
|
anyway, probably with undesirable results.
|
|
1950
|
anyway, probably with undesirable results.
|
|
|
1951
|
|
|
1951
|
|
|
|
1952
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
1952
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
|
1953
|
format. For more information, read :hg:`help diffs`.
|
|
1953
|
format. For more information, read :hg:`help diffs`.
|
|
|
1954
|
|
|
1954
|
|
|
|
1955
|
.. container:: verbose
|
|
1955
|
.. container:: verbose
|
|
|
1956
|
|
|
1956
|
|
|
|
1957
|
Examples:
|
|
1957
|
Examples:
|
|
|
1958
|
|
|
1958
|
|
|
|
1959
|
- compare a file in the current working directory to its parent::
|
|
1959
|
- compare a file in the current working directory to its parent::
|
|
|
1960
|
|
|
1960
|
|
|
|
1961
|
hg diff foo.c
|
|
1961
|
hg diff foo.c
|
|
|
1962
|
|
|
1962
|
|
|
|
1963
|
- compare two historical versions of a directory, with rename info::
|
|
1963
|
- compare two historical versions of a directory, with rename info::
|
|
|
1964
|
|
|
1964
|
|
|
|
1965
|
hg diff --git -r 1.0:1.2 lib/
|
|
1965
|
hg diff --git -r 1.0:1.2 lib/
|
|
|
1966
|
|
|
1966
|
|
|
|
1967
|
- get change stats relative to the last change on some date::
|
|
1967
|
- get change stats relative to the last change on some date::
|
|
|
1968
|
|
|
1968
|
|
|
|
1969
|
hg diff --stat -r "date('may 2')"
|
|
1969
|
hg diff --stat -r "date('may 2')"
|
|
|
1970
|
|
|
1970
|
|
|
|
1971
|
- diff all newly-added files that contain a keyword::
|
|
1971
|
- diff all newly-added files that contain a keyword::
|
|
|
1972
|
|
|
1972
|
|
|
|
1973
|
hg diff "set:added() and grep(GNU)"
|
|
1973
|
hg diff "set:added() and grep(GNU)"
|
|
|
1974
|
|
|
1974
|
|
|
|
1975
|
- compare a revision and its parents::
|
|
1975
|
- compare a revision and its parents::
|
|
|
1976
|
|
|
1976
|
|
|
|
1977
|
hg diff -c 9353 # compare against first parent
|
|
1977
|
hg diff -c 9353 # compare against first parent
|
|
|
1978
|
hg diff -r 9353^:9353 # same using revset syntax
|
|
1978
|
hg diff -r 9353^:9353 # same using revset syntax
|
|
|
1979
|
hg diff -r 9353^2:9353 # compare against the second parent
|
|
1979
|
hg diff -r 9353^2:9353 # compare against the second parent
|
|
|
1980
|
|
|
1980
|
|
|
|
1981
|
Returns 0 on success.
|
|
1981
|
Returns 0 on success.
|
|
|
1982
|
"""
|
|
1982
|
"""
|
|
|
1983
|
|
|
1983
|
|
|
|
1984
|
opts = pycompat.byteskwargs(opts)
|
|
1984
|
opts = pycompat.byteskwargs(opts)
|
|
|
1985
|
revs = opts.get('rev')
|
|
1985
|
revs = opts.get('rev')
|
|
|
1986
|
change = opts.get('change')
|
|
1986
|
change = opts.get('change')
|
|
|
1987
|
stat = opts.get('stat')
|
|
1987
|
stat = opts.get('stat')
|
|
|
1988
|
reverse = opts.get('reverse')
|
|
1988
|
reverse = opts.get('reverse')
|
|
|
1989
|
|
|
1989
|
|
|
|
1990
|
if revs and change:
|
|
1990
|
if revs and change:
|
|
|
1991
|
msg = _('cannot specify --rev and --change at the same time')
|
|
1991
|
msg = _('cannot specify --rev and --change at the same time')
|
|
|
1992
|
raise error.Abort(msg)
|
|
1992
|
raise error.Abort(msg)
|
|
|
1993
|
elif change:
|
|
1993
|
elif change:
|
|
|
1994
|
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
|
|
1994
|
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
|
|
|
1995
|
ctx2 = scmutil.revsingle(repo, change, None)
|
|
1995
|
ctx2 = scmutil.revsingle(repo, change, None)
|
|
|
1996
|
ctx1 = ctx2.p1()
|
|
1996
|
ctx1 = ctx2.p1()
|
|
|
1997
|
else:
|
|
1997
|
else:
|
|
|
1998
|
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
|
|
1998
|
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
|
|
|
1999
|
ctx1, ctx2 = scmutil.revpair(repo, revs)
|
|
1999
|
ctx1, ctx2 = scmutil.revpair(repo, revs)
|
|
|
2000
|
node1, node2 = ctx1.node(), ctx2.node()
|
|
2000
|
node1, node2 = ctx1.node(), ctx2.node()
|
|
|
2001
|
|
|
2001
|
|
|
|
2002
|
if reverse:
|
|
2002
|
if reverse:
|
|
|
2003
|
node1, node2 = node2, node1
|
|
2003
|
node1, node2 = node2, node1
|
|
|
2004
|
|
|
2004
|
|
|
|
2005
|
diffopts = patch.diffallopts(ui, opts)
|
|
2005
|
diffopts = patch.diffallopts(ui, opts)
|
|
|
2006
|
m = scmutil.match(ctx2, pats, opts)
|
|
2006
|
m = scmutil.match(ctx2, pats, opts)
|
|
|
2007
|
m = repo.narrowmatch(m)
|
|
2007
|
m = repo.narrowmatch(m)
|
|
|
2008
|
ui.pager('diff')
|
|
2008
|
ui.pager('diff')
|
|
|
2009
|
logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
|
|
2009
|
logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
|
|
|
2010
|
listsubrepos=opts.get('subrepos'),
|
|
2010
|
listsubrepos=opts.get('subrepos'),
|
|
|
2011
|
root=opts.get('root'))
|
|
2011
|
root=opts.get('root'))
|
|
|
2012
|
|
|
2012
|
|
|
|
2013
|
@command('export',
|
|
2013
|
@command('export',
|
|
|
2014
|
[('B', 'bookmark', '',
|
|
2014
|
[('B', 'bookmark', '',
|
|
|
2015
|
_('export changes only reachable by given bookmark'), _('BOOKMARK')),
|
|
2015
|
_('export changes only reachable by given bookmark'), _('BOOKMARK')),
|
|
|
2016
|
('o', 'output', '',
|
|
2016
|
('o', 'output', '',
|
|
|
2017
|
_('print output to file with formatted name'), _('FORMAT')),
|
|
2017
|
_('print output to file with formatted name'), _('FORMAT')),
|
|
|
2018
|
('', 'switch-parent', None, _('diff against the second parent')),
|
|
2018
|
('', 'switch-parent', None, _('diff against the second parent')),
|
|
|
2019
|
('r', 'rev', [], _('revisions to export'), _('REV')),
|
|
2019
|
('r', 'rev', [], _('revisions to export'), _('REV')),
|
|
|
2020
|
] + diffopts + formatteropts,
|
|
2020
|
] + diffopts + formatteropts,
|
|
|
2021
|
_('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
|
|
2021
|
_('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
|
|
|
2022
|
helpcategory=command.CATEGORY_IMPORT_EXPORT,
|
|
2022
|
helpcategory=command.CATEGORY_IMPORT_EXPORT,
|
|
|
2023
|
helpbasic=True, intents={INTENT_READONLY})
|
|
2023
|
helpbasic=True, intents={INTENT_READONLY})
|
|
|
2024
|
def export(ui, repo, *changesets, **opts):
|
|
2024
|
def export(ui, repo, *changesets, **opts):
|
|
|
2025
|
"""dump the header and diffs for one or more changesets
|
|
2025
|
"""dump the header and diffs for one or more changesets
|
|
|
2026
|
|
|
2026
|
|
|
|
2027
|
Print the changeset header and diffs for one or more revisions.
|
|
2027
|
Print the changeset header and diffs for one or more revisions.
|
|
|
2028
|
If no revision is given, the parent of the working directory is used.
|
|
2028
|
If no revision is given, the parent of the working directory is used.
|
|
|
2029
|
|
|
2029
|
|
|
|
2030
|
The information shown in the changeset header is: author, date,
|
|
2030
|
The information shown in the changeset header is: author, date,
|
|
|
2031
|
branch name (if non-default), changeset hash, parent(s) and commit
|
|
2031
|
branch name (if non-default), changeset hash, parent(s) and commit
|
|
|
2032
|
comment.
|
|
2032
|
comment.
|
|
|
2033
|
|
|
2033
|
|
|
|
2034
|
.. note::
|
|
2034
|
.. note::
|
|
|
2035
|
|
|
2035
|
|
|
|
2036
|
:hg:`export` may generate unexpected diff output for merge
|
|
2036
|
:hg:`export` may generate unexpected diff output for merge
|
|
|
2037
|
changesets, as it will compare the merge changeset against its
|
|
2037
|
changesets, as it will compare the merge changeset against its
|
|
|
2038
|
first parent only.
|
|
2038
|
first parent only.
|
|
|
2039
|
|
|
2039
|
|
|
|
2040
|
Output may be to a file, in which case the name of the file is
|
|
2040
|
Output may be to a file, in which case the name of the file is
|
|
|
2041
|
given using a template string. See :hg:`help templates`. In addition
|
|
2041
|
given using a template string. See :hg:`help templates`. In addition
|
|
|
2042
|
to the common template keywords, the following formatting rules are
|
|
2042
|
to the common template keywords, the following formatting rules are
|
|
|
2043
|
supported:
|
|
2043
|
supported:
|
|
|
2044
|
|
|
2044
|
|
|
|
2045
|
:``%%``: literal "%" character
|
|
2045
|
:``%%``: literal "%" character
|
|
|
2046
|
:``%H``: changeset hash (40 hexadecimal digits)
|
|
2046
|
:``%H``: changeset hash (40 hexadecimal digits)
|
|
|
2047
|
:``%N``: number of patches being generated
|
|
2047
|
:``%N``: number of patches being generated
|
|
|
2048
|
:``%R``: changeset revision number
|
|
2048
|
:``%R``: changeset revision number
|
|
|
2049
|
:``%b``: basename of the exporting repository
|
|
2049
|
:``%b``: basename of the exporting repository
|
|
|
2050
|
:``%h``: short-form changeset hash (12 hexadecimal digits)
|
|
2050
|
:``%h``: short-form changeset hash (12 hexadecimal digits)
|
|
|
2051
|
:``%m``: first line of the commit message (only alphanumeric characters)
|
|
2051
|
:``%m``: first line of the commit message (only alphanumeric characters)
|
|
|
2052
|
:``%n``: zero-padded sequence number, starting at 1
|
|
2052
|
:``%n``: zero-padded sequence number, starting at 1
|
|
|
2053
|
:``%r``: zero-padded changeset revision number
|
|
2053
|
:``%r``: zero-padded changeset revision number
|
|
|
2054
|
:``\\``: literal "\\" character
|
|
2054
|
:``\\``: literal "\\" character
|
|
|
2055
|
|
|
2055
|
|
|
|
2056
|
Without the -a/--text option, export will avoid generating diffs
|
|
2056
|
Without the -a/--text option, export will avoid generating diffs
|
|
|
2057
|
of files it detects as binary. With -a, export will generate a
|
|
2057
|
of files it detects as binary. With -a, export will generate a
|
|
|
2058
|
diff anyway, probably with undesirable results.
|
|
2058
|
diff anyway, probably with undesirable results.
|
|
|
2059
|
|
|
2059
|
|
|
|
2060
|
With -B/--bookmark changesets reachable by the given bookmark are
|
|
2060
|
With -B/--bookmark changesets reachable by the given bookmark are
|
|
|
2061
|
selected.
|
|
2061
|
selected.
|
|
|
2062
|
|
|
2062
|
|
|
|
2063
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
2063
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
|
2064
|
format. See :hg:`help diffs` for more information.
|
|
2064
|
format. See :hg:`help diffs` for more information.
|
|
|
2065
|
|
|
2065
|
|
|
|
2066
|
With the --switch-parent option, the diff will be against the
|
|
2066
|
With the --switch-parent option, the diff will be against the
|
|
|
2067
|
second parent. It can be useful to review a merge.
|
|
2067
|
second parent. It can be useful to review a merge.
|
|
|
2068
|
|
|
2068
|
|
|
|
2069
|
.. container:: verbose
|
|
2069
|
.. container:: verbose
|
|
|
2070
|
|
|
2070
|
|
|
|
2071
|
Template:
|
|
2071
|
Template:
|
|
|
2072
|
|
|
2072
|
|
|
|
2073
|
The following keywords are supported in addition to the common template
|
|
2073
|
The following keywords are supported in addition to the common template
|
|
|
2074
|
keywords and functions. See also :hg:`help templates`.
|
|
2074
|
keywords and functions. See also :hg:`help templates`.
|
|
|
2075
|
|
|
2075
|
|
|
|
2076
|
:diff: String. Diff content.
|
|
2076
|
:diff: String. Diff content.
|
|
|
2077
|
:parents: List of strings. Parent nodes of the changeset.
|
|
2077
|
:parents: List of strings. Parent nodes of the changeset.
|
|
|
2078
|
|
|
2078
|
|
|
|
2079
|
Examples:
|
|
2079
|
Examples:
|
|
|
2080
|
|
|
2080
|
|
|
|
2081
|
- use export and import to transplant a bugfix to the current
|
|
2081
|
- use export and import to transplant a bugfix to the current
|
|
|
2082
|
branch::
|
|
2082
|
branch::
|
|
|
2083
|
|
|
2083
|
|
|
|
2084
|
hg export -r 9353 | hg import -
|
|
2084
|
hg export -r 9353 | hg import -
|
|
|
2085
|
|
|
2085
|
|
|
|
2086
|
- export all the changesets between two revisions to a file with
|
|
2086
|
- export all the changesets between two revisions to a file with
|
|
|
2087
|
rename information::
|
|
2087
|
rename information::
|
|
|
2088
|
|
|
2088
|
|
|
|
2089
|
hg export --git -r 123:150 > changes.txt
|
|
2089
|
hg export --git -r 123:150 > changes.txt
|
|
|
2090
|
|
|
2090
|
|
|
|
2091
|
- split outgoing changes into a series of patches with
|
|
2091
|
- split outgoing changes into a series of patches with
|
|
|
2092
|
descriptive names::
|
|
2092
|
descriptive names::
|
|
|
2093
|
|
|
2093
|
|
|
|
2094
|
hg export -r "outgoing()" -o "%n-%m.patch"
|
|
2094
|
hg export -r "outgoing()" -o "%n-%m.patch"
|
|
|
2095
|
|
|
2095
|
|
|
|
2096
|
Returns 0 on success.
|
|
2096
|
Returns 0 on success.
|
|
|
2097
|
"""
|
|
2097
|
"""
|
|
|
2098
|
opts = pycompat.byteskwargs(opts)
|
|
2098
|
opts = pycompat.byteskwargs(opts)
|
|
|
2099
|
bookmark = opts.get('bookmark')
|
|
2099
|
bookmark = opts.get('bookmark')
|
|
|
2100
|
changesets += tuple(opts.get('rev', []))
|
|
2100
|
changesets += tuple(opts.get('rev', []))
|
|
|
2101
|
|
|
2101
|
|
|
|
2102
|
if bookmark and changesets:
|
|
2102
|
if bookmark and changesets:
|
|
|
2103
|
raise error.Abort(_("-r and -B are mutually exclusive"))
|
|
2103
|
raise error.Abort(_("-r and -B are mutually exclusive"))
|
|
|
2104
|
|
|
2104
|
|
|
|
2105
|
if bookmark:
|
|
2105
|
if bookmark:
|
|
|
2106
|
if bookmark not in repo._bookmarks:
|
|
2106
|
if bookmark not in repo._bookmarks:
|
|
|
2107
|
raise error.Abort(_("bookmark '%s' not found") % bookmark)
|
|
2107
|
raise error.Abort(_("bookmark '%s' not found") % bookmark)
|
|
|
2108
|
|
|
2108
|
|
|
|
2109
|
revs = scmutil.bookmarkrevs(repo, bookmark)
|
|
2109
|
revs = scmutil.bookmarkrevs(repo, bookmark)
|
|
|
2110
|
else:
|
|
2110
|
else:
|
|
|
2111
|
if not changesets:
|
|
2111
|
if not changesets:
|
|
|
2112
|
changesets = ['.']
|
|
2112
|
changesets = ['.']
|
|
|
2113
|
|
|
2113
|
|
|
|
2114
|
repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
|
|
2114
|
repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
|
|
|
2115
|
revs = scmutil.revrange(repo, changesets)
|
|
2115
|
revs = scmutil.revrange(repo, changesets)
|
|
|
2116
|
|
|
2116
|
|
|
|
2117
|
if not revs:
|
|
2117
|
if not revs:
|
|
|
2118
|
raise error.Abort(_("export requires at least one changeset"))
|
|
2118
|
raise error.Abort(_("export requires at least one changeset"))
|
|
|
2119
|
if len(revs) > 1:
|
|
2119
|
if len(revs) > 1:
|
|
|
2120
|
ui.note(_('exporting patches:\n'))
|
|
2120
|
ui.note(_('exporting patches:\n'))
|
|
|
2121
|
else:
|
|
2121
|
else:
|
|
|
2122
|
ui.note(_('exporting patch:\n'))
|
|
2122
|
ui.note(_('exporting patch:\n'))
|
|
|
2123
|
|
|
2123
|
|
|
|
2124
|
fntemplate = opts.get('output')
|
|
2124
|
fntemplate = opts.get('output')
|
|
|
2125
|
if cmdutil.isstdiofilename(fntemplate):
|
|
2125
|
if cmdutil.isstdiofilename(fntemplate):
|
|
|
2126
|
fntemplate = ''
|
|
2126
|
fntemplate = ''
|
|
|
2127
|
|
|
2127
|
|
|
|
2128
|
if fntemplate:
|
|
2128
|
if fntemplate:
|
|
|
2129
|
fm = formatter.nullformatter(ui, 'export', opts)
|
|
2129
|
fm = formatter.nullformatter(ui, 'export', opts)
|
|
|
2130
|
else:
|
|
2130
|
else:
|
|
|
2131
|
ui.pager('export')
|
|
2131
|
ui.pager('export')
|
|
|
2132
|
fm = ui.formatter('export', opts)
|
|
2132
|
fm = ui.formatter('export', opts)
|
|
|
2133
|
with fm:
|
|
2133
|
with fm:
|
|
|
2134
|
cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
|
|
2134
|
cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
|
|
|
2135
|
switch_parent=opts.get('switch_parent'),
|
|
2135
|
switch_parent=opts.get('switch_parent'),
|
|
|
2136
|
opts=patch.diffallopts(ui, opts))
|
|
2136
|
opts=patch.diffallopts(ui, opts))
|
|
|
2137
|
|
|
2137
|
|
|
|
2138
|
@command('files',
|
|
2138
|
@command('files',
|
|
|
2139
|
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
|
|
2139
|
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
|
|
|
2140
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
2140
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
|
2141
|
] + walkopts + formatteropts + subrepoopts,
|
|
2141
|
] + walkopts + formatteropts + subrepoopts,
|
|
|
2142
|
_('[OPTION]... [FILE]...'),
|
|
2142
|
_('[OPTION]... [FILE]...'),
|
|
|
2143
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
2143
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
2144
|
intents={INTENT_READONLY})
|
|
2144
|
intents={INTENT_READONLY})
|
|
|
2145
|
def files(ui, repo, *pats, **opts):
|
|
2145
|
def files(ui, repo, *pats, **opts):
|
|
|
2146
|
"""list tracked files
|
|
2146
|
"""list tracked files
|
|
|
2147
|
|
|
2147
|
|
|
|
2148
|
Print files under Mercurial control in the working directory or
|
|
2148
|
Print files under Mercurial control in the working directory or
|
|
|
2149
|
specified revision for given files (excluding removed files).
|
|
2149
|
specified revision for given files (excluding removed files).
|
|
|
2150
|
Files can be specified as filenames or filesets.
|
|
2150
|
Files can be specified as filenames or filesets.
|
|
|
2151
|
|
|
2151
|
|
|
|
2152
|
If no files are given to match, this command prints the names
|
|
2152
|
If no files are given to match, this command prints the names
|
|
|
2153
|
of all files under Mercurial control.
|
|
2153
|
of all files under Mercurial control.
|
|
|
2154
|
|
|
2154
|
|
|
|
2155
|
.. container:: verbose
|
|
2155
|
.. container:: verbose
|
|
|
2156
|
|
|
2156
|
|
|
|
2157
|
Template:
|
|
2157
|
Template:
|
|
|
2158
|
|
|
2158
|
|
|
|
2159
|
The following keywords are supported in addition to the common template
|
|
2159
|
The following keywords are supported in addition to the common template
|
|
|
2160
|
keywords and functions. See also :hg:`help templates`.
|
|
2160
|
keywords and functions. See also :hg:`help templates`.
|
|
|
2161
|
|
|
2161
|
|
|
|
2162
|
:flags: String. Character denoting file's symlink and executable bits.
|
|
2162
|
:flags: String. Character denoting file's symlink and executable bits.
|
|
|
2163
|
:path: String. Repository-absolute path of the file.
|
|
2163
|
:path: String. Repository-absolute path of the file.
|
|
|
2164
|
:size: Integer. Size of the file in bytes.
|
|
2164
|
:size: Integer. Size of the file in bytes.
|
|
|
2165
|
|
|
2165
|
|
|
|
2166
|
Examples:
|
|
2166
|
Examples:
|
|
|
2167
|
|
|
2167
|
|
|
|
2168
|
- list all files under the current directory::
|
|
2168
|
- list all files under the current directory::
|
|
|
2169
|
|
|
2169
|
|
|
|
2170
|
hg files .
|
|
2170
|
hg files .
|
|
|
2171
|
|
|
2171
|
|
|
|
2172
|
- shows sizes and flags for current revision::
|
|
2172
|
- shows sizes and flags for current revision::
|
|
|
2173
|
|
|
2173
|
|
|
|
2174
|
hg files -vr .
|
|
2174
|
hg files -vr .
|
|
|
2175
|
|
|
2175
|
|
|
|
2176
|
- list all files named README::
|
|
2176
|
- list all files named README::
|
|
|
2177
|
|
|
2177
|
|
|
|
2178
|
hg files -I "**/README"
|
|
2178
|
hg files -I "**/README"
|
|
|
2179
|
|
|
2179
|
|
|
|
2180
|
- list all binary files::
|
|
2180
|
- list all binary files::
|
|
|
2181
|
|
|
2181
|
|
|
|
2182
|
hg files "set:binary()"
|
|
2182
|
hg files "set:binary()"
|
|
|
2183
|
|
|
2183
|
|
|
|
2184
|
- find files containing a regular expression::
|
|
2184
|
- find files containing a regular expression::
|
|
|
2185
|
|
|
2185
|
|
|
|
2186
|
hg files "set:grep('bob')"
|
|
2186
|
hg files "set:grep('bob')"
|
|
|
2187
|
|
|
2187
|
|
|
|
2188
|
- search tracked file contents with xargs and grep::
|
|
2188
|
- search tracked file contents with xargs and grep::
|
|
|
2189
|
|
|
2189
|
|
|
|
2190
|
hg files -0 | xargs -0 grep foo
|
|
2190
|
hg files -0 | xargs -0 grep foo
|
|
|
2191
|
|
|
2191
|
|
|
|
2192
|
See :hg:`help patterns` and :hg:`help filesets` for more information
|
|
2192
|
See :hg:`help patterns` and :hg:`help filesets` for more information
|
|
|
2193
|
on specifying file patterns.
|
|
2193
|
on specifying file patterns.
|
|
|
2194
|
|
|
2194
|
|
|
|
2195
|
Returns 0 if a match is found, 1 otherwise.
|
|
2195
|
Returns 0 if a match is found, 1 otherwise.
|
|
|
2196
|
|
|
2196
|
|
|
|
2197
|
"""
|
|
2197
|
"""
|
|
|
2198
|
|
|
2198
|
|
|
|
2199
|
opts = pycompat.byteskwargs(opts)
|
|
2199
|
opts = pycompat.byteskwargs(opts)
|
|
|
2200
|
rev = opts.get('rev')
|
|
2200
|
rev = opts.get('rev')
|
|
|
2201
|
if rev:
|
|
2201
|
if rev:
|
|
|
2202
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
2202
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
2203
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
2203
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
|
2204
|
|
|
2204
|
|
|
|
2205
|
end = '\n'
|
|
2205
|
end = '\n'
|
|
|
2206
|
if opts.get('print0'):
|
|
2206
|
if opts.get('print0'):
|
|
|
2207
|
end = '\0'
|
|
2207
|
end = '\0'
|
|
|
2208
|
fmt = '%s' + end
|
|
2208
|
fmt = '%s' + end
|
|
|
2209
|
|
|
2209
|
|
|
|
2210
|
m = scmutil.match(ctx, pats, opts)
|
|
2210
|
m = scmutil.match(ctx, pats, opts)
|
|
|
2211
|
ui.pager('files')
|
|
2211
|
ui.pager('files')
|
|
|
2212
|
with ui.formatter('files', opts) as fm:
|
|
2212
|
with ui.formatter('files', opts) as fm:
|
|
|
2213
|
return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
|
|
2213
|
return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
|
|
|
2214
|
|
|
2214
|
|
|
|
2215
|
@command(
|
|
2215
|
@command(
|
|
|
2216
|
'forget',
|
|
2216
|
'forget',
|
|
|
2217
|
[('i', 'interactive', None, _('use interactive mode')),
|
|
2217
|
[('i', 'interactive', None, _('use interactive mode')),
|
|
|
2218
|
] + walkopts + dryrunopts,
|
|
2218
|
] + walkopts + dryrunopts,
|
|
|
2219
|
_('[OPTION]... FILE...'),
|
|
2219
|
_('[OPTION]... FILE...'),
|
|
|
2220
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
2220
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
2221
|
helpbasic=True, inferrepo=True)
|
|
2221
|
helpbasic=True, inferrepo=True)
|
|
|
2222
|
def forget(ui, repo, *pats, **opts):
|
|
2222
|
def forget(ui, repo, *pats, **opts):
|
|
|
2223
|
"""forget the specified files on the next commit
|
|
2223
|
"""forget the specified files on the next commit
|
|
|
2224
|
|
|
2224
|
|
|
|
2225
|
Mark the specified files so they will no longer be tracked
|
|
2225
|
Mark the specified files so they will no longer be tracked
|
|
|
2226
|
after the next commit.
|
|
2226
|
after the next commit.
|
|
|
2227
|
|
|
2227
|
|
|
|
2228
|
This only removes files from the current branch, not from the
|
|
2228
|
This only removes files from the current branch, not from the
|
|
|
2229
|
entire project history, and it does not delete them from the
|
|
2229
|
entire project history, and it does not delete them from the
|
|
|
2230
|
working directory.
|
|
2230
|
working directory.
|
|
|
2231
|
|
|
2231
|
|
|
|
2232
|
To delete the file from the working directory, see :hg:`remove`.
|
|
2232
|
To delete the file from the working directory, see :hg:`remove`.
|
|
|
2233
|
|
|
2233
|
|
|
|
2234
|
To undo a forget before the next commit, see :hg:`add`.
|
|
2234
|
To undo a forget before the next commit, see :hg:`add`.
|
|
|
2235
|
|
|
2235
|
|
|
|
2236
|
.. container:: verbose
|
|
2236
|
.. container:: verbose
|
|
|
2237
|
|
|
2237
|
|
|
|
2238
|
Examples:
|
|
2238
|
Examples:
|
|
|
2239
|
|
|
2239
|
|
|
|
2240
|
- forget newly-added binary files::
|
|
2240
|
- forget newly-added binary files::
|
|
|
2241
|
|
|
2241
|
|
|
|
2242
|
hg forget "set:added() and binary()"
|
|
2242
|
hg forget "set:added() and binary()"
|
|
|
2243
|
|
|
2243
|
|
|
|
2244
|
- forget files that would be excluded by .hgignore::
|
|
2244
|
- forget files that would be excluded by .hgignore::
|
|
|
2245
|
|
|
2245
|
|
|
|
2246
|
hg forget "set:hgignore()"
|
|
2246
|
hg forget "set:hgignore()"
|
|
|
2247
|
|
|
2247
|
|
|
|
2248
|
Returns 0 on success.
|
|
2248
|
Returns 0 on success.
|
|
|
2249
|
"""
|
|
2249
|
"""
|
|
|
2250
|
|
|
2250
|
|
|
|
2251
|
opts = pycompat.byteskwargs(opts)
|
|
2251
|
opts = pycompat.byteskwargs(opts)
|
|
|
2252
|
if not pats:
|
|
2252
|
if not pats:
|
|
|
2253
|
raise error.Abort(_('no files specified'))
|
|
2253
|
raise error.Abort(_('no files specified'))
|
|
|
2254
|
|
|
2254
|
|
|
|
2255
|
m = scmutil.match(repo[None], pats, opts)
|
|
2255
|
m = scmutil.match(repo[None], pats, opts)
|
|
|
2256
|
dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
|
|
2256
|
dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
|
|
|
2257
|
rejected = cmdutil.forget(ui, repo, m, prefix="",
|
|
2257
|
rejected = cmdutil.forget(ui, repo, m, prefix="",
|
|
|
2258
|
explicitonly=False, dryrun=dryrun,
|
|
2258
|
explicitonly=False, dryrun=dryrun,
|
|
|
2259
|
interactive=interactive)[0]
|
|
2259
|
interactive=interactive)[0]
|
|
|
2260
|
return rejected and 1 or 0
|
|
2260
|
return rejected and 1 or 0
|
|
|
2261
|
|
|
2261
|
|
|
|
2262
|
@command(
|
|
2262
|
@command(
|
|
|
2263
|
'graft',
|
|
2263
|
'graft',
|
|
|
2264
|
[('r', 'rev', [], _('revisions to graft'), _('REV')),
|
|
2264
|
[('r', 'rev', [], _('revisions to graft'), _('REV')),
|
|
|
2265
|
('', 'base', '',
|
|
2265
|
('', 'base', '',
|
|
|
2266
|
_('base revision when doing the graft merge (ADVANCED)'), _('REV')),
|
|
2266
|
_('base revision when doing the graft merge (ADVANCED)'), _('REV')),
|
|
|
2267
|
('c', 'continue', False, _('resume interrupted graft')),
|
|
2267
|
('c', 'continue', False, _('resume interrupted graft')),
|
|
|
2268
|
('', 'stop', False, _('stop interrupted graft')),
|
|
2268
|
('', 'stop', False, _('stop interrupted graft')),
|
|
|
2269
|
('', 'abort', False, _('abort interrupted graft')),
|
|
2269
|
('', 'abort', False, _('abort interrupted graft')),
|
|
|
2270
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
2270
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
|
2271
|
('', 'log', None, _('append graft info to log message')),
|
|
2271
|
('', 'log', None, _('append graft info to log message')),
|
|
|
2272
|
('', 'no-commit', None,
|
|
2272
|
('', 'no-commit', None,
|
|
|
2273
|
_("don't commit, just apply the changes in working directory")),
|
|
2273
|
_("don't commit, just apply the changes in working directory")),
|
|
|
2274
|
('f', 'force', False, _('force graft')),
|
|
2274
|
('f', 'force', False, _('force graft')),
|
|
|
2275
|
('D', 'currentdate', False,
|
|
2275
|
('D', 'currentdate', False,
|
|
|
2276
|
_('record the current date as commit date')),
|
|
2276
|
_('record the current date as commit date')),
|
|
|
2277
|
('U', 'currentuser', False,
|
|
2277
|
('U', 'currentuser', False,
|
|
|
2278
|
_('record the current user as committer'))]
|
|
2278
|
_('record the current user as committer'))]
|
|
|
2279
|
+ commitopts2 + mergetoolopts + dryrunopts,
|
|
2279
|
+ commitopts2 + mergetoolopts + dryrunopts,
|
|
|
2280
|
_('[OPTION]... [-r REV]... REV...'),
|
|
2280
|
_('[OPTION]... [-r REV]... REV...'),
|
|
|
2281
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
|
|
2281
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
|
|
|
2282
|
def graft(ui, repo, *revs, **opts):
|
|
2282
|
def graft(ui, repo, *revs, **opts):
|
|
|
2283
|
'''copy changes from other branches onto the current branch
|
|
2283
|
'''copy changes from other branches onto the current branch
|
|
|
2284
|
|
|
2284
|
|
|
|
2285
|
This command uses Mercurial's merge logic to copy individual
|
|
2285
|
This command uses Mercurial's merge logic to copy individual
|
|
|
2286
|
changes from other branches without merging branches in the
|
|
2286
|
changes from other branches without merging branches in the
|
|
|
2287
|
history graph. This is sometimes known as 'backporting' or
|
|
2287
|
history graph. This is sometimes known as 'backporting' or
|
|
|
2288
|
'cherry-picking'. By default, graft will copy user, date, and
|
|
2288
|
'cherry-picking'. By default, graft will copy user, date, and
|
|
|
2289
|
description from the source changesets.
|
|
2289
|
description from the source changesets.
|
|
|
2290
|
|
|
2290
|
|
|
|
2291
|
Changesets that are ancestors of the current revision, that have
|
|
2291
|
Changesets that are ancestors of the current revision, that have
|
|
|
2292
|
already been grafted, or that are merges will be skipped.
|
|
2292
|
already been grafted, or that are merges will be skipped.
|
|
|
2293
|
|
|
2293
|
|
|
|
2294
|
If --log is specified, log messages will have a comment appended
|
|
2294
|
If --log is specified, log messages will have a comment appended
|
|
|
2295
|
of the form::
|
|
2295
|
of the form::
|
|
|
2296
|
|
|
2296
|
|
|
|
2297
|
(grafted from CHANGESETHASH)
|
|
2297
|
(grafted from CHANGESETHASH)
|
|
|
2298
|
|
|
2298
|
|
|
|
2299
|
If --force is specified, revisions will be grafted even if they
|
|
2299
|
If --force is specified, revisions will be grafted even if they
|
|
|
2300
|
are already ancestors of, or have been grafted to, the destination.
|
|
2300
|
are already ancestors of, or have been grafted to, the destination.
|
|
|
2301
|
This is useful when the revisions have since been backed out.
|
|
2301
|
This is useful when the revisions have since been backed out.
|
|
|
2302
|
|
|
2302
|
|
|
|
2303
|
If a graft merge results in conflicts, the graft process is
|
|
2303
|
If a graft merge results in conflicts, the graft process is
|
|
|
2304
|
interrupted so that the current merge can be manually resolved.
|
|
2304
|
interrupted so that the current merge can be manually resolved.
|
|
|
2305
|
Once all conflicts are addressed, the graft process can be
|
|
2305
|
Once all conflicts are addressed, the graft process can be
|
|
|
2306
|
continued with the -c/--continue option.
|
|
2306
|
continued with the -c/--continue option.
|
|
|
2307
|
|
|
2307
|
|
|
|
2308
|
The -c/--continue option reapplies all the earlier options.
|
|
2308
|
The -c/--continue option reapplies all the earlier options.
|
|
|
2309
|
|
|
2309
|
|
|
|
2310
|
.. container:: verbose
|
|
2310
|
.. container:: verbose
|
|
|
2311
|
|
|
2311
|
|
|
|
2312
|
The --base option exposes more of how graft internally uses merge with a
|
|
2312
|
The --base option exposes more of how graft internally uses merge with a
|
|
|
2313
|
custom base revision. --base can be used to specify another ancestor than
|
|
2313
|
custom base revision. --base can be used to specify another ancestor than
|
|
|
2314
|
the first and only parent.
|
|
2314
|
the first and only parent.
|
|
|
2315
|
|
|
2315
|
|
|
|
2316
|
The command::
|
|
2316
|
The command::
|
|
|
2317
|
|
|
2317
|
|
|
|
2318
|
hg graft -r 345 --base 234
|
|
2318
|
hg graft -r 345 --base 234
|
|
|
2319
|
|
|
2319
|
|
|
|
2320
|
is thus pretty much the same as::
|
|
2320
|
is thus pretty much the same as::
|
|
|
2321
|
|
|
2321
|
|
|
|
2322
|
hg diff -r 234 -r 345 | hg import
|
|
2322
|
hg diff -r 234 -r 345 | hg import
|
|
|
2323
|
|
|
2323
|
|
|
|
2324
|
but using merge to resolve conflicts and track moved files.
|
|
2324
|
but using merge to resolve conflicts and track moved files.
|
|
|
2325
|
|
|
2325
|
|
|
|
2326
|
The result of a merge can thus be backported as a single commit by
|
|
2326
|
The result of a merge can thus be backported as a single commit by
|
|
|
2327
|
specifying one of the merge parents as base, and thus effectively
|
|
2327
|
specifying one of the merge parents as base, and thus effectively
|
|
|
2328
|
grafting the changes from the other side.
|
|
2328
|
grafting the changes from the other side.
|
|
|
2329
|
|
|
2329
|
|
|
|
2330
|
It is also possible to collapse multiple changesets and clean up history
|
|
2330
|
It is also possible to collapse multiple changesets and clean up history
|
|
|
2331
|
by specifying another ancestor as base, much like rebase --collapse
|
|
2331
|
by specifying another ancestor as base, much like rebase --collapse
|
|
|
2332
|
--keep.
|
|
2332
|
--keep.
|
|
|
2333
|
|
|
2333
|
|
|
|
2334
|
The commit message can be tweaked after the fact using commit --amend .
|
|
2334
|
The commit message can be tweaked after the fact using commit --amend .
|
|
|
2335
|
|
|
2335
|
|
|
|
2336
|
For using non-ancestors as the base to backout changes, see the backout
|
|
2336
|
For using non-ancestors as the base to backout changes, see the backout
|
|
|
2337
|
command and the hidden --parent option.
|
|
2337
|
command and the hidden --parent option.
|
|
|
2338
|
|
|
2338
|
|
|
|
2339
|
.. container:: verbose
|
|
2339
|
.. container:: verbose
|
|
|
2340
|
|
|
2340
|
|
|
|
2341
|
Examples:
|
|
2341
|
Examples:
|
|
|
2342
|
|
|
2342
|
|
|
|
2343
|
- copy a single change to the stable branch and edit its description::
|
|
2343
|
- copy a single change to the stable branch and edit its description::
|
|
|
2344
|
|
|
2344
|
|
|
|
2345
|
hg update stable
|
|
2345
|
hg update stable
|
|
|
2346
|
hg graft --edit 9393
|
|
2346
|
hg graft --edit 9393
|
|
|
2347
|
|
|
2347
|
|
|
|
2348
|
- graft a range of changesets with one exception, updating dates::
|
|
2348
|
- graft a range of changesets with one exception, updating dates::
|
|
|
2349
|
|
|
2349
|
|
|
|
2350
|
hg graft -D "2085::2093 and not 2091"
|
|
2350
|
hg graft -D "2085::2093 and not 2091"
|
|
|
2351
|
|
|
2351
|
|
|
|
2352
|
- continue a graft after resolving conflicts::
|
|
2352
|
- continue a graft after resolving conflicts::
|
|
|
2353
|
|
|
2353
|
|
|
|
2354
|
hg graft -c
|
|
2354
|
hg graft -c
|
|
|
2355
|
|
|
2355
|
|
|
|
2356
|
- show the source of a grafted changeset::
|
|
2356
|
- show the source of a grafted changeset::
|
|
|
2357
|
|
|
2357
|
|
|
|
2358
|
hg log --debug -r .
|
|
2358
|
hg log --debug -r .
|
|
|
2359
|
|
|
2359
|
|
|
|
2360
|
- show revisions sorted by date::
|
|
2360
|
- show revisions sorted by date::
|
|
|
2361
|
|
|
2361
|
|
|
|
2362
|
hg log -r "sort(all(), date)"
|
|
2362
|
hg log -r "sort(all(), date)"
|
|
|
2363
|
|
|
2363
|
|
|
|
2364
|
- backport the result of a merge as a single commit::
|
|
2364
|
- backport the result of a merge as a single commit::
|
|
|
2365
|
|
|
2365
|
|
|
|
2366
|
hg graft -r 123 --base 123^
|
|
2366
|
hg graft -r 123 --base 123^
|
|
|
2367
|
|
|
2367
|
|
|
|
2368
|
- land a feature branch as one changeset::
|
|
2368
|
- land a feature branch as one changeset::
|
|
|
2369
|
|
|
2369
|
|
|
|
2370
|
hg up -cr default
|
|
2370
|
hg up -cr default
|
|
|
2371
|
hg graft -r featureX --base "ancestor('featureX', 'default')"
|
|
2371
|
hg graft -r featureX --base "ancestor('featureX', 'default')"
|
|
|
2372
|
|
|
2372
|
|
|
|
2373
|
See :hg:`help revisions` for more about specifying revisions.
|
|
2373
|
See :hg:`help revisions` for more about specifying revisions.
|
|
|
2374
|
|
|
2374
|
|
|
|
2375
|
Returns 0 on successful completion.
|
|
2375
|
Returns 0 on successful completion.
|
|
|
2376
|
'''
|
|
2376
|
'''
|
|
|
2377
|
with repo.wlock():
|
|
2377
|
with repo.wlock():
|
|
|
2378
|
return _dograft(ui, repo, *revs, **opts)
|
|
2378
|
return _dograft(ui, repo, *revs, **opts)
|
|
|
2379
|
|
|
2379
|
|
|
|
2380
|
def _dograft(ui, repo, *revs, **opts):
|
|
2380
|
def _dograft(ui, repo, *revs, **opts):
|
|
|
2381
|
opts = pycompat.byteskwargs(opts)
|
|
2381
|
opts = pycompat.byteskwargs(opts)
|
|
|
2382
|
if revs and opts.get('rev'):
|
|
2382
|
if revs and opts.get('rev'):
|
|
|
2383
|
ui.warn(_('warning: inconsistent use of --rev might give unexpected '
|
|
2383
|
ui.warn(_('warning: inconsistent use of --rev might give unexpected '
|
|
|
2384
|
'revision ordering!\n'))
|
|
2384
|
'revision ordering!\n'))
|
|
|
2385
|
|
|
2385
|
|
|
|
2386
|
revs = list(revs)
|
|
2386
|
revs = list(revs)
|
|
|
2387
|
revs.extend(opts.get('rev'))
|
|
2387
|
revs.extend(opts.get('rev'))
|
|
|
2388
|
basectx = None
|
|
2388
|
basectx = None
|
|
|
2389
|
if opts.get('base'):
|
|
2389
|
if opts.get('base'):
|
|
|
2390
|
basectx = scmutil.revsingle(repo, opts['base'], None)
|
|
2390
|
basectx = scmutil.revsingle(repo, opts['base'], None)
|
|
|
2391
|
# a dict of data to be stored in state file
|
|
2391
|
# a dict of data to be stored in state file
|
|
|
2392
|
statedata = {}
|
|
2392
|
statedata = {}
|
|
|
2393
|
# list of new nodes created by ongoing graft
|
|
2393
|
# list of new nodes created by ongoing graft
|
|
|
2394
|
statedata['newnodes'] = []
|
|
2394
|
statedata['newnodes'] = []
|
|
|
2395
|
|
|
2395
|
|
|
|
2396
|
if opts.get('user') and opts.get('currentuser'):
|
|
2396
|
if opts.get('user') and opts.get('currentuser'):
|
|
|
2397
|
raise error.Abort(_('--user and --currentuser are mutually exclusive'))
|
|
2397
|
raise error.Abort(_('--user and --currentuser are mutually exclusive'))
|
|
|
2398
|
if opts.get('date') and opts.get('currentdate'):
|
|
2398
|
if opts.get('date') and opts.get('currentdate'):
|
|
|
2399
|
raise error.Abort(_('--date and --currentdate are mutually exclusive'))
|
|
2399
|
raise error.Abort(_('--date and --currentdate are mutually exclusive'))
|
|
|
2400
|
if not opts.get('user') and opts.get('currentuser'):
|
|
2400
|
if not opts.get('user') and opts.get('currentuser'):
|
|
|
2401
|
opts['user'] = ui.username()
|
|
2401
|
opts['user'] = ui.username()
|
|
|
2402
|
if not opts.get('date') and opts.get('currentdate'):
|
|
2402
|
if not opts.get('date') and opts.get('currentdate'):
|
|
|
2403
|
opts['date'] = "%d %d" % dateutil.makedate()
|
|
2403
|
opts['date'] = "%d %d" % dateutil.makedate()
|
|
|
2404
|
|
|
2404
|
|
|
|
2405
|
editor = cmdutil.getcommiteditor(editform='graft',
|
|
2405
|
editor = cmdutil.getcommiteditor(editform='graft',
|
|
|
2406
|
**pycompat.strkwargs(opts))
|
|
2406
|
**pycompat.strkwargs(opts))
|
|
|
2407
|
|
|
2407
|
|
|
|
2408
|
cont = False
|
|
2408
|
cont = False
|
|
|
2409
|
if opts.get('no_commit'):
|
|
2409
|
if opts.get('no_commit'):
|
|
|
2410
|
if opts.get('edit'):
|
|
2410
|
if opts.get('edit'):
|
|
|
2411
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
2411
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
2412
|
"--edit together"))
|
|
2412
|
"--edit together"))
|
|
|
2413
|
if opts.get('currentuser'):
|
|
2413
|
if opts.get('currentuser'):
|
|
|
2414
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
2414
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
2415
|
"--currentuser together"))
|
|
2415
|
"--currentuser together"))
|
|
|
2416
|
if opts.get('currentdate'):
|
|
2416
|
if opts.get('currentdate'):
|
|
|
2417
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
2417
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
2418
|
"--currentdate together"))
|
|
2418
|
"--currentdate together"))
|
|
|
2419
|
if opts.get('log'):
|
|
2419
|
if opts.get('log'):
|
|
|
2420
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
2420
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
2421
|
"--log together"))
|
|
2421
|
"--log together"))
|
|
|
2422
|
|
|
2422
|
|
|
|
2423
|
graftstate = statemod.cmdstate(repo, 'graftstate')
|
|
2423
|
graftstate = statemod.cmdstate(repo, 'graftstate')
|
|
|
2424
|
|
|
2424
|
|
|
|
2425
|
if opts.get('stop'):
|
|
2425
|
if opts.get('stop'):
|
|
|
2426
|
if opts.get('continue'):
|
|
2426
|
if opts.get('continue'):
|
|
|
2427
|
raise error.Abort(_("cannot use '--continue' and "
|
|
2427
|
raise error.Abort(_("cannot use '--continue' and "
|
|
|
2428
|
"'--stop' together"))
|
|
2428
|
"'--stop' together"))
|
|
|
2429
|
if opts.get('abort'):
|
|
2429
|
if opts.get('abort'):
|
|
|
2430
|
raise error.Abort(_("cannot use '--abort' and '--stop' together"))
|
|
2430
|
raise error.Abort(_("cannot use '--abort' and '--stop' together"))
|
|
|
2431
|
|
|
2431
|
|
|
|
2432
|
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
|
|
2432
|
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
|
|
|
2433
|
opts.get('date'), opts.get('currentdate'),
|
|
2433
|
opts.get('date'), opts.get('currentdate'),
|
|
|
2434
|
opts.get('currentuser'), opts.get('rev'))):
|
|
2434
|
opts.get('currentuser'), opts.get('rev'))):
|
|
|
2435
|
raise error.Abort(_("cannot specify any other flag with '--stop'"))
|
|
2435
|
raise error.Abort(_("cannot specify any other flag with '--stop'"))
|
|
|
2436
|
return _stopgraft(ui, repo, graftstate)
|
|
2436
|
return _stopgraft(ui, repo, graftstate)
|
|
|
2437
|
elif opts.get('abort'):
|
|
2437
|
elif opts.get('abort'):
|
|
|
2438
|
if opts.get('continue'):
|
|
2438
|
if opts.get('continue'):
|
|
|
2439
|
raise error.Abort(_("cannot use '--continue' and "
|
|
2439
|
raise error.Abort(_("cannot use '--continue' and "
|
|
|
2440
|
"'--abort' together"))
|
|
2440
|
"'--abort' together"))
|
|
|
2441
|
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
|
|
2441
|
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
|
|
|
2442
|
opts.get('date'), opts.get('currentdate'),
|
|
2442
|
opts.get('date'), opts.get('currentdate'),
|
|
|
2443
|
opts.get('currentuser'), opts.get('rev'))):
|
|
2443
|
opts.get('currentuser'), opts.get('rev'))):
|
|
|
2444
|
raise error.Abort(_("cannot specify any other flag with '--abort'"))
|
|
2444
|
raise error.Abort(_("cannot specify any other flag with '--abort'"))
|
|
|
2445
|
|
|
2445
|
|
|
|
2446
|
return _abortgraft(ui, repo, graftstate)
|
|
2446
|
return _abortgraft(ui, repo, graftstate)
|
|
|
2447
|
elif opts.get('continue'):
|
|
2447
|
elif opts.get('continue'):
|
|
|
2448
|
cont = True
|
|
2448
|
cont = True
|
|
|
2449
|
if revs:
|
|
2449
|
if revs:
|
|
|
2450
|
raise error.Abort(_("can't specify --continue and revisions"))
|
|
2450
|
raise error.Abort(_("can't specify --continue and revisions"))
|
|
|
2451
|
# read in unfinished revisions
|
|
2451
|
# read in unfinished revisions
|
|
|
2452
|
if graftstate.exists():
|
|
2452
|
if graftstate.exists():
|
|
|
2453
|
statedata = _readgraftstate(repo, graftstate)
|
|
2453
|
statedata = _readgraftstate(repo, graftstate)
|
|
|
2454
|
if statedata.get('date'):
|
|
2454
|
if statedata.get('date'):
|
|
|
2455
|
opts['date'] = statedata['date']
|
|
2455
|
opts['date'] = statedata['date']
|
|
|
2456
|
if statedata.get('user'):
|
|
2456
|
if statedata.get('user'):
|
|
|
2457
|
opts['user'] = statedata['user']
|
|
2457
|
opts['user'] = statedata['user']
|
|
|
2458
|
if statedata.get('log'):
|
|
2458
|
if statedata.get('log'):
|
|
|
2459
|
opts['log'] = True
|
|
2459
|
opts['log'] = True
|
|
|
2460
|
if statedata.get('no_commit'):
|
|
2460
|
if statedata.get('no_commit'):
|
|
|
2461
|
opts['no_commit'] = statedata.get('no_commit')
|
|
2461
|
opts['no_commit'] = statedata.get('no_commit')
|
|
|
2462
|
nodes = statedata['nodes']
|
|
2462
|
nodes = statedata['nodes']
|
|
|
2463
|
revs = [repo[node].rev() for node in nodes]
|
|
2463
|
revs = [repo[node].rev() for node in nodes]
|
|
|
2464
|
else:
|
|
2464
|
else:
|
|
|
2465
|
cmdutil.wrongtooltocontinue(repo, _('graft'))
|
|
2465
|
cmdutil.wrongtooltocontinue(repo, _('graft'))
|
|
|
2466
|
else:
|
|
2466
|
else:
|
|
|
2467
|
if not revs:
|
|
2467
|
if not revs:
|
|
|
2468
|
raise error.Abort(_('no revisions specified'))
|
|
2468
|
raise error.Abort(_('no revisions specified'))
|
|
|
2469
|
cmdutil.checkunfinished(repo)
|
|
2469
|
cmdutil.checkunfinished(repo)
|
|
|
2470
|
cmdutil.bailifchanged(repo)
|
|
2470
|
cmdutil.bailifchanged(repo)
|
|
|
2471
|
revs = scmutil.revrange(repo, revs)
|
|
2471
|
revs = scmutil.revrange(repo, revs)
|
|
|
2472
|
|
|
2472
|
|
|
|
2473
|
skipped = set()
|
|
2473
|
skipped = set()
|
|
|
2474
|
if basectx is None:
|
|
2474
|
if basectx is None:
|
|
|
2475
|
# check for merges
|
|
2475
|
# check for merges
|
|
|
2476
|
for rev in repo.revs('%ld and merge()', revs):
|
|
2476
|
for rev in repo.revs('%ld and merge()', revs):
|
|
|
2477
|
ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
|
|
2477
|
ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
|
|
|
2478
|
skipped.add(rev)
|
|
2478
|
skipped.add(rev)
|
|
|
2479
|
revs = [r for r in revs if r not in skipped]
|
|
2479
|
revs = [r for r in revs if r not in skipped]
|
|
|
2480
|
if not revs:
|
|
2480
|
if not revs:
|
|
|
2481
|
return -1
|
|
2481
|
return -1
|
|
|
2482
|
if basectx is not None and len(revs) != 1:
|
|
2482
|
if basectx is not None and len(revs) != 1:
|
|
|
2483
|
raise error.Abort(_('only one revision allowed with --base '))
|
|
2483
|
raise error.Abort(_('only one revision allowed with --base '))
|
|
|
2484
|
|
|
2484
|
|
|
|
2485
|
# Don't check in the --continue case, in effect retaining --force across
|
|
2485
|
# Don't check in the --continue case, in effect retaining --force across
|
|
|
2486
|
# --continues. That's because without --force, any revisions we decided to
|
|
2486
|
# --continues. That's because without --force, any revisions we decided to
|
|
|
2487
|
# skip would have been filtered out here, so they wouldn't have made their
|
|
2487
|
# skip would have been filtered out here, so they wouldn't have made their
|
|
|
2488
|
# way to the graftstate. With --force, any revisions we would have otherwise
|
|
2488
|
# way to the graftstate. With --force, any revisions we would have otherwise
|
|
|
2489
|
# skipped would not have been filtered out, and if they hadn't been applied
|
|
2489
|
# skipped would not have been filtered out, and if they hadn't been applied
|
|
|
2490
|
# already, they'd have been in the graftstate.
|
|
2490
|
# already, they'd have been in the graftstate.
|
|
|
2491
|
if not (cont or opts.get('force')) and basectx is None:
|
|
2491
|
if not (cont or opts.get('force')) and basectx is None:
|
|
|
2492
|
# check for ancestors of dest branch
|
|
2492
|
# check for ancestors of dest branch
|
|
|
2493
|
crev = repo['.'].rev()
|
|
2493
|
crev = repo['.'].rev()
|
|
|
2494
|
ancestors = repo.changelog.ancestors([crev], inclusive=True)
|
|
2494
|
ancestors = repo.changelog.ancestors([crev], inclusive=True)
|
|
|
2495
|
# XXX make this lazy in the future
|
|
2495
|
# XXX make this lazy in the future
|
|
|
2496
|
# don't mutate while iterating, create a copy
|
|
2496
|
# don't mutate while iterating, create a copy
|
|
|
2497
|
for rev in list(revs):
|
|
2497
|
for rev in list(revs):
|
|
|
2498
|
if rev in ancestors:
|
|
2498
|
if rev in ancestors:
|
|
|
2499
|
ui.warn(_('skipping ancestor revision %d:%s\n') %
|
|
2499
|
ui.warn(_('skipping ancestor revision %d:%s\n') %
|
|
|
2500
|
(rev, repo[rev]))
|
|
2500
|
(rev, repo[rev]))
|
|
|
2501
|
# XXX remove on list is slow
|
|
2501
|
# XXX remove on list is slow
|
|
|
2502
|
revs.remove(rev)
|
|
2502
|
revs.remove(rev)
|
|
|
2503
|
if not revs:
|
|
2503
|
if not revs:
|
|
|
2504
|
return -1
|
|
2504
|
return -1
|
|
|
2505
|
|
|
2505
|
|
|
|
2506
|
# analyze revs for earlier grafts
|
|
2506
|
# analyze revs for earlier grafts
|
|
|
2507
|
ids = {}
|
|
2507
|
ids = {}
|
|
|
2508
|
for ctx in repo.set("%ld", revs):
|
|
2508
|
for ctx in repo.set("%ld", revs):
|
|
|
2509
|
ids[ctx.hex()] = ctx.rev()
|
|
2509
|
ids[ctx.hex()] = ctx.rev()
|
|
|
2510
|
n = ctx.extra().get('source')
|
|
2510
|
n = ctx.extra().get('source')
|
|
|
2511
|
if n:
|
|
2511
|
if n:
|
|
|
2512
|
ids[n] = ctx.rev()
|
|
2512
|
ids[n] = ctx.rev()
|
|
|
2513
|
|
|
2513
|
|
|
|
2514
|
# check ancestors for earlier grafts
|
|
2514
|
# check ancestors for earlier grafts
|
|
|
2515
|
ui.debug('scanning for duplicate grafts\n')
|
|
2515
|
ui.debug('scanning for duplicate grafts\n')
|
|
|
2516
|
|
|
2516
|
|
|
|
2517
|
# The only changesets we can be sure doesn't contain grafts of any
|
|
2517
|
# The only changesets we can be sure doesn't contain grafts of any
|
|
|
2518
|
# revs, are the ones that are common ancestors of *all* revs:
|
|
2518
|
# revs, are the ones that are common ancestors of *all* revs:
|
|
|
2519
|
for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
|
|
2519
|
for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
|
|
|
2520
|
ctx = repo[rev]
|
|
2520
|
ctx = repo[rev]
|
|
|
2521
|
n = ctx.extra().get('source')
|
|
2521
|
n = ctx.extra().get('source')
|
|
|
2522
|
if n in ids:
|
|
2522
|
if n in ids:
|
|
|
2523
|
try:
|
|
2523
|
try:
|
|
|
2524
|
r = repo[n].rev()
|
|
2524
|
r = repo[n].rev()
|
|
|
2525
|
except error.RepoLookupError:
|
|
2525
|
except error.RepoLookupError:
|
|
|
2526
|
r = None
|
|
2526
|
r = None
|
|
|
2527
|
if r in revs:
|
|
2527
|
if r in revs:
|
|
|
2528
|
ui.warn(_('skipping revision %d:%s '
|
|
2528
|
ui.warn(_('skipping revision %d:%s '
|
|
|
2529
|
'(already grafted to %d:%s)\n')
|
|
2529
|
'(already grafted to %d:%s)\n')
|
|
|
2530
|
% (r, repo[r], rev, ctx))
|
|
2530
|
% (r, repo[r], rev, ctx))
|
|
|
2531
|
revs.remove(r)
|
|
2531
|
revs.remove(r)
|
|
|
2532
|
elif ids[n] in revs:
|
|
2532
|
elif ids[n] in revs:
|
|
|
2533
|
if r is None:
|
|
2533
|
if r is None:
|
|
|
2534
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
2534
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
|
2535
|
'(%d:%s also has unknown origin %s)\n')
|
|
2535
|
'(%d:%s also has unknown origin %s)\n')
|
|
|
2536
|
% (ids[n], repo[ids[n]], rev, ctx, n[:12]))
|
|
2536
|
% (ids[n], repo[ids[n]], rev, ctx, n[:12]))
|
|
|
2537
|
else:
|
|
2537
|
else:
|
|
|
2538
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
2538
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
|
2539
|
'(%d:%s also has origin %d:%s)\n')
|
|
2539
|
'(%d:%s also has origin %d:%s)\n')
|
|
|
2540
|
% (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
|
|
2540
|
% (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
|
|
|
2541
|
revs.remove(ids[n])
|
|
2541
|
revs.remove(ids[n])
|
|
|
2542
|
elif ctx.hex() in ids:
|
|
2542
|
elif ctx.hex() in ids:
|
|
|
2543
|
r = ids[ctx.hex()]
|
|
2543
|
r = ids[ctx.hex()]
|
|
|
2544
|
if r in revs:
|
|
2544
|
if r in revs:
|
|
|
2545
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
2545
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
|
2546
|
'(was grafted from %d:%s)\n') %
|
|
2546
|
'(was grafted from %d:%s)\n') %
|
|
|
2547
|
(r, repo[r], rev, ctx))
|
|
2547
|
(r, repo[r], rev, ctx))
|
|
|
2548
|
revs.remove(r)
|
|
2548
|
revs.remove(r)
|
|
|
2549
|
if not revs:
|
|
2549
|
if not revs:
|
|
|
2550
|
return -1
|
|
2550
|
return -1
|
|
|
2551
|
|
|
2551
|
|
|
|
2552
|
if opts.get('no_commit'):
|
|
2552
|
if opts.get('no_commit'):
|
|
|
2553
|
statedata['no_commit'] = True
|
|
2553
|
statedata['no_commit'] = True
|
|
|
2554
|
for pos, ctx in enumerate(repo.set("%ld", revs)):
|
|
2554
|
for pos, ctx in enumerate(repo.set("%ld", revs)):
|
|
|
2555
|
desc = '%d:%s "%s"' % (ctx.rev(), ctx,
|
|
2555
|
desc = '%d:%s "%s"' % (ctx.rev(), ctx,
|
|
|
2556
|
ctx.description().split('\n', 1)[0])
|
|
2556
|
ctx.description().split('\n', 1)[0])
|
|
|
2557
|
names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
|
|
2557
|
names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
|
|
|
2558
|
if names:
|
|
2558
|
if names:
|
|
|
2559
|
desc += ' (%s)' % ' '.join(names)
|
|
2559
|
desc += ' (%s)' % ' '.join(names)
|
|
|
2560
|
ui.status(_('grafting %s\n') % desc)
|
|
2560
|
ui.status(_('grafting %s\n') % desc)
|
|
|
2561
|
if opts.get('dry_run'):
|
|
2561
|
if opts.get('dry_run'):
|
|
|
2562
|
continue
|
|
2562
|
continue
|
|
|
2563
|
|
|
2563
|
|
|
|
2564
|
source = ctx.extra().get('source')
|
|
2564
|
source = ctx.extra().get('source')
|
|
|
2565
|
extra = {}
|
|
2565
|
extra = {}
|
|
|
2566
|
if source:
|
|
2566
|
if source:
|
|
|
2567
|
extra['source'] = source
|
|
2567
|
extra['source'] = source
|
|
|
2568
|
extra['intermediate-source'] = ctx.hex()
|
|
2568
|
extra['intermediate-source'] = ctx.hex()
|
|
|
2569
|
else:
|
|
2569
|
else:
|
|
|
2570
|
extra['source'] = ctx.hex()
|
|
2570
|
extra['source'] = ctx.hex()
|
|
|
2571
|
user = ctx.user()
|
|
2571
|
user = ctx.user()
|
|
|
2572
|
if opts.get('user'):
|
|
2572
|
if opts.get('user'):
|
|
|
2573
|
user = opts['user']
|
|
2573
|
user = opts['user']
|
|
|
2574
|
statedata['user'] = user
|
|
2574
|
statedata['user'] = user
|
|
|
2575
|
date = ctx.date()
|
|
2575
|
date = ctx.date()
|
|
|
2576
|
if opts.get('date'):
|
|
2576
|
if opts.get('date'):
|
|
|
2577
|
date = opts['date']
|
|
2577
|
date = opts['date']
|
|
|
2578
|
statedata['date'] = date
|
|
2578
|
statedata['date'] = date
|
|
|
2579
|
message = ctx.description()
|
|
2579
|
message = ctx.description()
|
|
|
2580
|
if opts.get('log'):
|
|
2580
|
if opts.get('log'):
|
|
|
2581
|
message += '\n(grafted from %s)' % ctx.hex()
|
|
2581
|
message += '\n(grafted from %s)' % ctx.hex()
|
|
|
2582
|
statedata['log'] = True
|
|
2582
|
statedata['log'] = True
|
|
|
2583
|
|
|
2583
|
|
|
|
2584
|
# we don't merge the first commit when continuing
|
|
2584
|
# we don't merge the first commit when continuing
|
|
|
2585
|
if not cont:
|
|
2585
|
if not cont:
|
|
|
2586
|
# perform the graft merge with p1(rev) as 'ancestor'
|
|
2586
|
# perform the graft merge with p1(rev) as 'ancestor'
|
|
|
2587
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
2587
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
2588
|
base = ctx.p1() if basectx is None else basectx
|
|
2588
|
base = ctx.p1() if basectx is None else basectx
|
|
|
2589
|
with ui.configoverride(overrides, 'graft'):
|
|
2589
|
with ui.configoverride(overrides, 'graft'):
|
|
|
2590
|
stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
|
|
2590
|
stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
|
|
|
2591
|
# report any conflicts
|
|
2591
|
# report any conflicts
|
|
|
2592
|
if stats.unresolvedcount > 0:
|
|
2592
|
if stats.unresolvedcount > 0:
|
|
|
2593
|
# write out state for --continue
|
|
2593
|
# write out state for --continue
|
|
|
2594
|
nodes = [repo[rev].hex() for rev in revs[pos:]]
|
|
2594
|
nodes = [repo[rev].hex() for rev in revs[pos:]]
|
|
|
2595
|
statedata['nodes'] = nodes
|
|
2595
|
statedata['nodes'] = nodes
|
|
|
2596
|
stateversion = 1
|
|
2596
|
stateversion = 1
|
|
|
2597
|
graftstate.save(stateversion, statedata)
|
|
2597
|
graftstate.save(stateversion, statedata)
|
|
|
2598
|
hint = _("use 'hg resolve' and 'hg graft --continue'")
|
|
2598
|
hint = _("use 'hg resolve' and 'hg graft --continue'")
|
|
|
2599
|
raise error.Abort(
|
|
2599
|
raise error.Abort(
|
|
|
2600
|
_("unresolved conflicts, can't continue"),
|
|
2600
|
_("unresolved conflicts, can't continue"),
|
|
|
2601
|
hint=hint)
|
|
2601
|
hint=hint)
|
|
|
2602
|
else:
|
|
2602
|
else:
|
|
|
2603
|
cont = False
|
|
2603
|
cont = False
|
|
|
2604
|
|
|
2604
|
|
|
|
2605
|
# commit if --no-commit is false
|
|
2605
|
# commit if --no-commit is false
|
|
|
2606
|
if not opts.get('no_commit'):
|
|
2606
|
if not opts.get('no_commit'):
|
|
|
2607
|
node = repo.commit(text=message, user=user, date=date, extra=extra,
|
|
2607
|
node = repo.commit(text=message, user=user, date=date, extra=extra,
|
|
|
2608
|
editor=editor)
|
|
2608
|
editor=editor)
|
|
|
2609
|
if node is None:
|
|
2609
|
if node is None:
|
|
|
2610
|
ui.warn(
|
|
2610
|
ui.warn(
|
|
|
2611
|
_('note: graft of %d:%s created no changes to commit\n') %
|
|
2611
|
_('note: graft of %d:%s created no changes to commit\n') %
|
|
|
2612
|
(ctx.rev(), ctx))
|
|
2612
|
(ctx.rev(), ctx))
|
|
|
2613
|
# checking that newnodes exist because old state files won't have it
|
|
2613
|
# checking that newnodes exist because old state files won't have it
|
|
|
2614
|
elif statedata.get('newnodes') is not None:
|
|
2614
|
elif statedata.get('newnodes') is not None:
|
|
|
2615
|
statedata['newnodes'].append(node)
|
|
2615
|
statedata['newnodes'].append(node)
|
|
|
2616
|
|
|
2616
|
|
|
|
2617
|
# remove state when we complete successfully
|
|
2617
|
# remove state when we complete successfully
|
|
|
2618
|
if not opts.get('dry_run'):
|
|
2618
|
if not opts.get('dry_run'):
|
|
|
2619
|
graftstate.delete()
|
|
2619
|
graftstate.delete()
|
|
|
2620
|
|
|
2620
|
|
|
|
2621
|
return 0
|
|
2621
|
return 0
|
|
|
2622
|
|
|
2622
|
|
|
|
2623
|
def _abortgraft(ui, repo, graftstate):
|
|
2623
|
def _abortgraft(ui, repo, graftstate):
|
|
|
2624
|
"""abort the interrupted graft and rollbacks to the state before interrupted
|
|
2624
|
"""abort the interrupted graft and rollbacks to the state before interrupted
|
|
|
2625
|
graft"""
|
|
2625
|
graft"""
|
|
|
2626
|
if not graftstate.exists():
|
|
2626
|
if not graftstate.exists():
|
|
|
2627
|
raise error.Abort(_("no interrupted graft to abort"))
|
|
2627
|
raise error.Abort(_("no interrupted graft to abort"))
|
|
|
2628
|
statedata = _readgraftstate(repo, graftstate)
|
|
2628
|
statedata = _readgraftstate(repo, graftstate)
|
|
|
2629
|
newnodes = statedata.get('newnodes')
|
|
2629
|
newnodes = statedata.get('newnodes')
|
|
|
2630
|
if newnodes is None:
|
|
2630
|
if newnodes is None:
|
|
|
2631
|
# and old graft state which does not have all the data required to abort
|
|
2631
|
# and old graft state which does not have all the data required to abort
|
|
|
2632
|
# the graft
|
|
2632
|
# the graft
|
|
|
2633
|
raise error.Abort(_("cannot abort using an old graftstate"))
|
|
2633
|
raise error.Abort(_("cannot abort using an old graftstate"))
|
|
|
2634
|
|
|
2634
|
|
|
|
2635
|
# changeset from which graft operation was started
|
|
2635
|
# changeset from which graft operation was started
|
|
|
2636
|
startctx = None
|
|
2636
|
startctx = None
|
|
|
2637
|
if len(newnodes) > 0:
|
|
2637
|
if len(newnodes) > 0:
|
|
|
2638
|
startctx = repo[newnodes[0]].p1()
|
|
2638
|
startctx = repo[newnodes[0]].p1()
|
|
|
2639
|
else:
|
|
2639
|
else:
|
|
|
2640
|
startctx = repo['.']
|
|
2640
|
startctx = repo['.']
|
|
|
2641
|
# whether to strip or not
|
|
2641
|
# whether to strip or not
|
|
|
2642
|
cleanup = False
|
|
2642
|
cleanup = False
|
|
|
2643
|
if newnodes:
|
|
2643
|
if newnodes:
|
|
|
2644
|
newnodes = [repo[r].rev() for r in newnodes]
|
|
2644
|
newnodes = [repo[r].rev() for r in newnodes]
|
|
|
2645
|
cleanup = True
|
|
2645
|
cleanup = True
|
|
|
2646
|
# checking that none of the newnodes turned public or is public
|
|
2646
|
# checking that none of the newnodes turned public or is public
|
|
|
2647
|
immutable = [c for c in newnodes if not repo[c].mutable()]
|
|
2647
|
immutable = [c for c in newnodes if not repo[c].mutable()]
|
|
|
2648
|
if immutable:
|
|
2648
|
if immutable:
|
|
|
2649
|
repo.ui.warn(_("cannot clean up public changesets %s\n")
|
|
2649
|
repo.ui.warn(_("cannot clean up public changesets %s\n")
|
|
|
2650
|
% ', '.join(bytes(repo[r]) for r in immutable),
|
|
2650
|
% ', '.join(bytes(repo[r]) for r in immutable),
|
|
|
2651
|
hint=_("see 'hg help phases' for details"))
|
|
2651
|
hint=_("see 'hg help phases' for details"))
|
|
|
2652
|
cleanup = False
|
|
2652
|
cleanup = False
|
|
|
2653
|
|
|
2653
|
|
|
|
2654
|
# checking that no new nodes are created on top of grafted revs
|
|
2654
|
# checking that no new nodes are created on top of grafted revs
|
|
|
2655
|
desc = set(repo.changelog.descendants(newnodes))
|
|
2655
|
desc = set(repo.changelog.descendants(newnodes))
|
|
|
2656
|
if desc - set(newnodes):
|
|
2656
|
if desc - set(newnodes):
|
|
|
2657
|
repo.ui.warn(_("new changesets detected on destination "
|
|
2657
|
repo.ui.warn(_("new changesets detected on destination "
|
|
|
2658
|
"branch, can't strip\n"))
|
|
2658
|
"branch, can't strip\n"))
|
|
|
2659
|
cleanup = False
|
|
2659
|
cleanup = False
|
|
|
2660
|
|
|
2660
|
|
|
|
2661
|
if cleanup:
|
|
2661
|
if cleanup:
|
|
|
2662
|
with repo.wlock(), repo.lock():
|
|
2662
|
with repo.wlock(), repo.lock():
|
|
|
2663
|
hg.updaterepo(repo, startctx.node(), overwrite=True)
|
|
2663
|
hg.updaterepo(repo, startctx.node(), overwrite=True)
|
|
|
2664
|
# stripping the new nodes created
|
|
2664
|
# stripping the new nodes created
|
|
|
2665
|
strippoints = [c.node() for c in repo.set("roots(%ld)",
|
|
2665
|
strippoints = [c.node() for c in repo.set("roots(%ld)",
|
|
|
2666
|
newnodes)]
|
|
2666
|
newnodes)]
|
|
|
2667
|
repair.strip(repo.ui, repo, strippoints, backup=False)
|
|
2667
|
repair.strip(repo.ui, repo, strippoints, backup=False)
|
|
|
2668
|
|
|
2668
|
|
|
|
2669
|
if not cleanup:
|
|
2669
|
if not cleanup:
|
|
|
2670
|
# we don't update to the startnode if we can't strip
|
|
2670
|
# we don't update to the startnode if we can't strip
|
|
|
2671
|
startctx = repo['.']
|
|
2671
|
startctx = repo['.']
|
|
|
2672
|
hg.updaterepo(repo, startctx.node(), overwrite=True)
|
|
2672
|
hg.updaterepo(repo, startctx.node(), overwrite=True)
|
|
|
2673
|
|
|
2673
|
|
|
|
2674
|
ui.status(_("graft aborted\n"))
|
|
2674
|
ui.status(_("graft aborted\n"))
|
|
|
2675
|
ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
|
|
2675
|
ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
|
|
|
2676
|
graftstate.delete()
|
|
2676
|
graftstate.delete()
|
|
|
2677
|
return 0
|
|
2677
|
return 0
|
|
|
2678
|
|
|
2678
|
|
|
|
2679
|
def _readgraftstate(repo, graftstate):
|
|
2679
|
def _readgraftstate(repo, graftstate):
|
|
|
2680
|
"""read the graft state file and return a dict of the data stored in it"""
|
|
2680
|
"""read the graft state file and return a dict of the data stored in it"""
|
|
|
2681
|
try:
|
|
2681
|
try:
|
|
|
2682
|
return graftstate.read()
|
|
2682
|
return graftstate.read()
|
|
|
2683
|
except error.CorruptedState:
|
|
2683
|
except error.CorruptedState:
|
|
|
2684
|
nodes = repo.vfs.read('graftstate').splitlines()
|
|
2684
|
nodes = repo.vfs.read('graftstate').splitlines()
|
|
|
2685
|
return {'nodes': nodes}
|
|
2685
|
return {'nodes': nodes}
|
|
|
2686
|
|
|
2686
|
|
|
|
2687
|
def _stopgraft(ui, repo, graftstate):
|
|
2687
|
def _stopgraft(ui, repo, graftstate):
|
|
|
2688
|
"""stop the interrupted graft"""
|
|
2688
|
"""stop the interrupted graft"""
|
|
|
2689
|
if not graftstate.exists():
|
|
2689
|
if not graftstate.exists():
|
|
|
2690
|
raise error.Abort(_("no interrupted graft found"))
|
|
2690
|
raise error.Abort(_("no interrupted graft found"))
|
|
|
2691
|
pctx = repo['.']
|
|
2691
|
pctx = repo['.']
|
|
|
2692
|
hg.updaterepo(repo, pctx.node(), overwrite=True)
|
|
2692
|
hg.updaterepo(repo, pctx.node(), overwrite=True)
|
|
|
2693
|
graftstate.delete()
|
|
2693
|
graftstate.delete()
|
|
|
2694
|
ui.status(_("stopped the interrupted graft\n"))
|
|
2694
|
ui.status(_("stopped the interrupted graft\n"))
|
|
|
2695
|
ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
|
|
2695
|
ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
|
|
|
2696
|
return 0
|
|
2696
|
return 0
|
|
|
2697
|
|
|
2697
|
|
|
|
2698
|
@command('grep',
|
|
2698
|
@command('grep',
|
|
|
2699
|
[('0', 'print0', None, _('end fields with NUL')),
|
|
2699
|
[('0', 'print0', None, _('end fields with NUL')),
|
|
|
2700
|
('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
|
|
2700
|
('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
|
|
|
2701
|
('', 'diff', None, _('print all revisions when the term was introduced '
|
|
2701
|
('', 'diff', None, _('print all revisions when the term was introduced '
|
|
|
2702
|
'or removed')),
|
|
2702
|
'or removed')),
|
|
|
2703
|
('a', 'text', None, _('treat all files as text')),
|
|
2703
|
('a', 'text', None, _('treat all files as text')),
|
|
|
2704
|
('f', 'follow', None,
|
|
2704
|
('f', 'follow', None,
|
|
|
2705
|
_('follow changeset history,'
|
|
2705
|
_('follow changeset history,'
|
|
|
2706
|
' or file history across copies and renames')),
|
|
2706
|
' or file history across copies and renames')),
|
|
|
2707
|
('i', 'ignore-case', None, _('ignore case when matching')),
|
|
2707
|
('i', 'ignore-case', None, _('ignore case when matching')),
|
|
|
2708
|
('l', 'files-with-matches', None,
|
|
2708
|
('l', 'files-with-matches', None,
|
|
|
2709
|
_('print only filenames and revisions that match')),
|
|
2709
|
_('print only filenames and revisions that match')),
|
|
|
2710
|
('n', 'line-number', None, _('print matching line numbers')),
|
|
2710
|
('n', 'line-number', None, _('print matching line numbers')),
|
|
|
2711
|
('r', 'rev', [],
|
|
2711
|
('r', 'rev', [],
|
|
|
2712
|
_('only search files changed within revision range'), _('REV')),
|
|
2712
|
_('only search files changed within revision range'), _('REV')),
|
|
|
2713
|
('', 'all-files', None,
|
|
2713
|
('', 'all-files', None,
|
|
|
2714
|
_('include all files in the changeset while grepping (EXPERIMENTAL)')),
|
|
2714
|
_('include all files in the changeset while grepping (EXPERIMENTAL)')),
|
|
|
2715
|
('u', 'user', None, _('list the author (long with -v)')),
|
|
2715
|
('u', 'user', None, _('list the author (long with -v)')),
|
|
|
2716
|
('d', 'date', None, _('list the date (short with -q)')),
|
|
2716
|
('d', 'date', None, _('list the date (short with -q)')),
|
|
|
2717
|
] + formatteropts + walkopts,
|
|
2717
|
] + formatteropts + walkopts,
|
|
|
2718
|
_('[OPTION]... PATTERN [FILE]...'),
|
|
2718
|
_('[OPTION]... PATTERN [FILE]...'),
|
|
|
2719
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
2719
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
2720
|
inferrepo=True,
|
|
2720
|
inferrepo=True,
|
|
|
2721
|
intents={INTENT_READONLY})
|
|
2721
|
intents={INTENT_READONLY})
|
|
|
2722
|
def grep(ui, repo, pattern, *pats, **opts):
|
|
2722
|
def grep(ui, repo, pattern, *pats, **opts):
|
|
|
2723
|
"""search revision history for a pattern in specified files
|
|
2723
|
"""search revision history for a pattern in specified files
|
|
|
2724
|
|
|
2724
|
|
|
|
2725
|
Search revision history for a regular expression in the specified
|
|
2725
|
Search revision history for a regular expression in the specified
|
|
|
2726
|
files or the entire project.
|
|
2726
|
files or the entire project.
|
|
|
2727
|
|
|
2727
|
|
|
|
2728
|
By default, grep prints the most recent revision number for each
|
|
2728
|
By default, grep prints the most recent revision number for each
|
|
|
2729
|
file in which it finds a match. To get it to print every revision
|
|
2729
|
file in which it finds a match. To get it to print every revision
|
|
|
2730
|
that contains a change in match status ("-" for a match that becomes
|
|
2730
|
that contains a change in match status ("-" for a match that becomes
|
|
|
2731
|
a non-match, or "+" for a non-match that becomes a match), use the
|
|
2731
|
a non-match, or "+" for a non-match that becomes a match), use the
|
|
|
2732
|
--diff flag.
|
|
2732
|
--diff flag.
|
|
|
2733
|
|
|
2733
|
|
|
|
2734
|
PATTERN can be any Python (roughly Perl-compatible) regular
|
|
2734
|
PATTERN can be any Python (roughly Perl-compatible) regular
|
|
|
2735
|
expression.
|
|
2735
|
expression.
|
|
|
2736
|
|
|
2736
|
|
|
|
2737
|
If no FILEs are specified (and -f/--follow isn't set), all files in
|
|
2737
|
If no FILEs are specified (and -f/--follow isn't set), all files in
|
|
|
2738
|
the repository are searched, including those that don't exist in the
|
|
2738
|
the repository are searched, including those that don't exist in the
|
|
|
2739
|
current branch or have been deleted in a prior changeset.
|
|
2739
|
current branch or have been deleted in a prior changeset.
|
|
|
2740
|
|
|
2740
|
|
|
|
2741
|
.. container:: verbose
|
|
2741
|
.. container:: verbose
|
|
|
2742
|
|
|
2742
|
|
|
|
2743
|
Template:
|
|
2743
|
Template:
|
|
|
2744
|
|
|
2744
|
|
|
|
2745
|
The following keywords are supported in addition to the common template
|
|
2745
|
The following keywords are supported in addition to the common template
|
|
|
2746
|
keywords and functions. See also :hg:`help templates`.
|
|
2746
|
keywords and functions. See also :hg:`help templates`.
|
|
|
2747
|
|
|
2747
|
|
|
|
2748
|
:change: String. Character denoting insertion ``+`` or removal ``-``.
|
|
2748
|
:change: String. Character denoting insertion ``+`` or removal ``-``.
|
|
|
2749
|
Available if ``--diff`` is specified.
|
|
2749
|
Available if ``--diff`` is specified.
|
|
|
2750
|
:lineno: Integer. Line number of the match.
|
|
2750
|
:lineno: Integer. Line number of the match.
|
|
|
2751
|
:path: String. Repository-absolute path of the file.
|
|
2751
|
:path: String. Repository-absolute path of the file.
|
|
|
2752
|
:texts: List of text chunks.
|
|
2752
|
:texts: List of text chunks.
|
|
|
2753
|
|
|
2753
|
|
|
|
2754
|
And each entry of ``{texts}`` provides the following sub-keywords.
|
|
2754
|
And each entry of ``{texts}`` provides the following sub-keywords.
|
|
|
2755
|
|
|
2755
|
|
|
|
2756
|
:matched: Boolean. True if the chunk matches the specified pattern.
|
|
2756
|
:matched: Boolean. True if the chunk matches the specified pattern.
|
|
|
2757
|
:text: String. Chunk content.
|
|
2757
|
:text: String. Chunk content.
|
|
|
2758
|
|
|
2758
|
|
|
|
2759
|
See :hg:`help templates.operators` for the list expansion syntax.
|
|
2759
|
See :hg:`help templates.operators` for the list expansion syntax.
|
|
|
2760
|
|
|
2760
|
|
|
|
2761
|
Returns 0 if a match is found, 1 otherwise.
|
|
2761
|
Returns 0 if a match is found, 1 otherwise.
|
|
|
2762
|
"""
|
|
2762
|
"""
|
|
|
2763
|
opts = pycompat.byteskwargs(opts)
|
|
2763
|
opts = pycompat.byteskwargs(opts)
|
|
|
2764
|
diff = opts.get('all') or opts.get('diff')
|
|
2764
|
diff = opts.get('all') or opts.get('diff')
|
|
|
2765
|
all_files = opts.get('all_files')
|
|
2765
|
all_files = opts.get('all_files')
|
|
|
2766
|
if diff and opts.get('all_files'):
|
|
2766
|
if diff and opts.get('all_files'):
|
|
|
2767
|
raise error.Abort(_('--diff and --all-files are mutually exclusive'))
|
|
2767
|
raise error.Abort(_('--diff and --all-files are mutually exclusive'))
|
|
|
2768
|
# TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
|
|
2768
|
# TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
|
|
|
2769
|
if opts.get('all_files') is None and not opts.get('rev') and not diff:
|
|
2769
|
if opts.get('all_files') is None and not opts.get('rev') and not diff:
|
|
|
2770
|
# experimental config: commands.grep.all-files
|
|
2770
|
# experimental config: commands.grep.all-files
|
|
|
2771
|
opts['all_files'] = ui.configbool('commands', 'grep.all-files')
|
|
2771
|
opts['all_files'] = ui.configbool('commands', 'grep.all-files')
|
|
|
2772
|
plaingrep = opts.get('all_files') and not opts.get('rev')
|
|
2772
|
plaingrep = opts.get('all_files') and not opts.get('rev')
|
|
|
2773
|
if plaingrep:
|
|
2773
|
if plaingrep:
|
|
|
2774
|
opts['rev'] = ['wdir()']
|
|
2774
|
opts['rev'] = ['wdir()']
|
|
|
2775
|
|
|
2775
|
|
|
|
2776
|
reflags = re.M
|
|
2776
|
reflags = re.M
|
|
|
2777
|
if opts.get('ignore_case'):
|
|
2777
|
if opts.get('ignore_case'):
|
|
|
2778
|
reflags |= re.I
|
|
2778
|
reflags |= re.I
|
|
|
2779
|
try:
|
|
2779
|
try:
|
|
|
2780
|
regexp = util.re.compile(pattern, reflags)
|
|
2780
|
regexp = util.re.compile(pattern, reflags)
|
|
|
2781
|
except re.error as inst:
|
|
2781
|
except re.error as inst:
|
|
|
2782
|
ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
|
|
2782
|
ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
|
|
|
2783
|
return 1
|
|
2783
|
return 1
|
|
|
2784
|
sep, eol = ':', '\n'
|
|
2784
|
sep, eol = ':', '\n'
|
|
|
2785
|
if opts.get('print0'):
|
|
2785
|
if opts.get('print0'):
|
|
|
2786
|
sep = eol = '\0'
|
|
2786
|
sep = eol = '\0'
|
|
|
2787
|
|
|
2787
|
|
|
|
2788
|
getfile = util.lrucachefunc(repo.file)
|
|
2788
|
getfile = util.lrucachefunc(repo.file)
|
|
|
2789
|
|
|
2789
|
|
|
|
2790
|
def matchlines(body):
|
|
2790
|
def matchlines(body):
|
|
|
2791
|
begin = 0
|
|
2791
|
begin = 0
|
|
|
2792
|
linenum = 0
|
|
2792
|
linenum = 0
|
|
|
2793
|
while begin < len(body):
|
|
2793
|
while begin < len(body):
|
|
|
2794
|
match = regexp.search(body, begin)
|
|
2794
|
match = regexp.search(body, begin)
|
|
|
2795
|
if not match:
|
|
2795
|
if not match:
|
|
|
2796
|
break
|
|
2796
|
break
|
|
|
2797
|
mstart, mend = match.span()
|
|
2797
|
mstart, mend = match.span()
|
|
|
2798
|
linenum += body.count('\n', begin, mstart) + 1
|
|
2798
|
linenum += body.count('\n', begin, mstart) + 1
|
|
|
2799
|
lstart = body.rfind('\n', begin, mstart) + 1 or begin
|
|
2799
|
lstart = body.rfind('\n', begin, mstart) + 1 or begin
|
|
|
2800
|
begin = body.find('\n', mend) + 1 or len(body) + 1
|
|
2800
|
begin = body.find('\n', mend) + 1 or len(body) + 1
|
|
|
2801
|
lend = begin - 1
|
|
2801
|
lend = begin - 1
|
|
|
2802
|
yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
|
|
2802
|
yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
|
|
|
2803
|
|
|
2803
|
|
|
|
2804
|
class linestate(object):
|
|
2804
|
class linestate(object):
|
|
|
2805
|
def __init__(self, line, linenum, colstart, colend):
|
|
2805
|
def __init__(self, line, linenum, colstart, colend):
|
|
|
2806
|
self.line = line
|
|
2806
|
self.line = line
|
|
|
2807
|
self.linenum = linenum
|
|
2807
|
self.linenum = linenum
|
|
|
2808
|
self.colstart = colstart
|
|
2808
|
self.colstart = colstart
|
|
|
2809
|
self.colend = colend
|
|
2809
|
self.colend = colend
|
|
|
2810
|
|
|
2810
|
|
|
|
2811
|
def __hash__(self):
|
|
2811
|
def __hash__(self):
|
|
|
2812
|
return hash((self.linenum, self.line))
|
|
2812
|
return hash((self.linenum, self.line))
|
|
|
2813
|
|
|
2813
|
|
|
|
2814
|
def __eq__(self, other):
|
|
2814
|
def __eq__(self, other):
|
|
|
2815
|
return self.line == other.line
|
|
2815
|
return self.line == other.line
|
|
|
2816
|
|
|
2816
|
|
|
|
2817
|
def findpos(self):
|
|
2817
|
def findpos(self):
|
|
|
2818
|
"""Iterate all (start, end) indices of matches"""
|
|
2818
|
"""Iterate all (start, end) indices of matches"""
|
|
|
2819
|
yield self.colstart, self.colend
|
|
2819
|
yield self.colstart, self.colend
|
|
|
2820
|
p = self.colend
|
|
2820
|
p = self.colend
|
|
|
2821
|
while p < len(self.line):
|
|
2821
|
while p < len(self.line):
|
|
|
2822
|
m = regexp.search(self.line, p)
|
|
2822
|
m = regexp.search(self.line, p)
|
|
|
2823
|
if not m:
|
|
2823
|
if not m:
|
|
|
2824
|
break
|
|
2824
|
break
|
|
|
2825
|
yield m.span()
|
|
2825
|
yield m.span()
|
|
|
2826
|
p = m.end()
|
|
2826
|
p = m.end()
|
|
|
2827
|
|
|
2827
|
|
|
|
2828
|
matches = {}
|
|
2828
|
matches = {}
|
|
|
2829
|
copies = {}
|
|
2829
|
copies = {}
|
|
|
2830
|
def grepbody(fn, rev, body):
|
|
2830
|
def grepbody(fn, rev, body):
|
|
|
2831
|
matches[rev].setdefault(fn, [])
|
|
2831
|
matches[rev].setdefault(fn, [])
|
|
|
2832
|
m = matches[rev][fn]
|
|
2832
|
m = matches[rev][fn]
|
|
|
2833
|
for lnum, cstart, cend, line in matchlines(body):
|
|
2833
|
for lnum, cstart, cend, line in matchlines(body):
|
|
|
2834
|
s = linestate(line, lnum, cstart, cend)
|
|
2834
|
s = linestate(line, lnum, cstart, cend)
|
|
|
2835
|
m.append(s)
|
|
2835
|
m.append(s)
|
|
|
2836
|
|
|
2836
|
|
|
|
2837
|
def difflinestates(a, b):
|
|
2837
|
def difflinestates(a, b):
|
|
|
2838
|
sm = difflib.SequenceMatcher(None, a, b)
|
|
2838
|
sm = difflib.SequenceMatcher(None, a, b)
|
|
|
2839
|
for tag, alo, ahi, blo, bhi in sm.get_opcodes():
|
|
2839
|
for tag, alo, ahi, blo, bhi in sm.get_opcodes():
|
|
|
2840
|
if tag == r'insert':
|
|
2840
|
if tag == r'insert':
|
|
|
2841
|
for i in pycompat.xrange(blo, bhi):
|
|
2841
|
for i in pycompat.xrange(blo, bhi):
|
|
|
2842
|
yield ('+', b[i])
|
|
2842
|
yield ('+', b[i])
|
|
|
2843
|
elif tag == r'delete':
|
|
2843
|
elif tag == r'delete':
|
|
|
2844
|
for i in pycompat.xrange(alo, ahi):
|
|
2844
|
for i in pycompat.xrange(alo, ahi):
|
|
|
2845
|
yield ('-', a[i])
|
|
2845
|
yield ('-', a[i])
|
|
|
2846
|
elif tag == r'replace':
|
|
2846
|
elif tag == r'replace':
|
|
|
2847
|
for i in pycompat.xrange(alo, ahi):
|
|
2847
|
for i in pycompat.xrange(alo, ahi):
|
|
|
2848
|
yield ('-', a[i])
|
|
2848
|
yield ('-', a[i])
|
|
|
2849
|
for i in pycompat.xrange(blo, bhi):
|
|
2849
|
for i in pycompat.xrange(blo, bhi):
|
|
|
2850
|
yield ('+', b[i])
|
|
2850
|
yield ('+', b[i])
|
|
|
2851
|
|
|
2851
|
|
|
|
2852
|
def display(fm, fn, ctx, pstates, states):
|
|
2852
|
def display(fm, fn, ctx, pstates, states):
|
|
|
2853
|
rev = scmutil.intrev(ctx)
|
|
2853
|
rev = scmutil.intrev(ctx)
|
|
|
2854
|
if fm.isplain():
|
|
2854
|
if fm.isplain():
|
|
|
2855
|
formatuser = ui.shortuser
|
|
2855
|
formatuser = ui.shortuser
|
|
|
2856
|
else:
|
|
2856
|
else:
|
|
|
2857
|
formatuser = pycompat.bytestr
|
|
2857
|
formatuser = pycompat.bytestr
|
|
|
2858
|
if ui.quiet:
|
|
2858
|
if ui.quiet:
|
|
|
2859
|
datefmt = '%Y-%m-%d'
|
|
2859
|
datefmt = '%Y-%m-%d'
|
|
|
2860
|
else:
|
|
2860
|
else:
|
|
|
2861
|
datefmt = '%a %b %d %H:%M:%S %Y %1%2'
|
|
2861
|
datefmt = '%a %b %d %H:%M:%S %Y %1%2'
|
|
|
2862
|
found = False
|
|
2862
|
found = False
|
|
|
2863
|
@util.cachefunc
|
|
2863
|
@util.cachefunc
|
|
|
2864
|
def binary():
|
|
2864
|
def binary():
|
|
|
2865
|
flog = getfile(fn)
|
|
2865
|
flog = getfile(fn)
|
|
|
2866
|
try:
|
|
2866
|
try:
|
|
|
2867
|
return stringutil.binary(flog.read(ctx.filenode(fn)))
|
|
2867
|
return stringutil.binary(flog.read(ctx.filenode(fn)))
|
|
|
2868
|
except error.WdirUnsupported:
|
|
2868
|
except error.WdirUnsupported:
|
|
|
2869
|
return ctx[fn].isbinary()
|
|
2869
|
return ctx[fn].isbinary()
|
|
|
2870
|
|
|
2870
|
|
|
|
2871
|
fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'}
|
|
2871
|
fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'}
|
|
|
2872
|
if diff:
|
|
2872
|
if diff:
|
|
|
2873
|
iter = difflinestates(pstates, states)
|
|
2873
|
iter = difflinestates(pstates, states)
|
|
|
2874
|
else:
|
|
2874
|
else:
|
|
|
2875
|
iter = [('', l) for l in states]
|
|
2875
|
iter = [('', l) for l in states]
|
|
|
2876
|
for change, l in iter:
|
|
2876
|
for change, l in iter:
|
|
|
2877
|
fm.startitem()
|
|
2877
|
fm.startitem()
|
|
|
2878
|
fm.context(ctx=ctx)
|
|
2878
|
fm.context(ctx=ctx)
|
|
|
2879
|
fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
|
|
2879
|
fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
|
|
|
2880
|
|
|
2880
|
|
|
|
2881
|
cols = [
|
|
2881
|
cols = [
|
|
|
2882
|
('filename', '%s', fn, True),
|
|
2882
|
('filename', '%s', fn, True),
|
|
|
2883
|
('rev', '%d', rev, not plaingrep),
|
|
2883
|
('rev', '%d', rev, not plaingrep),
|
|
|
2884
|
('linenumber', '%d', l.linenum, opts.get('line_number')),
|
|
2884
|
('linenumber', '%d', l.linenum, opts.get('line_number')),
|
|
|
2885
|
]
|
|
2885
|
]
|
|
|
2886
|
if diff:
|
|
2886
|
if diff:
|
|
|
2887
|
cols.append(('change', '%s', change, True))
|
|
2887
|
cols.append(('change', '%s', change, True))
|
|
|
2888
|
cols.extend([
|
|
2888
|
cols.extend([
|
|
|
2889
|
('user', '%s', formatuser(ctx.user()), opts.get('user')),
|
|
2889
|
('user', '%s', formatuser(ctx.user()), opts.get('user')),
|
|
|
2890
|
('date', '%s', fm.formatdate(ctx.date(), datefmt),
|
|
2890
|
('date', '%s', fm.formatdate(ctx.date(), datefmt),
|
|
|
2891
|
opts.get('date')),
|
|
2891
|
opts.get('date')),
|
|
|
2892
|
])
|
|
2892
|
])
|
|
|
2893
|
lastcol = next(
|
|
2893
|
lastcol = next(
|
|
|
2894
|
name for name, fmt, data, cond in reversed(cols) if cond)
|
|
2894
|
name for name, fmt, data, cond in reversed(cols) if cond)
|
|
|
2895
|
for name, fmt, data, cond in cols:
|
|
2895
|
for name, fmt, data, cond in cols:
|
|
|
2896
|
field = fieldnamemap.get(name, name)
|
|
2896
|
field = fieldnamemap.get(name, name)
|
|
|
2897
|
fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
|
|
2897
|
fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
|
|
|
2898
|
if cond and name != lastcol:
|
|
2898
|
if cond and name != lastcol:
|
|
|
2899
|
fm.plain(sep, label='grep.sep')
|
|
2899
|
fm.plain(sep, label='grep.sep')
|
|
|
2900
|
if not opts.get('files_with_matches'):
|
|
2900
|
if not opts.get('files_with_matches'):
|
|
|
2901
|
fm.plain(sep, label='grep.sep')
|
|
2901
|
fm.plain(sep, label='grep.sep')
|
|
|
2902
|
if not opts.get('text') and binary():
|
|
2902
|
if not opts.get('text') and binary():
|
|
|
2903
|
fm.plain(_(" Binary file matches"))
|
|
2903
|
fm.plain(_(" Binary file matches"))
|
|
|
2904
|
else:
|
|
2904
|
else:
|
|
|
2905
|
displaymatches(fm.nested('texts', tmpl='{text}'), l)
|
|
2905
|
displaymatches(fm.nested('texts', tmpl='{text}'), l)
|
|
|
2906
|
fm.plain(eol)
|
|
2906
|
fm.plain(eol)
|
|
|
2907
|
found = True
|
|
2907
|
found = True
|
|
|
2908
|
if opts.get('files_with_matches'):
|
|
2908
|
if opts.get('files_with_matches'):
|
|
|
2909
|
break
|
|
2909
|
break
|
|
|
2910
|
return found
|
|
2910
|
return found
|
|
|
2911
|
|
|
2911
|
|
|
|
2912
|
def displaymatches(fm, l):
|
|
2912
|
def displaymatches(fm, l):
|
|
|
2913
|
p = 0
|
|
2913
|
p = 0
|
|
|
2914
|
for s, e in l.findpos():
|
|
2914
|
for s, e in l.findpos():
|
|
|
2915
|
if p < s:
|
|
2915
|
if p < s:
|
|
|
2916
|
fm.startitem()
|
|
2916
|
fm.startitem()
|
|
|
2917
|
fm.write('text', '%s', l.line[p:s])
|
|
2917
|
fm.write('text', '%s', l.line[p:s])
|
|
|
2918
|
fm.data(matched=False)
|
|
2918
|
fm.data(matched=False)
|
|
|
2919
|
fm.startitem()
|
|
2919
|
fm.startitem()
|
|
|
2920
|
fm.write('text', '%s', l.line[s:e], label='grep.match')
|
|
2920
|
fm.write('text', '%s', l.line[s:e], label='grep.match')
|
|
|
2921
|
fm.data(matched=True)
|
|
2921
|
fm.data(matched=True)
|
|
|
2922
|
p = e
|
|
2922
|
p = e
|
|
|
2923
|
if p < len(l.line):
|
|
2923
|
if p < len(l.line):
|
|
|
2924
|
fm.startitem()
|
|
2924
|
fm.startitem()
|
|
|
2925
|
fm.write('text', '%s', l.line[p:])
|
|
2925
|
fm.write('text', '%s', l.line[p:])
|
|
|
2926
|
fm.data(matched=False)
|
|
2926
|
fm.data(matched=False)
|
|
|
2927
|
fm.end()
|
|
2927
|
fm.end()
|
|
|
2928
|
|
|
2928
|
|
|
|
2929
|
skip = {}
|
|
2929
|
skip = {}
|
|
|
2930
|
revfiles = {}
|
|
2930
|
revfiles = {}
|
|
|
2931
|
match = scmutil.match(repo[None], pats, opts)
|
|
2931
|
match = scmutil.match(repo[None], pats, opts)
|
|
|
2932
|
found = False
|
|
2932
|
found = False
|
|
|
2933
|
follow = opts.get('follow')
|
|
2933
|
follow = opts.get('follow')
|
|
|
2934
|
|
|
2934
|
|
|
|
2935
|
def prep(ctx, fns):
|
|
2935
|
def prep(ctx, fns):
|
|
|
2936
|
rev = ctx.rev()
|
|
2936
|
rev = ctx.rev()
|
|
|
2937
|
pctx = ctx.p1()
|
|
2937
|
pctx = ctx.p1()
|
|
|
2938
|
parent = pctx.rev()
|
|
2938
|
parent = pctx.rev()
|
|
|
2939
|
matches.setdefault(rev, {})
|
|
2939
|
matches.setdefault(rev, {})
|
|
|
2940
|
matches.setdefault(parent, {})
|
|
2940
|
matches.setdefault(parent, {})
|
|
|
2941
|
files = revfiles.setdefault(rev, [])
|
|
2941
|
files = revfiles.setdefault(rev, [])
|
|
|
2942
|
for fn in fns:
|
|
2942
|
for fn in fns:
|
|
|
2943
|
flog = getfile(fn)
|
|
2943
|
flog = getfile(fn)
|
|
|
2944
|
try:
|
|
2944
|
try:
|
|
|
2945
|
fnode = ctx.filenode(fn)
|
|
2945
|
fnode = ctx.filenode(fn)
|
|
|
2946
|
except error.LookupError:
|
|
2946
|
except error.LookupError:
|
|
|
2947
|
continue
|
|
2947
|
continue
|
|
|
2948
|
try:
|
|
2948
|
try:
|
|
|
2949
|
copied = flog.renamed(fnode)
|
|
2949
|
copied = flog.renamed(fnode)
|
|
|
2950
|
except error.WdirUnsupported:
|
|
2950
|
except error.WdirUnsupported:
|
|
|
2951
|
copied = ctx[fn].renamed()
|
|
2951
|
copied = ctx[fn].renamed()
|
|
|
2952
|
copy = follow and copied and copied[0]
|
|
2952
|
copy = follow and copied and copied[0]
|
|
|
2953
|
if copy:
|
|
2953
|
if copy:
|
|
|
2954
|
copies.setdefault(rev, {})[fn] = copy
|
|
2954
|
copies.setdefault(rev, {})[fn] = copy
|
|
|
2955
|
if fn in skip:
|
|
2955
|
if fn in skip:
|
|
|
2956
|
if copy:
|
|
2956
|
if copy:
|
|
|
2957
|
skip[copy] = True
|
|
2957
|
skip[copy] = True
|
|
|
2958
|
continue
|
|
2958
|
continue
|
|
|
2959
|
files.append(fn)
|
|
2959
|
files.append(fn)
|
|
|
2960
|
|
|
2960
|
|
|
|
2961
|
if fn not in matches[rev]:
|
|
2961
|
if fn not in matches[rev]:
|
|
|
2962
|
try:
|
|
2962
|
try:
|
|
|
2963
|
content = flog.read(fnode)
|
|
2963
|
content = flog.read(fnode)
|
|
|
2964
|
except error.WdirUnsupported:
|
|
2964
|
except error.WdirUnsupported:
|
|
|
2965
|
content = ctx[fn].data()
|
|
2965
|
content = ctx[fn].data()
|
|
|
2966
|
grepbody(fn, rev, content)
|
|
2966
|
grepbody(fn, rev, content)
|
|
|
2967
|
|
|
2967
|
|
|
|
2968
|
pfn = copy or fn
|
|
2968
|
pfn = copy or fn
|
|
|
2969
|
if pfn not in matches[parent]:
|
|
2969
|
if pfn not in matches[parent]:
|
|
|
2970
|
try:
|
|
2970
|
try:
|
|
|
2971
|
fnode = pctx.filenode(pfn)
|
|
2971
|
fnode = pctx.filenode(pfn)
|
|
|
2972
|
grepbody(pfn, parent, flog.read(fnode))
|
|
2972
|
grepbody(pfn, parent, flog.read(fnode))
|
|
|
2973
|
except error.LookupError:
|
|
2973
|
except error.LookupError:
|
|
|
2974
|
pass
|
|
2974
|
pass
|
|
|
2975
|
|
|
2975
|
|
|
|
2976
|
ui.pager('grep')
|
|
2976
|
ui.pager('grep')
|
|
|
2977
|
fm = ui.formatter('grep', opts)
|
|
2977
|
fm = ui.formatter('grep', opts)
|
|
|
2978
|
for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
|
|
2978
|
for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
|
|
|
2979
|
rev = ctx.rev()
|
|
2979
|
rev = ctx.rev()
|
|
|
2980
|
parent = ctx.p1().rev()
|
|
2980
|
parent = ctx.p1().rev()
|
|
|
2981
|
for fn in sorted(revfiles.get(rev, [])):
|
|
2981
|
for fn in sorted(revfiles.get(rev, [])):
|
|
|
2982
|
states = matches[rev][fn]
|
|
2982
|
states = matches[rev][fn]
|
|
|
2983
|
copy = copies.get(rev, {}).get(fn)
|
|
2983
|
copy = copies.get(rev, {}).get(fn)
|
|
|
2984
|
if fn in skip:
|
|
2984
|
if fn in skip:
|
|
|
2985
|
if copy:
|
|
2985
|
if copy:
|
|
|
2986
|
skip[copy] = True
|
|
2986
|
skip[copy] = True
|
|
|
2987
|
continue
|
|
2987
|
continue
|
|
|
2988
|
pstates = matches.get(parent, {}).get(copy or fn, [])
|
|
2988
|
pstates = matches.get(parent, {}).get(copy or fn, [])
|
|
|
2989
|
if pstates or states:
|
|
2989
|
if pstates or states:
|
|
|
2990
|
r = display(fm, fn, ctx, pstates, states)
|
|
2990
|
r = display(fm, fn, ctx, pstates, states)
|
|
|
2991
|
found = found or r
|
|
2991
|
found = found or r
|
|
|
2992
|
if r and not diff and not all_files:
|
|
2992
|
if r and not diff and not all_files:
|
|
|
2993
|
skip[fn] = True
|
|
2993
|
skip[fn] = True
|
|
|
2994
|
if copy:
|
|
2994
|
if copy:
|
|
|
2995
|
skip[copy] = True
|
|
2995
|
skip[copy] = True
|
|
|
2996
|
del revfiles[rev]
|
|
2996
|
del revfiles[rev]
|
|
|
2997
|
# We will keep the matches dict for the duration of the window
|
|
2997
|
# We will keep the matches dict for the duration of the window
|
|
|
2998
|
# clear the matches dict once the window is over
|
|
2998
|
# clear the matches dict once the window is over
|
|
|
2999
|
if not revfiles:
|
|
2999
|
if not revfiles:
|
|
|
3000
|
matches.clear()
|
|
3000
|
matches.clear()
|
|
|
3001
|
fm.end()
|
|
3001
|
fm.end()
|
|
|
3002
|
|
|
3002
|
|
|
|
3003
|
return not found
|
|
3003
|
return not found
|
|
|
3004
|
|
|
3004
|
|
|
|
3005
|
@command('heads',
|
|
3005
|
@command('heads',
|
|
|
3006
|
[('r', 'rev', '',
|
|
3006
|
[('r', 'rev', '',
|
|
|
3007
|
_('show only heads which are descendants of STARTREV'), _('STARTREV')),
|
|
3007
|
_('show only heads which are descendants of STARTREV'), _('STARTREV')),
|
|
|
3008
|
('t', 'topo', False, _('show topological heads only')),
|
|
3008
|
('t', 'topo', False, _('show topological heads only')),
|
|
|
3009
|
('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
|
|
3009
|
('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
|
|
|
3010
|
('c', 'closed', False, _('show normal and closed branch heads')),
|
|
3010
|
('c', 'closed', False, _('show normal and closed branch heads')),
|
|
|
3011
|
] + templateopts,
|
|
3011
|
] + templateopts,
|
|
|
3012
|
_('[-ct] [-r STARTREV] [REV]...'),
|
|
3012
|
_('[-ct] [-r STARTREV] [REV]...'),
|
|
|
3013
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
3013
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
3014
|
intents={INTENT_READONLY})
|
|
3014
|
intents={INTENT_READONLY})
|
|
|
3015
|
def heads(ui, repo, *branchrevs, **opts):
|
|
3015
|
def heads(ui, repo, *branchrevs, **opts):
|
|
|
3016
|
"""show branch heads
|
|
3016
|
"""show branch heads
|
|
|
3017
|
|
|
3017
|
|
|
|
3018
|
With no arguments, show all open branch heads in the repository.
|
|
3018
|
With no arguments, show all open branch heads in the repository.
|
|
|
3019
|
Branch heads are changesets that have no descendants on the
|
|
3019
|
Branch heads are changesets that have no descendants on the
|
|
|
3020
|
same branch. They are where development generally takes place and
|
|
3020
|
same branch. They are where development generally takes place and
|
|
|
3021
|
are the usual targets for update and merge operations.
|
|
3021
|
are the usual targets for update and merge operations.
|
|
|
3022
|
|
|
3022
|
|
|
|
3023
|
If one or more REVs are given, only open branch heads on the
|
|
3023
|
If one or more REVs are given, only open branch heads on the
|
|
|
3024
|
branches associated with the specified changesets are shown. This
|
|
3024
|
branches associated with the specified changesets are shown. This
|
|
|
3025
|
means that you can use :hg:`heads .` to see the heads on the
|
|
3025
|
means that you can use :hg:`heads .` to see the heads on the
|
|
|
3026
|
currently checked-out branch.
|
|
3026
|
currently checked-out branch.
|
|
|
3027
|
|
|
3027
|
|
|
|
3028
|
If -c/--closed is specified, also show branch heads marked closed
|
|
3028
|
If -c/--closed is specified, also show branch heads marked closed
|
|
|
3029
|
(see :hg:`commit --close-branch`).
|
|
3029
|
(see :hg:`commit --close-branch`).
|
|
|
3030
|
|
|
3030
|
|
|
|
3031
|
If STARTREV is specified, only those heads that are descendants of
|
|
3031
|
If STARTREV is specified, only those heads that are descendants of
|
|
|
3032
|
STARTREV will be displayed.
|
|
3032
|
STARTREV will be displayed.
|
|
|
3033
|
|
|
3033
|
|
|
|
3034
|
If -t/--topo is specified, named branch mechanics will be ignored and only
|
|
3034
|
If -t/--topo is specified, named branch mechanics will be ignored and only
|
|
|
3035
|
topological heads (changesets with no children) will be shown.
|
|
3035
|
topological heads (changesets with no children) will be shown.
|
|
|
3036
|
|
|
3036
|
|
|
|
3037
|
Returns 0 if matching heads are found, 1 if not.
|
|
3037
|
Returns 0 if matching heads are found, 1 if not.
|
|
|
3038
|
"""
|
|
3038
|
"""
|
|
|
3039
|
|
|
3039
|
|
|
|
3040
|
opts = pycompat.byteskwargs(opts)
|
|
3040
|
opts = pycompat.byteskwargs(opts)
|
|
|
3041
|
start = None
|
|
3041
|
start = None
|
|
|
3042
|
rev = opts.get('rev')
|
|
3042
|
rev = opts.get('rev')
|
|
|
3043
|
if rev:
|
|
3043
|
if rev:
|
|
|
3044
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
3044
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
3045
|
start = scmutil.revsingle(repo, rev, None).node()
|
|
3045
|
start = scmutil.revsingle(repo, rev, None).node()
|
|
|
3046
|
|
|
3046
|
|
|
|
3047
|
if opts.get('topo'):
|
|
3047
|
if opts.get('topo'):
|
|
|
3048
|
heads = [repo[h] for h in repo.heads(start)]
|
|
3048
|
heads = [repo[h] for h in repo.heads(start)]
|
|
|
3049
|
else:
|
|
3049
|
else:
|
|
|
3050
|
heads = []
|
|
3050
|
heads = []
|
|
|
3051
|
for branch in repo.branchmap():
|
|
3051
|
for branch in repo.branchmap():
|
|
|
3052
|
heads += repo.branchheads(branch, start, opts.get('closed'))
|
|
3052
|
heads += repo.branchheads(branch, start, opts.get('closed'))
|
|
|
3053
|
heads = [repo[h] for h in heads]
|
|
3053
|
heads = [repo[h] for h in heads]
|
|
|
3054
|
|
|
3054
|
|
|
|
3055
|
if branchrevs:
|
|
3055
|
if branchrevs:
|
|
|
3056
|
branches = set(repo[r].branch()
|
|
3056
|
branches = set(repo[r].branch()
|
|
|
3057
|
for r in scmutil.revrange(repo, branchrevs))
|
|
3057
|
for r in scmutil.revrange(repo, branchrevs))
|
|
|
3058
|
heads = [h for h in heads if h.branch() in branches]
|
|
3058
|
heads = [h for h in heads if h.branch() in branches]
|
|
|
3059
|
|
|
3059
|
|
|
|
3060
|
if opts.get('active') and branchrevs:
|
|
3060
|
if opts.get('active') and branchrevs:
|
|
|
3061
|
dagheads = repo.heads(start)
|
|
3061
|
dagheads = repo.heads(start)
|
|
|
3062
|
heads = [h for h in heads if h.node() in dagheads]
|
|
3062
|
heads = [h for h in heads if h.node() in dagheads]
|
|
|
3063
|
|
|
3063
|
|
|
|
3064
|
if branchrevs:
|
|
3064
|
if branchrevs:
|
|
|
3065
|
haveheads = set(h.branch() for h in heads)
|
|
3065
|
haveheads = set(h.branch() for h in heads)
|
|
|
3066
|
if branches - haveheads:
|
|
3066
|
if branches - haveheads:
|
|
|
3067
|
headless = ', '.join(b for b in branches - haveheads)
|
|
3067
|
headless = ', '.join(b for b in branches - haveheads)
|
|
|
3068
|
msg = _('no open branch heads found on branches %s')
|
|
3068
|
msg = _('no open branch heads found on branches %s')
|
|
|
3069
|
if opts.get('rev'):
|
|
3069
|
if opts.get('rev'):
|
|
|
3070
|
msg += _(' (started at %s)') % opts['rev']
|
|
3070
|
msg += _(' (started at %s)') % opts['rev']
|
|
|
3071
|
ui.warn((msg + '\n') % headless)
|
|
3071
|
ui.warn((msg + '\n') % headless)
|
|
|
3072
|
|
|
3072
|
|
|
|
3073
|
if not heads:
|
|
3073
|
if not heads:
|
|
|
3074
|
return 1
|
|
3074
|
return 1
|
|
|
3075
|
|
|
3075
|
|
|
|
3076
|
ui.pager('heads')
|
|
3076
|
ui.pager('heads')
|
|
|
3077
|
heads = sorted(heads, key=lambda x: -x.rev())
|
|
3077
|
heads = sorted(heads, key=lambda x: -x.rev())
|
|
|
3078
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
3078
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
3079
|
for ctx in heads:
|
|
3079
|
for ctx in heads:
|
|
|
3080
|
displayer.show(ctx)
|
|
3080
|
displayer.show(ctx)
|
|
|
3081
|
displayer.close()
|
|
3081
|
displayer.close()
|
|
|
3082
|
|
|
3082
|
|
|
|
3083
|
@command('help',
|
|
3083
|
@command('help',
|
|
|
3084
|
[('e', 'extension', None, _('show only help for extensions')),
|
|
3084
|
[('e', 'extension', None, _('show only help for extensions')),
|
|
|
3085
|
('c', 'command', None, _('show only help for commands')),
|
|
3085
|
('c', 'command', None, _('show only help for commands')),
|
|
|
3086
|
('k', 'keyword', None, _('show topics matching keyword')),
|
|
3086
|
('k', 'keyword', None, _('show topics matching keyword')),
|
|
|
3087
|
('s', 'system', [],
|
|
3087
|
('s', 'system', [],
|
|
|
3088
|
_('show help for specific platform(s)'), _('PLATFORM')),
|
|
3088
|
_('show help for specific platform(s)'), _('PLATFORM')),
|
|
|
3089
|
],
|
|
3089
|
],
|
|
|
3090
|
_('[-eck] [-s PLATFORM] [TOPIC]'),
|
|
3090
|
_('[-eck] [-s PLATFORM] [TOPIC]'),
|
|
|
3091
|
helpcategory=command.CATEGORY_HELP,
|
|
3091
|
helpcategory=command.CATEGORY_HELP,
|
|
|
3092
|
norepo=True,
|
|
3092
|
norepo=True,
|
|
|
3093
|
intents={INTENT_READONLY})
|
|
3093
|
intents={INTENT_READONLY})
|
|
|
3094
|
def help_(ui, name=None, **opts):
|
|
3094
|
def help_(ui, name=None, **opts):
|
|
|
3095
|
"""show help for a given topic or a help overview
|
|
3095
|
"""show help for a given topic or a help overview
|
|
|
3096
|
|
|
3096
|
|
|
|
3097
|
With no arguments, print a list of commands with short help messages.
|
|
3097
|
With no arguments, print a list of commands with short help messages.
|
|
|
3098
|
|
|
3098
|
|
|
|
3099
|
Given a topic, extension, or command name, print help for that
|
|
3099
|
Given a topic, extension, or command name, print help for that
|
|
|
3100
|
topic.
|
|
3100
|
topic.
|
|
|
3101
|
|
|
3101
|
|
|
|
3102
|
Returns 0 if successful.
|
|
3102
|
Returns 0 if successful.
|
|
|
3103
|
"""
|
|
3103
|
"""
|
|
|
3104
|
|
|
3104
|
|
|
|
3105
|
keep = opts.get(r'system') or []
|
|
3105
|
keep = opts.get(r'system') or []
|
|
|
3106
|
if len(keep) == 0:
|
|
3106
|
if len(keep) == 0:
|
|
|
3107
|
if pycompat.sysplatform.startswith('win'):
|
|
3107
|
if pycompat.sysplatform.startswith('win'):
|
|
|
3108
|
keep.append('windows')
|
|
3108
|
keep.append('windows')
|
|
|
3109
|
elif pycompat.sysplatform == 'OpenVMS':
|
|
3109
|
elif pycompat.sysplatform == 'OpenVMS':
|
|
|
3110
|
keep.append('vms')
|
|
3110
|
keep.append('vms')
|
|
|
3111
|
elif pycompat.sysplatform == 'plan9':
|
|
3111
|
elif pycompat.sysplatform == 'plan9':
|
|
|
3112
|
keep.append('plan9')
|
|
3112
|
keep.append('plan9')
|
|
|
3113
|
else:
|
|
3113
|
else:
|
|
|
3114
|
keep.append('unix')
|
|
3114
|
keep.append('unix')
|
|
|
3115
|
keep.append(pycompat.sysplatform.lower())
|
|
3115
|
keep.append(pycompat.sysplatform.lower())
|
|
|
3116
|
if ui.verbose:
|
|
3116
|
if ui.verbose:
|
|
|
3117
|
keep.append('verbose')
|
|
3117
|
keep.append('verbose')
|
|
|
3118
|
|
|
3118
|
|
|
|
3119
|
commands = sys.modules[__name__]
|
|
3119
|
commands = sys.modules[__name__]
|
|
|
3120
|
formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
|
|
3120
|
formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
|
|
|
3121
|
ui.pager('help')
|
|
3121
|
ui.pager('help')
|
|
|
3122
|
ui.write(formatted)
|
|
3122
|
ui.write(formatted)
|
|
|
3123
|
|
|
3123
|
|
|
|
3124
|
|
|
3124
|
|
|
|
3125
|
@command('identify|id',
|
|
3125
|
@command('identify|id',
|
|
|
3126
|
[('r', 'rev', '',
|
|
3126
|
[('r', 'rev', '',
|
|
|
3127
|
_('identify the specified revision'), _('REV')),
|
|
3127
|
_('identify the specified revision'), _('REV')),
|
|
|
3128
|
('n', 'num', None, _('show local revision number')),
|
|
3128
|
('n', 'num', None, _('show local revision number')),
|
|
|
3129
|
('i', 'id', None, _('show global revision id')),
|
|
3129
|
('i', 'id', None, _('show global revision id')),
|
|
|
3130
|
('b', 'branch', None, _('show branch')),
|
|
3130
|
('b', 'branch', None, _('show branch')),
|
|
|
3131
|
('t', 'tags', None, _('show tags')),
|
|
3131
|
('t', 'tags', None, _('show tags')),
|
|
|
3132
|
('B', 'bookmarks', None, _('show bookmarks')),
|
|
3132
|
('B', 'bookmarks', None, _('show bookmarks')),
|
|
|
3133
|
] + remoteopts + formatteropts,
|
|
3133
|
] + remoteopts + formatteropts,
|
|
|
3134
|
_('[-nibtB] [-r REV] [SOURCE]'),
|
|
3134
|
_('[-nibtB] [-r REV] [SOURCE]'),
|
|
|
3135
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
3135
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
3136
|
optionalrepo=True,
|
|
3136
|
optionalrepo=True,
|
|
|
3137
|
intents={INTENT_READONLY})
|
|
3137
|
intents={INTENT_READONLY})
|
|
|
3138
|
def identify(ui, repo, source=None, rev=None,
|
|
3138
|
def identify(ui, repo, source=None, rev=None,
|
|
|
3139
|
num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
|
|
3139
|
num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
|
|
|
3140
|
"""identify the working directory or specified revision
|
|
3140
|
"""identify the working directory or specified revision
|
|
|
3141
|
|
|
3141
|
|
|
|
3142
|
Print a summary identifying the repository state at REV using one or
|
|
3142
|
Print a summary identifying the repository state at REV using one or
|
|
|
3143
|
two parent hash identifiers, followed by a "+" if the working
|
|
3143
|
two parent hash identifiers, followed by a "+" if the working
|
|
|
3144
|
directory has uncommitted changes, the branch name (if not default),
|
|
3144
|
directory has uncommitted changes, the branch name (if not default),
|
|
|
3145
|
a list of tags, and a list of bookmarks.
|
|
3145
|
a list of tags, and a list of bookmarks.
|
|
|
3146
|
|
|
3146
|
|
|
|
3147
|
When REV is not given, print a summary of the current state of the
|
|
3147
|
When REV is not given, print a summary of the current state of the
|
|
|
3148
|
repository including the working directory. Specify -r. to get information
|
|
3148
|
repository including the working directory. Specify -r. to get information
|
|
|
3149
|
of the working directory parent without scanning uncommitted changes.
|
|
3149
|
of the working directory parent without scanning uncommitted changes.
|
|
|
3150
|
|
|
3150
|
|
|
|
3151
|
Specifying a path to a repository root or Mercurial bundle will
|
|
3151
|
Specifying a path to a repository root or Mercurial bundle will
|
|
|
3152
|
cause lookup to operate on that repository/bundle.
|
|
3152
|
cause lookup to operate on that repository/bundle.
|
|
|
3153
|
|
|
3153
|
|
|
|
3154
|
.. container:: verbose
|
|
3154
|
.. container:: verbose
|
|
|
3155
|
|
|
3155
|
|
|
|
3156
|
Template:
|
|
3156
|
Template:
|
|
|
3157
|
|
|
3157
|
|
|
|
3158
|
The following keywords are supported in addition to the common template
|
|
3158
|
The following keywords are supported in addition to the common template
|
|
|
3159
|
keywords and functions. See also :hg:`help templates`.
|
|
3159
|
keywords and functions. See also :hg:`help templates`.
|
|
|
3160
|
|
|
3160
|
|
|
|
3161
|
:dirty: String. Character ``+`` denoting if the working directory has
|
|
3161
|
:dirty: String. Character ``+`` denoting if the working directory has
|
|
|
3162
|
uncommitted changes.
|
|
3162
|
uncommitted changes.
|
|
|
3163
|
:id: String. One or two nodes, optionally followed by ``+``.
|
|
3163
|
:id: String. One or two nodes, optionally followed by ``+``.
|
|
|
3164
|
:parents: List of strings. Parent nodes of the changeset.
|
|
3164
|
:parents: List of strings. Parent nodes of the changeset.
|
|
|
3165
|
|
|
3165
|
|
|
|
3166
|
Examples:
|
|
3166
|
Examples:
|
|
|
3167
|
|
|
3167
|
|
|
|
3168
|
- generate a build identifier for the working directory::
|
|
3168
|
- generate a build identifier for the working directory::
|
|
|
3169
|
|
|
3169
|
|
|
|
3170
|
hg id --id > build-id.dat
|
|
3170
|
hg id --id > build-id.dat
|
|
|
3171
|
|
|
3171
|
|
|
|
3172
|
- find the revision corresponding to a tag::
|
|
3172
|
- find the revision corresponding to a tag::
|
|
|
3173
|
|
|
3173
|
|
|
|
3174
|
hg id -n -r 1.3
|
|
3174
|
hg id -n -r 1.3
|
|
|
3175
|
|
|
3175
|
|
|
|
3176
|
- check the most recent revision of a remote repository::
|
|
3176
|
- check the most recent revision of a remote repository::
|
|
|
3177
|
|
|
3177
|
|
|
|
3178
|
hg id -r tip https://www.mercurial-scm.org/repo/hg/
|
|
3178
|
hg id -r tip https://www.mercurial-scm.org/repo/hg/
|
|
|
3179
|
|
|
3179
|
|
|
|
3180
|
See :hg:`log` for generating more information about specific revisions,
|
|
3180
|
See :hg:`log` for generating more information about specific revisions,
|
|
|
3181
|
including full hash identifiers.
|
|
3181
|
including full hash identifiers.
|
|
|
3182
|
|
|
3182
|
|
|
|
3183
|
Returns 0 if successful.
|
|
3183
|
Returns 0 if successful.
|
|
|
3184
|
"""
|
|
3184
|
"""
|
|
|
3185
|
|
|
3185
|
|
|
|
3186
|
opts = pycompat.byteskwargs(opts)
|
|
3186
|
opts = pycompat.byteskwargs(opts)
|
|
|
3187
|
if not repo and not source:
|
|
3187
|
if not repo and not source:
|
|
|
3188
|
raise error.Abort(_("there is no Mercurial repository here "
|
|
3188
|
raise error.Abort(_("there is no Mercurial repository here "
|
|
|
3189
|
"(.hg not found)"))
|
|
3189
|
"(.hg not found)"))
|
|
|
3190
|
|
|
3190
|
|
|
|
3191
|
default = not (num or id or branch or tags or bookmarks)
|
|
3191
|
default = not (num or id or branch or tags or bookmarks)
|
|
|
3192
|
output = []
|
|
3192
|
output = []
|
|
|
3193
|
revs = []
|
|
3193
|
revs = []
|
|
|
3194
|
|
|
3194
|
|
|
|
3195
|
if source:
|
|
3195
|
if source:
|
|
|
3196
|
source, branches = hg.parseurl(ui.expandpath(source))
|
|
3196
|
source, branches = hg.parseurl(ui.expandpath(source))
|
|
|
3197
|
peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
|
|
3197
|
peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
|
|
|
3198
|
repo = peer.local()
|
|
3198
|
repo = peer.local()
|
|
|
3199
|
revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
|
|
3199
|
revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
|
|
|
3200
|
|
|
3200
|
|
|
|
3201
|
fm = ui.formatter('identify', opts)
|
|
3201
|
fm = ui.formatter('identify', opts)
|
|
|
3202
|
fm.startitem()
|
|
3202
|
fm.startitem()
|
|
|
3203
|
|
|
3203
|
|
|
|
3204
|
if not repo:
|
|
3204
|
if not repo:
|
|
|
3205
|
if num or branch or tags:
|
|
3205
|
if num or branch or tags:
|
|
|
3206
|
raise error.Abort(
|
|
3206
|
raise error.Abort(
|
|
|
3207
|
_("can't query remote revision number, branch, or tags"))
|
|
3207
|
_("can't query remote revision number, branch, or tags"))
|
|
|
3208
|
if not rev and revs:
|
|
3208
|
if not rev and revs:
|
|
|
3209
|
rev = revs[0]
|
|
3209
|
rev = revs[0]
|
|
|
3210
|
if not rev:
|
|
3210
|
if not rev:
|
|
|
3211
|
rev = "tip"
|
|
3211
|
rev = "tip"
|
|
|
3212
|
|
|
3212
|
|
|
|
3213
|
remoterev = peer.lookup(rev)
|
|
3213
|
remoterev = peer.lookup(rev)
|
|
|
3214
|
hexrev = fm.hexfunc(remoterev)
|
|
3214
|
hexrev = fm.hexfunc(remoterev)
|
|
|
3215
|
if default or id:
|
|
3215
|
if default or id:
|
|
|
3216
|
output = [hexrev]
|
|
3216
|
output = [hexrev]
|
|
|
3217
|
fm.data(id=hexrev)
|
|
3217
|
fm.data(id=hexrev)
|
|
|
3218
|
|
|
3218
|
|
|
|
3219
|
@util.cachefunc
|
|
3219
|
@util.cachefunc
|
|
|
3220
|
def getbms():
|
|
3220
|
def getbms():
|
|
|
3221
|
bms = []
|
|
3221
|
bms = []
|
|
|
3222
|
|
|
3222
|
|
|
|
3223
|
if 'bookmarks' in peer.listkeys('namespaces'):
|
|
3223
|
if 'bookmarks' in peer.listkeys('namespaces'):
|
|
|
3224
|
hexremoterev = hex(remoterev)
|
|
3224
|
hexremoterev = hex(remoterev)
|
|
|
3225
|
bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
|
|
3225
|
bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
|
|
|
3226
|
if bmr == hexremoterev]
|
|
3226
|
if bmr == hexremoterev]
|
|
|
3227
|
|
|
3227
|
|
|
|
3228
|
return sorted(bms)
|
|
3228
|
return sorted(bms)
|
|
|
3229
|
|
|
3229
|
|
|
|
3230
|
if fm.isplain():
|
|
3230
|
if fm.isplain():
|
|
|
3231
|
if bookmarks:
|
|
3231
|
if bookmarks:
|
|
|
3232
|
output.extend(getbms())
|
|
3232
|
output.extend(getbms())
|
|
|
3233
|
elif default and not ui.quiet:
|
|
3233
|
elif default and not ui.quiet:
|
|
|
3234
|
# multiple bookmarks for a single parent separated by '/'
|
|
3234
|
# multiple bookmarks for a single parent separated by '/'
|
|
|
3235
|
bm = '/'.join(getbms())
|
|
3235
|
bm = '/'.join(getbms())
|
|
|
3236
|
if bm:
|
|
3236
|
if bm:
|
|
|
3237
|
output.append(bm)
|
|
3237
|
output.append(bm)
|
|
|
3238
|
else:
|
|
3238
|
else:
|
|
|
3239
|
fm.data(node=hex(remoterev))
|
|
3239
|
fm.data(node=hex(remoterev))
|
|
|
3240
|
if bookmarks or 'bookmarks' in fm.datahint():
|
|
3240
|
if bookmarks or 'bookmarks' in fm.datahint():
|
|
|
3241
|
fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
|
|
3241
|
fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
|
|
|
3242
|
else:
|
|
3242
|
else:
|
|
|
3243
|
if rev:
|
|
3243
|
if rev:
|
|
|
3244
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
3244
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
3245
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
3245
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
|
3246
|
|
|
3246
|
|
|
|
3247
|
if ctx.rev() is None:
|
|
3247
|
if ctx.rev() is None:
|
|
|
3248
|
ctx = repo[None]
|
|
3248
|
ctx = repo[None]
|
|
|
3249
|
parents = ctx.parents()
|
|
3249
|
parents = ctx.parents()
|
|
|
3250
|
taglist = []
|
|
3250
|
taglist = []
|
|
|
3251
|
for p in parents:
|
|
3251
|
for p in parents:
|
|
|
3252
|
taglist.extend(p.tags())
|
|
3252
|
taglist.extend(p.tags())
|
|
|
3253
|
|
|
3253
|
|
|
|
3254
|
dirty = ""
|
|
3254
|
dirty = ""
|
|
|
3255
|
if ctx.dirty(missing=True, merge=False, branch=False):
|
|
3255
|
if ctx.dirty(missing=True, merge=False, branch=False):
|
|
|
3256
|
dirty = '+'
|
|
3256
|
dirty = '+'
|
|
|
3257
|
fm.data(dirty=dirty)
|
|
3257
|
fm.data(dirty=dirty)
|
|
|
3258
|
|
|
3258
|
|
|
|
3259
|
hexoutput = [fm.hexfunc(p.node()) for p in parents]
|
|
3259
|
hexoutput = [fm.hexfunc(p.node()) for p in parents]
|
|
|
3260
|
if default or id:
|
|
3260
|
if default or id:
|
|
|
3261
|
output = ["%s%s" % ('+'.join(hexoutput), dirty)]
|
|
3261
|
output = ["%s%s" % ('+'.join(hexoutput), dirty)]
|
|
|
3262
|
fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
|
|
3262
|
fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
|
|
|
3263
|
|
|
3263
|
|
|
|
3264
|
if num:
|
|
3264
|
if num:
|
|
|
3265
|
numoutput = ["%d" % p.rev() for p in parents]
|
|
3265
|
numoutput = ["%d" % p.rev() for p in parents]
|
|
|
3266
|
output.append("%s%s" % ('+'.join(numoutput), dirty))
|
|
3266
|
output.append("%s%s" % ('+'.join(numoutput), dirty))
|
|
|
3267
|
|
|
3267
|
|
|
|
3268
|
fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
|
|
3268
|
fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
|
|
|
3269
|
for p in parents], name='node'))
|
|
3269
|
for p in parents], name='node'))
|
|
|
3270
|
else:
|
|
3270
|
else:
|
|
|
3271
|
hexoutput = fm.hexfunc(ctx.node())
|
|
3271
|
hexoutput = fm.hexfunc(ctx.node())
|
|
|
3272
|
if default or id:
|
|
3272
|
if default or id:
|
|
|
3273
|
output = [hexoutput]
|
|
3273
|
output = [hexoutput]
|
|
|
3274
|
fm.data(id=hexoutput)
|
|
3274
|
fm.data(id=hexoutput)
|
|
|
3275
|
|
|
3275
|
|
|
|
3276
|
if num:
|
|
3276
|
if num:
|
|
|
3277
|
output.append(pycompat.bytestr(ctx.rev()))
|
|
3277
|
output.append(pycompat.bytestr(ctx.rev()))
|
|
|
3278
|
taglist = ctx.tags()
|
|
3278
|
taglist = ctx.tags()
|
|
|
3279
|
|
|
3279
|
|
|
|
3280
|
if default and not ui.quiet:
|
|
3280
|
if default and not ui.quiet:
|
|
|
3281
|
b = ctx.branch()
|
|
3281
|
b = ctx.branch()
|
|
|
3282
|
if b != 'default':
|
|
3282
|
if b != 'default':
|
|
|
3283
|
output.append("(%s)" % b)
|
|
3283
|
output.append("(%s)" % b)
|
|
|
3284
|
|
|
3284
|
|
|
|
3285
|
# multiple tags for a single parent separated by '/'
|
|
3285
|
# multiple tags for a single parent separated by '/'
|
|
|
3286
|
t = '/'.join(taglist)
|
|
3286
|
t = '/'.join(taglist)
|
|
|
3287
|
if t:
|
|
3287
|
if t:
|
|
|
3288
|
output.append(t)
|
|
3288
|
output.append(t)
|
|
|
3289
|
|
|
3289
|
|
|
|
3290
|
# multiple bookmarks for a single parent separated by '/'
|
|
3290
|
# multiple bookmarks for a single parent separated by '/'
|
|
|
3291
|
bm = '/'.join(ctx.bookmarks())
|
|
3291
|
bm = '/'.join(ctx.bookmarks())
|
|
|
3292
|
if bm:
|
|
3292
|
if bm:
|
|
|
3293
|
output.append(bm)
|
|
3293
|
output.append(bm)
|
|
|
3294
|
else:
|
|
3294
|
else:
|
|
|
3295
|
if branch:
|
|
3295
|
if branch:
|
|
|
3296
|
output.append(ctx.branch())
|
|
3296
|
output.append(ctx.branch())
|
|
|
3297
|
|
|
3297
|
|
|
|
3298
|
if tags:
|
|
3298
|
if tags:
|
|
|
3299
|
output.extend(taglist)
|
|
3299
|
output.extend(taglist)
|
|
|
3300
|
|
|
3300
|
|
|
|
3301
|
if bookmarks:
|
|
3301
|
if bookmarks:
|
|
|
3302
|
output.extend(ctx.bookmarks())
|
|
3302
|
output.extend(ctx.bookmarks())
|
|
|
3303
|
|
|
3303
|
|
|
|
3304
|
fm.data(node=ctx.hex())
|
|
3304
|
fm.data(node=ctx.hex())
|
|
|
3305
|
fm.data(branch=ctx.branch())
|
|
3305
|
fm.data(branch=ctx.branch())
|
|
|
3306
|
fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
|
|
3306
|
fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
|
|
|
3307
|
fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
|
|
3307
|
fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
|
|
|
3308
|
fm.context(ctx=ctx)
|
|
3308
|
fm.context(ctx=ctx)
|
|
|
3309
|
|
|
3309
|
|
|
|
3310
|
fm.plain("%s\n" % ' '.join(output))
|
|
3310
|
fm.plain("%s\n" % ' '.join(output))
|
|
|
3311
|
fm.end()
|
|
3311
|
fm.end()
|
|
|
3312
|
|
|
3312
|
|
|
|
3313
|
@command('import|patch',
|
|
3313
|
@command('import|patch',
|
|
|
3314
|
[('p', 'strip', 1,
|
|
3314
|
[('p', 'strip', 1,
|
|
|
3315
|
_('directory strip option for patch. This has the same '
|
|
3315
|
_('directory strip option for patch. This has the same '
|
|
|
3316
|
'meaning as the corresponding patch option'), _('NUM')),
|
|
3316
|
'meaning as the corresponding patch option'), _('NUM')),
|
|
|
3317
|
('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
|
|
3317
|
('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
|
|
|
3318
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
3318
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
|
3319
|
('f', 'force', None,
|
|
3319
|
('f', 'force', None,
|
|
|
3320
|
_('skip check for outstanding uncommitted changes (DEPRECATED)')),
|
|
3320
|
_('skip check for outstanding uncommitted changes (DEPRECATED)')),
|
|
|
3321
|
('', 'no-commit', None,
|
|
3321
|
('', 'no-commit', None,
|
|
|
3322
|
_("don't commit, just update the working directory")),
|
|
3322
|
_("don't commit, just update the working directory")),
|
|
|
3323
|
('', 'bypass', None,
|
|
3323
|
('', 'bypass', None,
|
|
|
3324
|
_("apply patch without touching the working directory")),
|
|
3324
|
_("apply patch without touching the working directory")),
|
|
|
3325
|
('', 'partial', None,
|
|
3325
|
('', 'partial', None,
|
|
|
3326
|
_('commit even if some hunks fail')),
|
|
3326
|
_('commit even if some hunks fail')),
|
|
|
3327
|
('', 'exact', None,
|
|
3327
|
('', 'exact', None,
|
|
|
3328
|
_('abort if patch would apply lossily')),
|
|
3328
|
_('abort if patch would apply lossily')),
|
|
|
3329
|
('', 'prefix', '',
|
|
3329
|
('', 'prefix', '',
|
|
|
3330
|
_('apply patch to subdirectory'), _('DIR')),
|
|
3330
|
_('apply patch to subdirectory'), _('DIR')),
|
|
|
3331
|
('', 'import-branch', None,
|
|
3331
|
('', 'import-branch', None,
|
|
|
3332
|
_('use any branch information in patch (implied by --exact)'))] +
|
|
3332
|
_('use any branch information in patch (implied by --exact)'))] +
|
|
|
3333
|
commitopts + commitopts2 + similarityopts,
|
|
3333
|
commitopts + commitopts2 + similarityopts,
|
|
|
3334
|
_('[OPTION]... PATCH...'),
|
|
3334
|
_('[OPTION]... PATCH...'),
|
|
|
3335
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
3335
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
3336
|
def import_(ui, repo, patch1=None, *patches, **opts):
|
|
3336
|
def import_(ui, repo, patch1=None, *patches, **opts):
|
|
|
3337
|
"""import an ordered set of patches
|
|
3337
|
"""import an ordered set of patches
|
|
|
3338
|
|
|
3338
|
|
|
|
3339
|
Import a list of patches and commit them individually (unless
|
|
3339
|
Import a list of patches and commit them individually (unless
|
|
|
3340
|
--no-commit is specified).
|
|
3340
|
--no-commit is specified).
|
|
|
3341
|
|
|
3341
|
|
|
|
3342
|
To read a patch from standard input (stdin), use "-" as the patch
|
|
3342
|
To read a patch from standard input (stdin), use "-" as the patch
|
|
|
3343
|
name. If a URL is specified, the patch will be downloaded from
|
|
3343
|
name. If a URL is specified, the patch will be downloaded from
|
|
|
3344
|
there.
|
|
3344
|
there.
|
|
|
3345
|
|
|
3345
|
|
|
|
3346
|
Import first applies changes to the working directory (unless
|
|
3346
|
Import first applies changes to the working directory (unless
|
|
|
3347
|
--bypass is specified), import will abort if there are outstanding
|
|
3347
|
--bypass is specified), import will abort if there are outstanding
|
|
|
3348
|
changes.
|
|
3348
|
changes.
|
|
|
3349
|
|
|
3349
|
|
|
|
3350
|
Use --bypass to apply and commit patches directly to the
|
|
3350
|
Use --bypass to apply and commit patches directly to the
|
|
|
3351
|
repository, without affecting the working directory. Without
|
|
3351
|
repository, without affecting the working directory. Without
|
|
|
3352
|
--exact, patches will be applied on top of the working directory
|
|
3352
|
--exact, patches will be applied on top of the working directory
|
|
|
3353
|
parent revision.
|
|
3353
|
parent revision.
|
|
|
3354
|
|
|
3354
|
|
|
|
3355
|
You can import a patch straight from a mail message. Even patches
|
|
3355
|
You can import a patch straight from a mail message. Even patches
|
|
|
3356
|
as attachments work (to use the body part, it must have type
|
|
3356
|
as attachments work (to use the body part, it must have type
|
|
|
3357
|
text/plain or text/x-patch). From and Subject headers of email
|
|
3357
|
text/plain or text/x-patch). From and Subject headers of email
|
|
|
3358
|
message are used as default committer and commit message. All
|
|
3358
|
message are used as default committer and commit message. All
|
|
|
3359
|
text/plain body parts before first diff are added to the commit
|
|
3359
|
text/plain body parts before first diff are added to the commit
|
|
|
3360
|
message.
|
|
3360
|
message.
|
|
|
3361
|
|
|
3361
|
|
|
|
3362
|
If the imported patch was generated by :hg:`export`, user and
|
|
3362
|
If the imported patch was generated by :hg:`export`, user and
|
|
|
3363
|
description from patch override values from message headers and
|
|
3363
|
description from patch override values from message headers and
|
|
|
3364
|
body. Values given on command line with -m/--message and -u/--user
|
|
3364
|
body. Values given on command line with -m/--message and -u/--user
|
|
|
3365
|
override these.
|
|
3365
|
override these.
|
|
|
3366
|
|
|
3366
|
|
|
|
3367
|
If --exact is specified, import will set the working directory to
|
|
3367
|
If --exact is specified, import will set the working directory to
|
|
|
3368
|
the parent of each patch before applying it, and will abort if the
|
|
3368
|
the parent of each patch before applying it, and will abort if the
|
|
|
3369
|
resulting changeset has a different ID than the one recorded in
|
|
3369
|
resulting changeset has a different ID than the one recorded in
|
|
|
3370
|
the patch. This will guard against various ways that portable
|
|
3370
|
the patch. This will guard against various ways that portable
|
|
|
3371
|
patch formats and mail systems might fail to transfer Mercurial
|
|
3371
|
patch formats and mail systems might fail to transfer Mercurial
|
|
|
3372
|
data or metadata. See :hg:`bundle` for lossless transmission.
|
|
3372
|
data or metadata. See :hg:`bundle` for lossless transmission.
|
|
|
3373
|
|
|
3373
|
|
|
|
3374
|
Use --partial to ensure a changeset will be created from the patch
|
|
3374
|
Use --partial to ensure a changeset will be created from the patch
|
|
|
3375
|
even if some hunks fail to apply. Hunks that fail to apply will be
|
|
3375
|
even if some hunks fail to apply. Hunks that fail to apply will be
|
|
|
3376
|
written to a <target-file>.rej file. Conflicts can then be resolved
|
|
3376
|
written to a <target-file>.rej file. Conflicts can then be resolved
|
|
|
3377
|
by hand before :hg:`commit --amend` is run to update the created
|
|
3377
|
by hand before :hg:`commit --amend` is run to update the created
|
|
|
3378
|
changeset. This flag exists to let people import patches that
|
|
3378
|
changeset. This flag exists to let people import patches that
|
|
|
3379
|
partially apply without losing the associated metadata (author,
|
|
3379
|
partially apply without losing the associated metadata (author,
|
|
|
3380
|
date, description, ...).
|
|
3380
|
date, description, ...).
|
|
|
3381
|
|
|
3381
|
|
|
|
3382
|
.. note::
|
|
3382
|
.. note::
|
|
|
3383
|
|
|
3383
|
|
|
|
3384
|
When no hunks apply cleanly, :hg:`import --partial` will create
|
|
3384
|
When no hunks apply cleanly, :hg:`import --partial` will create
|
|
|
3385
|
an empty changeset, importing only the patch metadata.
|
|
3385
|
an empty changeset, importing only the patch metadata.
|
|
|
3386
|
|
|
3386
|
|
|
|
3387
|
With -s/--similarity, hg will attempt to discover renames and
|
|
3387
|
With -s/--similarity, hg will attempt to discover renames and
|
|
|
3388
|
copies in the patch in the same way as :hg:`addremove`.
|
|
3388
|
copies in the patch in the same way as :hg:`addremove`.
|
|
|
3389
|
|
|
3389
|
|
|
|
3390
|
It is possible to use external patch programs to perform the patch
|
|
3390
|
It is possible to use external patch programs to perform the patch
|
|
|
3391
|
by setting the ``ui.patch`` configuration option. For the default
|
|
3391
|
by setting the ``ui.patch`` configuration option. For the default
|
|
|
3392
|
internal tool, the fuzz can also be configured via ``patch.fuzz``.
|
|
3392
|
internal tool, the fuzz can also be configured via ``patch.fuzz``.
|
|
|
3393
|
See :hg:`help config` for more information about configuration
|
|
3393
|
See :hg:`help config` for more information about configuration
|
|
|
3394
|
files and how to use these options.
|
|
3394
|
files and how to use these options.
|
|
|
3395
|
|
|
3395
|
|
|
|
3396
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
3396
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
3397
|
|
|
3397
|
|
|
|
3398
|
.. container:: verbose
|
|
3398
|
.. container:: verbose
|
|
|
3399
|
|
|
3399
|
|
|
|
3400
|
Examples:
|
|
3400
|
Examples:
|
|
|
3401
|
|
|
3401
|
|
|
|
3402
|
- import a traditional patch from a website and detect renames::
|
|
3402
|
- import a traditional patch from a website and detect renames::
|
|
|
3403
|
|
|
3403
|
|
|
|
3404
|
hg import -s 80 http://example.com/bugfix.patch
|
|
3404
|
hg import -s 80 http://example.com/bugfix.patch
|
|
|
3405
|
|
|
3405
|
|
|
|
3406
|
- import a changeset from an hgweb server::
|
|
3406
|
- import a changeset from an hgweb server::
|
|
|
3407
|
|
|
3407
|
|
|
|
3408
|
hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
|
|
3408
|
hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
|
|
|
3409
|
|
|
3409
|
|
|
|
3410
|
- import all the patches in an Unix-style mbox::
|
|
3410
|
- import all the patches in an Unix-style mbox::
|
|
|
3411
|
|
|
3411
|
|
|
|
3412
|
hg import incoming-patches.mbox
|
|
3412
|
hg import incoming-patches.mbox
|
|
|
3413
|
|
|
3413
|
|
|
|
3414
|
- import patches from stdin::
|
|
3414
|
- import patches from stdin::
|
|
|
3415
|
|
|
3415
|
|
|
|
3416
|
hg import -
|
|
3416
|
hg import -
|
|
|
3417
|
|
|
3417
|
|
|
|
3418
|
- attempt to exactly restore an exported changeset (not always
|
|
3418
|
- attempt to exactly restore an exported changeset (not always
|
|
|
3419
|
possible)::
|
|
3419
|
possible)::
|
|
|
3420
|
|
|
3420
|
|
|
|
3421
|
hg import --exact proposed-fix.patch
|
|
3421
|
hg import --exact proposed-fix.patch
|
|
|
3422
|
|
|
3422
|
|
|
|
3423
|
- use an external tool to apply a patch which is too fuzzy for
|
|
3423
|
- use an external tool to apply a patch which is too fuzzy for
|
|
|
3424
|
the default internal tool.
|
|
3424
|
the default internal tool.
|
|
|
3425
|
|
|
3425
|
|
|
|
3426
|
hg import --config ui.patch="patch --merge" fuzzy.patch
|
|
3426
|
hg import --config ui.patch="patch --merge" fuzzy.patch
|
|
|
3427
|
|
|
3427
|
|
|
|
3428
|
- change the default fuzzing from 2 to a less strict 7
|
|
3428
|
- change the default fuzzing from 2 to a less strict 7
|
|
|
3429
|
|
|
3429
|
|
|
|
3430
|
hg import --config ui.fuzz=7 fuzz.patch
|
|
3430
|
hg import --config ui.fuzz=7 fuzz.patch
|
|
|
3431
|
|
|
3431
|
|
|
|
3432
|
Returns 0 on success, 1 on partial success (see --partial).
|
|
3432
|
Returns 0 on success, 1 on partial success (see --partial).
|
|
|
3433
|
"""
|
|
3433
|
"""
|
|
|
3434
|
|
|
3434
|
|
|
|
3435
|
opts = pycompat.byteskwargs(opts)
|
|
3435
|
opts = pycompat.byteskwargs(opts)
|
|
|
3436
|
if not patch1:
|
|
3436
|
if not patch1:
|
|
|
3437
|
raise error.Abort(_('need at least one patch to import'))
|
|
3437
|
raise error.Abort(_('need at least one patch to import'))
|
|
|
3438
|
|
|
3438
|
|
|
|
3439
|
patches = (patch1,) + patches
|
|
3439
|
patches = (patch1,) + patches
|
|
|
3440
|
|
|
3440
|
|
|
|
3441
|
date = opts.get('date')
|
|
3441
|
date = opts.get('date')
|
|
|
3442
|
if date:
|
|
3442
|
if date:
|
|
|
3443
|
opts['date'] = dateutil.parsedate(date)
|
|
3443
|
opts['date'] = dateutil.parsedate(date)
|
|
|
3444
|
|
|
3444
|
|
|
|
3445
|
exact = opts.get('exact')
|
|
3445
|
exact = opts.get('exact')
|
|
|
3446
|
update = not opts.get('bypass')
|
|
3446
|
update = not opts.get('bypass')
|
|
|
3447
|
if not update and opts.get('no_commit'):
|
|
3447
|
if not update and opts.get('no_commit'):
|
|
|
3448
|
raise error.Abort(_('cannot use --no-commit with --bypass'))
|
|
3448
|
raise error.Abort(_('cannot use --no-commit with --bypass'))
|
|
|
3449
|
try:
|
|
3449
|
try:
|
|
|
3450
|
sim = float(opts.get('similarity') or 0)
|
|
3450
|
sim = float(opts.get('similarity') or 0)
|
|
|
3451
|
except ValueError:
|
|
3451
|
except ValueError:
|
|
|
3452
|
raise error.Abort(_('similarity must be a number'))
|
|
3452
|
raise error.Abort(_('similarity must be a number'))
|
|
|
3453
|
if sim < 0 or sim > 100:
|
|
3453
|
if sim < 0 or sim > 100:
|
|
|
3454
|
raise error.Abort(_('similarity must be between 0 and 100'))
|
|
3454
|
raise error.Abort(_('similarity must be between 0 and 100'))
|
|
|
3455
|
if sim and not update:
|
|
3455
|
if sim and not update:
|
|
|
3456
|
raise error.Abort(_('cannot use --similarity with --bypass'))
|
|
3456
|
raise error.Abort(_('cannot use --similarity with --bypass'))
|
|
|
3457
|
if exact:
|
|
3457
|
if exact:
|
|
|
3458
|
if opts.get('edit'):
|
|
3458
|
if opts.get('edit'):
|
|
|
3459
|
raise error.Abort(_('cannot use --exact with --edit'))
|
|
3459
|
raise error.Abort(_('cannot use --exact with --edit'))
|
|
|
3460
|
if opts.get('prefix'):
|
|
3460
|
if opts.get('prefix'):
|
|
|
3461
|
raise error.Abort(_('cannot use --exact with --prefix'))
|
|
3461
|
raise error.Abort(_('cannot use --exact with --prefix'))
|
|
|
3462
|
|
|
3462
|
|
|
|
3463
|
base = opts["base"]
|
|
3463
|
base = opts["base"]
|
|
|
3464
|
msgs = []
|
|
3464
|
msgs = []
|
|
|
3465
|
ret = 0
|
|
3465
|
ret = 0
|
|
|
3466
|
|
|
3466
|
|
|
|
3467
|
with repo.wlock():
|
|
3467
|
with repo.wlock():
|
|
|
3468
|
if update:
|
|
3468
|
if update:
|
|
|
3469
|
cmdutil.checkunfinished(repo)
|
|
3469
|
cmdutil.checkunfinished(repo)
|
|
|
3470
|
if (exact or not opts.get('force')):
|
|
3470
|
if (exact or not opts.get('force')):
|
|
|
3471
|
cmdutil.bailifchanged(repo)
|
|
3471
|
cmdutil.bailifchanged(repo)
|
|
|
3472
|
|
|
3472
|
|
|
|
3473
|
if not opts.get('no_commit'):
|
|
3473
|
if not opts.get('no_commit'):
|
|
|
3474
|
lock = repo.lock
|
|
3474
|
lock = repo.lock
|
|
|
3475
|
tr = lambda: repo.transaction('import')
|
|
3475
|
tr = lambda: repo.transaction('import')
|
|
|
3476
|
dsguard = util.nullcontextmanager
|
|
3476
|
dsguard = util.nullcontextmanager
|
|
|
3477
|
else:
|
|
3477
|
else:
|
|
|
3478
|
lock = util.nullcontextmanager
|
|
3478
|
lock = util.nullcontextmanager
|
|
|
3479
|
tr = util.nullcontextmanager
|
|
3479
|
tr = util.nullcontextmanager
|
|
|
3480
|
dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
|
|
3480
|
dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
|
|
|
3481
|
with lock(), tr(), dsguard():
|
|
3481
|
with lock(), tr(), dsguard():
|
|
|
3482
|
parents = repo[None].parents()
|
|
3482
|
parents = repo[None].parents()
|
|
|
3483
|
for patchurl in patches:
|
|
3483
|
for patchurl in patches:
|
|
|
3484
|
if patchurl == '-':
|
|
3484
|
if patchurl == '-':
|
|
|
3485
|
ui.status(_('applying patch from stdin\n'))
|
|
3485
|
ui.status(_('applying patch from stdin\n'))
|
|
|
3486
|
patchfile = ui.fin
|
|
3486
|
patchfile = ui.fin
|
|
|
3487
|
patchurl = 'stdin' # for error message
|
|
3487
|
patchurl = 'stdin' # for error message
|
|
|
3488
|
else:
|
|
3488
|
else:
|
|
|
3489
|
patchurl = os.path.join(base, patchurl)
|
|
3489
|
patchurl = os.path.join(base, patchurl)
|
|
|
3490
|
ui.status(_('applying %s\n') % patchurl)
|
|
3490
|
ui.status(_('applying %s\n') % patchurl)
|
|
|
3491
|
patchfile = hg.openpath(ui, patchurl)
|
|
3491
|
patchfile = hg.openpath(ui, patchurl)
|
|
|
3492
|
|
|
3492
|
|
|
|
3493
|
haspatch = False
|
|
3493
|
haspatch = False
|
|
|
3494
|
for hunk in patch.split(patchfile):
|
|
3494
|
for hunk in patch.split(patchfile):
|
|
|
3495
|
with patch.extract(ui, hunk) as patchdata:
|
|
3495
|
with patch.extract(ui, hunk) as patchdata:
|
|
|
3496
|
msg, node, rej = cmdutil.tryimportone(ui, repo,
|
|
3496
|
msg, node, rej = cmdutil.tryimportone(ui, repo,
|
|
|
3497
|
patchdata,
|
|
3497
|
patchdata,
|
|
|
3498
|
parents, opts,
|
|
3498
|
parents, opts,
|
|
|
3499
|
msgs, hg.clean)
|
|
3499
|
msgs, hg.clean)
|
|
|
3500
|
if msg:
|
|
3500
|
if msg:
|
|
|
3501
|
haspatch = True
|
|
3501
|
haspatch = True
|
|
|
3502
|
ui.note(msg + '\n')
|
|
3502
|
ui.note(msg + '\n')
|
|
|
3503
|
if update or exact:
|
|
3503
|
if update or exact:
|
|
|
3504
|
parents = repo[None].parents()
|
|
3504
|
parents = repo[None].parents()
|
|
|
3505
|
else:
|
|
3505
|
else:
|
|
|
3506
|
parents = [repo[node]]
|
|
3506
|
parents = [repo[node]]
|
|
|
3507
|
if rej:
|
|
3507
|
if rej:
|
|
|
3508
|
ui.write_err(_("patch applied partially\n"))
|
|
3508
|
ui.write_err(_("patch applied partially\n"))
|
|
|
3509
|
ui.write_err(_("(fix the .rej files and run "
|
|
3509
|
ui.write_err(_("(fix the .rej files and run "
|
|
|
3510
|
"`hg commit --amend`)\n"))
|
|
3510
|
"`hg commit --amend`)\n"))
|
|
|
3511
|
ret = 1
|
|
3511
|
ret = 1
|
|
|
3512
|
break
|
|
3512
|
break
|
|
|
3513
|
|
|
3513
|
|
|
|
3514
|
if not haspatch:
|
|
3514
|
if not haspatch:
|
|
|
3515
|
raise error.Abort(_('%s: no diffs found') % patchurl)
|
|
3515
|
raise error.Abort(_('%s: no diffs found') % patchurl)
|
|
|
3516
|
|
|
3516
|
|
|
|
3517
|
if msgs:
|
|
3517
|
if msgs:
|
|
|
3518
|
repo.savecommitmessage('\n* * *\n'.join(msgs))
|
|
3518
|
repo.savecommitmessage('\n* * *\n'.join(msgs))
|
|
|
3519
|
return ret
|
|
3519
|
return ret
|
|
|
3520
|
|
|
3520
|
|
|
|
3521
|
@command('incoming|in',
|
|
3521
|
@command('incoming|in',
|
|
|
3522
|
[('f', 'force', None,
|
|
3522
|
[('f', 'force', None,
|
|
|
3523
|
_('run even if remote repository is unrelated')),
|
|
3523
|
_('run even if remote repository is unrelated')),
|
|
|
3524
|
('n', 'newest-first', None, _('show newest record first')),
|
|
3524
|
('n', 'newest-first', None, _('show newest record first')),
|
|
|
3525
|
('', 'bundle', '',
|
|
3525
|
('', 'bundle', '',
|
|
|
3526
|
_('file to store the bundles into'), _('FILE')),
|
|
3526
|
_('file to store the bundles into'), _('FILE')),
|
|
|
3527
|
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
|
|
3527
|
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
|
|
|
3528
|
('B', 'bookmarks', False, _("compare bookmarks")),
|
|
3528
|
('B', 'bookmarks', False, _("compare bookmarks")),
|
|
|
3529
|
('b', 'branch', [],
|
|
3529
|
('b', 'branch', [],
|
|
|
3530
|
_('a specific branch you would like to pull'), _('BRANCH')),
|
|
3530
|
_('a specific branch you would like to pull'), _('BRANCH')),
|
|
|
3531
|
] + logopts + remoteopts + subrepoopts,
|
|
3531
|
] + logopts + remoteopts + subrepoopts,
|
|
|
3532
|
_('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
|
|
3532
|
_('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
|
|
|
3533
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
|
|
3533
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
|
|
|
3534
|
def incoming(ui, repo, source="default", **opts):
|
|
3534
|
def incoming(ui, repo, source="default", **opts):
|
|
|
3535
|
"""show new changesets found in source
|
|
3535
|
"""show new changesets found in source
|
|
|
3536
|
|
|
3536
|
|
|
|
3537
|
Show new changesets found in the specified path/URL or the default
|
|
3537
|
Show new changesets found in the specified path/URL or the default
|
|
|
3538
|
pull location. These are the changesets that would have been pulled
|
|
3538
|
pull location. These are the changesets that would have been pulled
|
|
|
3539
|
by :hg:`pull` at the time you issued this command.
|
|
3539
|
by :hg:`pull` at the time you issued this command.
|
|
|
3540
|
|
|
3540
|
|
|
|
3541
|
See pull for valid source format details.
|
|
3541
|
See pull for valid source format details.
|
|
|
3542
|
|
|
3542
|
|
|
|
3543
|
.. container:: verbose
|
|
3543
|
.. container:: verbose
|
|
|
3544
|
|
|
3544
|
|
|
|
3545
|
With -B/--bookmarks, the result of bookmark comparison between
|
|
3545
|
With -B/--bookmarks, the result of bookmark comparison between
|
|
|
3546
|
local and remote repositories is displayed. With -v/--verbose,
|
|
3546
|
local and remote repositories is displayed. With -v/--verbose,
|
|
|
3547
|
status is also displayed for each bookmark like below::
|
|
3547
|
status is also displayed for each bookmark like below::
|
|
|
3548
|
|
|
3548
|
|
|
|
3549
|
BM1 01234567890a added
|
|
3549
|
BM1 01234567890a added
|
|
|
3550
|
BM2 1234567890ab advanced
|
|
3550
|
BM2 1234567890ab advanced
|
|
|
3551
|
BM3 234567890abc diverged
|
|
3551
|
BM3 234567890abc diverged
|
|
|
3552
|
BM4 34567890abcd changed
|
|
3552
|
BM4 34567890abcd changed
|
|
|
3553
|
|
|
3553
|
|
|
|
3554
|
The action taken locally when pulling depends on the
|
|
3554
|
The action taken locally when pulling depends on the
|
|
|
3555
|
status of each bookmark:
|
|
3555
|
status of each bookmark:
|
|
|
3556
|
|
|
3556
|
|
|
|
3557
|
:``added``: pull will create it
|
|
3557
|
:``added``: pull will create it
|
|
|
3558
|
:``advanced``: pull will update it
|
|
3558
|
:``advanced``: pull will update it
|
|
|
3559
|
:``diverged``: pull will create a divergent bookmark
|
|
3559
|
:``diverged``: pull will create a divergent bookmark
|
|
|
3560
|
:``changed``: result depends on remote changesets
|
|
3560
|
:``changed``: result depends on remote changesets
|
|
|
3561
|
|
|
3561
|
|
|
|
3562
|
From the point of view of pulling behavior, bookmark
|
|
3562
|
From the point of view of pulling behavior, bookmark
|
|
|
3563
|
existing only in the remote repository are treated as ``added``,
|
|
3563
|
existing only in the remote repository are treated as ``added``,
|
|
|
3564
|
even if it is in fact locally deleted.
|
|
3564
|
even if it is in fact locally deleted.
|
|
|
3565
|
|
|
3565
|
|
|
|
3566
|
.. container:: verbose
|
|
3566
|
.. container:: verbose
|
|
|
3567
|
|
|
3567
|
|
|
|
3568
|
For remote repository, using --bundle avoids downloading the
|
|
3568
|
For remote repository, using --bundle avoids downloading the
|
|
|
3569
|
changesets twice if the incoming is followed by a pull.
|
|
3569
|
changesets twice if the incoming is followed by a pull.
|
|
|
3570
|
|
|
3570
|
|
|
|
3571
|
Examples:
|
|
3571
|
Examples:
|
|
|
3572
|
|
|
3572
|
|
|
|
3573
|
- show incoming changes with patches and full description::
|
|
3573
|
- show incoming changes with patches and full description::
|
|
|
3574
|
|
|
3574
|
|
|
|
3575
|
hg incoming -vp
|
|
3575
|
hg incoming -vp
|
|
|
3576
|
|
|
3576
|
|
|
|
3577
|
- show incoming changes excluding merges, store a bundle::
|
|
3577
|
- show incoming changes excluding merges, store a bundle::
|
|
|
3578
|
|
|
3578
|
|
|
|
3579
|
hg in -vpM --bundle incoming.hg
|
|
3579
|
hg in -vpM --bundle incoming.hg
|
|
|
3580
|
hg pull incoming.hg
|
|
3580
|
hg pull incoming.hg
|
|
|
3581
|
|
|
3581
|
|
|
|
3582
|
- briefly list changes inside a bundle::
|
|
3582
|
- briefly list changes inside a bundle::
|
|
|
3583
|
|
|
3583
|
|
|
|
3584
|
hg in changes.hg -T "{desc|firstline}\\n"
|
|
3584
|
hg in changes.hg -T "{desc|firstline}\\n"
|
|
|
3585
|
|
|
3585
|
|
|
|
3586
|
Returns 0 if there are incoming changes, 1 otherwise.
|
|
3586
|
Returns 0 if there are incoming changes, 1 otherwise.
|
|
|
3587
|
"""
|
|
3587
|
"""
|
|
|
3588
|
opts = pycompat.byteskwargs(opts)
|
|
3588
|
opts = pycompat.byteskwargs(opts)
|
|
|
3589
|
if opts.get('graph'):
|
|
3589
|
if opts.get('graph'):
|
|
|
3590
|
logcmdutil.checkunsupportedgraphflags([], opts)
|
|
3590
|
logcmdutil.checkunsupportedgraphflags([], opts)
|
|
|
3591
|
def display(other, chlist, displayer):
|
|
3591
|
def display(other, chlist, displayer):
|
|
|
3592
|
revdag = logcmdutil.graphrevs(other, chlist, opts)
|
|
3592
|
revdag = logcmdutil.graphrevs(other, chlist, opts)
|
|
|
3593
|
logcmdutil.displaygraph(ui, repo, revdag, displayer,
|
|
3593
|
logcmdutil.displaygraph(ui, repo, revdag, displayer,
|
|
|
3594
|
graphmod.asciiedges)
|
|
3594
|
graphmod.asciiedges)
|
|
|
3595
|
|
|
3595
|
|
|
|
3596
|
hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
|
|
3596
|
hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
|
|
|
3597
|
return 0
|
|
3597
|
return 0
|
|
|
3598
|
|
|
3598
|
|
|
|
3599
|
if opts.get('bundle') and opts.get('subrepos'):
|
|
3599
|
if opts.get('bundle') and opts.get('subrepos'):
|
|
|
3600
|
raise error.Abort(_('cannot combine --bundle and --subrepos'))
|
|
3600
|
raise error.Abort(_('cannot combine --bundle and --subrepos'))
|
|
|
3601
|
|
|
3601
|
|
|
|
3602
|
if opts.get('bookmarks'):
|
|
3602
|
if opts.get('bookmarks'):
|
|
|
3603
|
source, branches = hg.parseurl(ui.expandpath(source),
|
|
3603
|
source, branches = hg.parseurl(ui.expandpath(source),
|
|
|
3604
|
opts.get('branch'))
|
|
3604
|
opts.get('branch'))
|
|
|
3605
|
other = hg.peer(repo, opts, source)
|
|
3605
|
other = hg.peer(repo, opts, source)
|
|
|
3606
|
if 'bookmarks' not in other.listkeys('namespaces'):
|
|
3606
|
if 'bookmarks' not in other.listkeys('namespaces'):
|
|
|
3607
|
ui.warn(_("remote doesn't support bookmarks\n"))
|
|
3607
|
ui.warn(_("remote doesn't support bookmarks\n"))
|
|
|
3608
|
return 0
|
|
3608
|
return 0
|
|
|
3609
|
ui.pager('incoming')
|
|
3609
|
ui.pager('incoming')
|
|
|
3610
|
ui.status(_('comparing with %s\n') % util.hidepassword(source))
|
|
3610
|
ui.status(_('comparing with %s\n') % util.hidepassword(source))
|
|
|
3611
|
return bookmarks.incoming(ui, repo, other)
|
|
3611
|
return bookmarks.incoming(ui, repo, other)
|
|
|
3612
|
|
|
3612
|
|
|
|
3613
|
repo._subtoppath = ui.expandpath(source)
|
|
3613
|
repo._subtoppath = ui.expandpath(source)
|
|
|
3614
|
try:
|
|
3614
|
try:
|
|
|
3615
|
return hg.incoming(ui, repo, source, opts)
|
|
3615
|
return hg.incoming(ui, repo, source, opts)
|
|
|
3616
|
finally:
|
|
3616
|
finally:
|
|
|
3617
|
del repo._subtoppath
|
|
3617
|
del repo._subtoppath
|
|
|
3618
|
|
|
3618
|
|
|
|
3619
|
|
|
3619
|
|
|
|
3620
|
@command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
|
|
3620
|
@command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
|
|
|
3621
|
helpcategory=command.CATEGORY_REPO_CREATION,
|
|
3621
|
helpcategory=command.CATEGORY_REPO_CREATION,
|
|
|
3622
|
helpbasic=True, norepo=True)
|
|
3622
|
helpbasic=True, norepo=True)
|
|
|
3623
|
def init(ui, dest=".", **opts):
|
|
3623
|
def init(ui, dest=".", **opts):
|
|
|
3624
|
"""create a new repository in the given directory
|
|
3624
|
"""create a new repository in the given directory
|
|
|
3625
|
|
|
3625
|
|
|
|
3626
|
Initialize a new repository in the given directory. If the given
|
|
3626
|
Initialize a new repository in the given directory. If the given
|
|
|
3627
|
directory does not exist, it will be created.
|
|
3627
|
directory does not exist, it will be created.
|
|
|
3628
|
|
|
3628
|
|
|
|
3629
|
If no directory is given, the current directory is used.
|
|
3629
|
If no directory is given, the current directory is used.
|
|
|
3630
|
|
|
3630
|
|
|
|
3631
|
It is possible to specify an ``ssh://`` URL as the destination.
|
|
3631
|
It is possible to specify an ``ssh://`` URL as the destination.
|
|
|
3632
|
See :hg:`help urls` for more information.
|
|
3632
|
See :hg:`help urls` for more information.
|
|
|
3633
|
|
|
3633
|
|
|
|
3634
|
Returns 0 on success.
|
|
3634
|
Returns 0 on success.
|
|
|
3635
|
"""
|
|
3635
|
"""
|
|
|
3636
|
opts = pycompat.byteskwargs(opts)
|
|
3636
|
opts = pycompat.byteskwargs(opts)
|
|
|
3637
|
hg.peer(ui, opts, ui.expandpath(dest), create=True)
|
|
3637
|
hg.peer(ui, opts, ui.expandpath(dest), create=True)
|
|
|
3638
|
|
|
3638
|
|
|
|
3639
|
@command('locate',
|
|
3639
|
@command('locate',
|
|
|
3640
|
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
|
|
3640
|
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
|
|
|
3641
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
3641
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
|
3642
|
('f', 'fullpath', None, _('print complete paths from the filesystem root')),
|
|
3642
|
('f', 'fullpath', None, _('print complete paths from the filesystem root')),
|
|
|
3643
|
] + walkopts,
|
|
3643
|
] + walkopts,
|
|
|
3644
|
_('[OPTION]... [PATTERN]...'),
|
|
3644
|
_('[OPTION]... [PATTERN]...'),
|
|
|
3645
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
3645
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
3646
|
def locate(ui, repo, *pats, **opts):
|
|
3646
|
def locate(ui, repo, *pats, **opts):
|
|
|
3647
|
"""locate files matching specific patterns (DEPRECATED)
|
|
3647
|
"""locate files matching specific patterns (DEPRECATED)
|
|
|
3648
|
|
|
3648
|
|
|
|
3649
|
Print files under Mercurial control in the working directory whose
|
|
3649
|
Print files under Mercurial control in the working directory whose
|
|
|
3650
|
names match the given patterns.
|
|
3650
|
names match the given patterns.
|
|
|
3651
|
|
|
3651
|
|
|
|
3652
|
By default, this command searches all directories in the working
|
|
3652
|
By default, this command searches all directories in the working
|
|
|
3653
|
directory. To search just the current directory and its
|
|
3653
|
directory. To search just the current directory and its
|
|
|
3654
|
subdirectories, use "--include .".
|
|
3654
|
subdirectories, use "--include .".
|
|
|
3655
|
|
|
3655
|
|
|
|
3656
|
If no patterns are given to match, this command prints the names
|
|
3656
|
If no patterns are given to match, this command prints the names
|
|
|
3657
|
of all files under Mercurial control in the working directory.
|
|
3657
|
of all files under Mercurial control in the working directory.
|
|
|
3658
|
|
|
3658
|
|
|
|
3659
|
If you want to feed the output of this command into the "xargs"
|
|
3659
|
If you want to feed the output of this command into the "xargs"
|
|
|
3660
|
command, use the -0 option to both this command and "xargs". This
|
|
3660
|
command, use the -0 option to both this command and "xargs". This
|
|
|
3661
|
will avoid the problem of "xargs" treating single filenames that
|
|
3661
|
will avoid the problem of "xargs" treating single filenames that
|
|
|
3662
|
contain whitespace as multiple filenames.
|
|
3662
|
contain whitespace as multiple filenames.
|
|
|
3663
|
|
|
3663
|
|
|
|
3664
|
See :hg:`help files` for a more versatile command.
|
|
3664
|
See :hg:`help files` for a more versatile command.
|
|
|
3665
|
|
|
3665
|
|
|
|
3666
|
Returns 0 if a match is found, 1 otherwise.
|
|
3666
|
Returns 0 if a match is found, 1 otherwise.
|
|
|
3667
|
"""
|
|
3667
|
"""
|
|
|
3668
|
opts = pycompat.byteskwargs(opts)
|
|
3668
|
opts = pycompat.byteskwargs(opts)
|
|
|
3669
|
if opts.get('print0'):
|
|
3669
|
if opts.get('print0'):
|
|
|
3670
|
end = '\0'
|
|
3670
|
end = '\0'
|
|
|
3671
|
else:
|
|
3671
|
else:
|
|
|
3672
|
end = '\n'
|
|
3672
|
end = '\n'
|
|
|
3673
|
ctx = scmutil.revsingle(repo, opts.get('rev'), None)
|
|
3673
|
ctx = scmutil.revsingle(repo, opts.get('rev'), None)
|
|
|
3674
|
|
|
3674
|
|
|
|
3675
|
ret = 1
|
|
3675
|
ret = 1
|
|
|
3676
|
m = scmutil.match(ctx, pats, opts, default='relglob',
|
|
3676
|
m = scmutil.match(ctx, pats, opts, default='relglob',
|
|
|
3677
|
badfn=lambda x, y: False)
|
|
3677
|
badfn=lambda x, y: False)
|
|
|
3678
|
|
|
3678
|
|
|
|
3679
|
ui.pager('locate')
|
|
3679
|
ui.pager('locate')
|
|
|
3680
|
if ctx.rev() is None:
|
|
3680
|
if ctx.rev() is None:
|
|
|
3681
|
# When run on the working copy, "locate" includes removed files, so
|
|
3681
|
# When run on the working copy, "locate" includes removed files, so
|
|
|
3682
|
# we get the list of files from the dirstate.
|
|
3682
|
# we get the list of files from the dirstate.
|
|
|
3683
|
filesgen = sorted(repo.dirstate.matches(m))
|
|
3683
|
filesgen = sorted(repo.dirstate.matches(m))
|
|
|
3684
|
else:
|
|
3684
|
else:
|
|
|
3685
|
filesgen = ctx.matches(m)
|
|
3685
|
filesgen = ctx.matches(m)
|
|
|
3686
|
for abs in filesgen:
|
|
3686
|
for abs in filesgen:
|
|
|
3687
|
if opts.get('fullpath'):
|
|
3687
|
if opts.get('fullpath'):
|
|
|
3688
|
ui.write(repo.wjoin(abs), end)
|
|
3688
|
ui.write(repo.wjoin(abs), end)
|
|
|
3689
|
else:
|
|
3689
|
else:
|
|
|
3690
|
ui.write(((pats and m.rel(abs)) or abs), end)
|
|
3690
|
ui.write(((pats and m.rel(abs)) or abs), end)
|
|
|
3691
|
ret = 0
|
|
3691
|
ret = 0
|
|
|
3692
|
|
|
3692
|
|
|
|
3693
|
return ret
|
|
3693
|
return ret
|
|
|
3694
|
|
|
3694
|
|
|
|
3695
|
@command('log|history',
|
|
3695
|
@command('log|history',
|
|
|
3696
|
[('f', 'follow', None,
|
|
3696
|
[('f', 'follow', None,
|
|
|
3697
|
_('follow changeset history, or file history across copies and renames')),
|
|
3697
|
_('follow changeset history, or file history across copies and renames')),
|
|
|
3698
|
('', 'follow-first', None,
|
|
3698
|
('', 'follow-first', None,
|
|
|
3699
|
_('only follow the first parent of merge changesets (DEPRECATED)')),
|
|
3699
|
_('only follow the first parent of merge changesets (DEPRECATED)')),
|
|
|
3700
|
('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
|
|
3700
|
('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
|
|
|
3701
|
('C', 'copies', None, _('show copied files')),
|
|
3701
|
('C', 'copies', None, _('show copied files')),
|
|
|
3702
|
('k', 'keyword', [],
|
|
3702
|
('k', 'keyword', [],
|
|
|
3703
|
_('do case-insensitive search for a given text'), _('TEXT')),
|
|
3703
|
_('do case-insensitive search for a given text'), _('TEXT')),
|
|
|
3704
|
('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
|
|
3704
|
('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
|
|
|
3705
|
('L', 'line-range', [],
|
|
3705
|
('L', 'line-range', [],
|
|
|
3706
|
_('follow line range of specified file (EXPERIMENTAL)'),
|
|
3706
|
_('follow line range of specified file (EXPERIMENTAL)'),
|
|
|
3707
|
_('FILE,RANGE')),
|
|
3707
|
_('FILE,RANGE')),
|
|
|
3708
|
('', 'removed', None, _('include revisions where files were removed')),
|
|
3708
|
('', 'removed', None, _('include revisions where files were removed')),
|
|
|
3709
|
('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
|
|
3709
|
('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
|
|
|
3710
|
('u', 'user', [], _('revisions committed by user'), _('USER')),
|
|
3710
|
('u', 'user', [], _('revisions committed by user'), _('USER')),
|
|
|
3711
|
('', 'only-branch', [],
|
|
3711
|
('', 'only-branch', [],
|
|
|
3712
|
_('show only changesets within the given named branch (DEPRECATED)'),
|
|
3712
|
_('show only changesets within the given named branch (DEPRECATED)'),
|
|
|
3713
|
_('BRANCH')),
|
|
3713
|
_('BRANCH')),
|
|
|
3714
|
('b', 'branch', [],
|
|
3714
|
('b', 'branch', [],
|
|
|
3715
|
_('show changesets within the given named branch'), _('BRANCH')),
|
|
3715
|
_('show changesets within the given named branch'), _('BRANCH')),
|
|
|
3716
|
('P', 'prune', [],
|
|
3716
|
('P', 'prune', [],
|
|
|
3717
|
_('do not display revision or any of its ancestors'), _('REV')),
|
|
3717
|
_('do not display revision or any of its ancestors'), _('REV')),
|
|
|
3718
|
] + logopts + walkopts,
|
|
3718
|
] + logopts + walkopts,
|
|
|
3719
|
_('[OPTION]... [FILE]'),
|
|
3719
|
_('[OPTION]... [FILE]'),
|
|
|
3720
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
3720
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
3721
|
helpbasic=True, inferrepo=True,
|
|
3721
|
helpbasic=True, inferrepo=True,
|
|
|
3722
|
intents={INTENT_READONLY})
|
|
3722
|
intents={INTENT_READONLY})
|
|
|
3723
|
def log(ui, repo, *pats, **opts):
|
|
3723
|
def log(ui, repo, *pats, **opts):
|
|
|
3724
|
"""show revision history of entire repository or files
|
|
3724
|
"""show revision history of entire repository or files
|
|
|
3725
|
|
|
3725
|
|
|
|
3726
|
Print the revision history of the specified files or the entire
|
|
3726
|
Print the revision history of the specified files or the entire
|
|
|
3727
|
project.
|
|
3727
|
project.
|
|
|
3728
|
|
|
3728
|
|
|
|
3729
|
If no revision range is specified, the default is ``tip:0`` unless
|
|
3729
|
If no revision range is specified, the default is ``tip:0`` unless
|
|
|
3730
|
--follow is set, in which case the working directory parent is
|
|
3730
|
--follow is set, in which case the working directory parent is
|
|
|
3731
|
used as the starting revision.
|
|
3731
|
used as the starting revision.
|
|
|
3732
|
|
|
3732
|
|
|
|
3733
|
File history is shown without following rename or copy history of
|
|
3733
|
File history is shown without following rename or copy history of
|
|
|
3734
|
files. Use -f/--follow with a filename to follow history across
|
|
3734
|
files. Use -f/--follow with a filename to follow history across
|
|
|
3735
|
renames and copies. --follow without a filename will only show
|
|
3735
|
renames and copies. --follow without a filename will only show
|
|
|
3736
|
ancestors of the starting revision.
|
|
3736
|
ancestors of the starting revision.
|
|
|
3737
|
|
|
3737
|
|
|
|
3738
|
By default this command prints revision number and changeset id,
|
|
3738
|
By default this command prints revision number and changeset id,
|
|
|
3739
|
tags, non-trivial parents, user, date and time, and a summary for
|
|
3739
|
tags, non-trivial parents, user, date and time, and a summary for
|
|
|
3740
|
each commit. When the -v/--verbose switch is used, the list of
|
|
3740
|
each commit. When the -v/--verbose switch is used, the list of
|
|
|
3741
|
changed files and full commit message are shown.
|
|
3741
|
changed files and full commit message are shown.
|
|
|
3742
|
|
|
3742
|
|
|
|
3743
|
With --graph the revisions are shown as an ASCII art DAG with the most
|
|
3743
|
With --graph the revisions are shown as an ASCII art DAG with the most
|
|
|
3744
|
recent changeset at the top.
|
|
3744
|
recent changeset at the top.
|
|
|
3745
|
'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
|
|
3745
|
'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
|
|
|
3746
|
'x' is obsolete, '*' is unstable, and '+' represents a fork where the
|
|
3746
|
'x' is obsolete, '*' is unstable, and '+' represents a fork where the
|
|
|
3747
|
changeset from the lines below is a parent of the 'o' merge on the same
|
|
3747
|
changeset from the lines below is a parent of the 'o' merge on the same
|
|
|
3748
|
line.
|
|
3748
|
line.
|
|
|
3749
|
Paths in the DAG are represented with '|', '/' and so forth. ':' in place
|
|
3749
|
Paths in the DAG are represented with '|', '/' and so forth. ':' in place
|
|
|
3750
|
of a '|' indicates one or more revisions in a path are omitted.
|
|
3750
|
of a '|' indicates one or more revisions in a path are omitted.
|
|
|
3751
|
|
|
3751
|
|
|
|
3752
|
.. container:: verbose
|
|
3752
|
.. container:: verbose
|
|
|
3753
|
|
|
3753
|
|
|
|
3754
|
Use -L/--line-range FILE,M:N options to follow the history of lines
|
|
3754
|
Use -L/--line-range FILE,M:N options to follow the history of lines
|
|
|
3755
|
from M to N in FILE. With -p/--patch only diff hunks affecting
|
|
3755
|
from M to N in FILE. With -p/--patch only diff hunks affecting
|
|
|
3756
|
specified line range will be shown. This option requires --follow;
|
|
3756
|
specified line range will be shown. This option requires --follow;
|
|
|
3757
|
it can be specified multiple times. Currently, this option is not
|
|
3757
|
it can be specified multiple times. Currently, this option is not
|
|
|
3758
|
compatible with --graph. This option is experimental.
|
|
3758
|
compatible with --graph. This option is experimental.
|
|
|
3759
|
|
|
3759
|
|
|
|
3760
|
.. note::
|
|
3760
|
.. note::
|
|
|
3761
|
|
|
3761
|
|
|
|
3762
|
:hg:`log --patch` may generate unexpected diff output for merge
|
|
3762
|
:hg:`log --patch` may generate unexpected diff output for merge
|
|
|
3763
|
changesets, as it will only compare the merge changeset against
|
|
3763
|
changesets, as it will only compare the merge changeset against
|
|
|
3764
|
its first parent. Also, only files different from BOTH parents
|
|
3764
|
its first parent. Also, only files different from BOTH parents
|
|
|
3765
|
will appear in files:.
|
|
3765
|
will appear in files:.
|
|
|
3766
|
|
|
3766
|
|
|
|
3767
|
.. note::
|
|
3767
|
.. note::
|
|
|
3768
|
|
|
3768
|
|
|
|
3769
|
For performance reasons, :hg:`log FILE` may omit duplicate changes
|
|
3769
|
For performance reasons, :hg:`log FILE` may omit duplicate changes
|
|
|
3770
|
made on branches and will not show removals or mode changes. To
|
|
3770
|
made on branches and will not show removals or mode changes. To
|
|
|
3771
|
see all such changes, use the --removed switch.
|
|
3771
|
see all such changes, use the --removed switch.
|
|
|
3772
|
|
|
3772
|
|
|
|
3773
|
.. container:: verbose
|
|
3773
|
.. container:: verbose
|
|
|
3774
|
|
|
3774
|
|
|
|
3775
|
.. note::
|
|
3775
|
.. note::
|
|
|
3776
|
|
|
3776
|
|
|
|
3777
|
The history resulting from -L/--line-range options depends on diff
|
|
3777
|
The history resulting from -L/--line-range options depends on diff
|
|
|
3778
|
options; for instance if white-spaces are ignored, respective changes
|
|
3778
|
options; for instance if white-spaces are ignored, respective changes
|
|
|
3779
|
with only white-spaces in specified line range will not be listed.
|
|
3779
|
with only white-spaces in specified line range will not be listed.
|
|
|
3780
|
|
|
3780
|
|
|
|
3781
|
.. container:: verbose
|
|
3781
|
.. container:: verbose
|
|
|
3782
|
|
|
3782
|
|
|
|
3783
|
Some examples:
|
|
3783
|
Some examples:
|
|
|
3784
|
|
|
3784
|
|
|
|
3785
|
- changesets with full descriptions and file lists::
|
|
3785
|
- changesets with full descriptions and file lists::
|
|
|
3786
|
|
|
3786
|
|
|
|
3787
|
hg log -v
|
|
3787
|
hg log -v
|
|
|
3788
|
|
|
3788
|
|
|
|
3789
|
- changesets ancestral to the working directory::
|
|
3789
|
- changesets ancestral to the working directory::
|
|
|
3790
|
|
|
3790
|
|
|
|
3791
|
hg log -f
|
|
3791
|
hg log -f
|
|
|
3792
|
|
|
3792
|
|
|
|
3793
|
- last 10 commits on the current branch::
|
|
3793
|
- last 10 commits on the current branch::
|
|
|
3794
|
|
|
3794
|
|
|
|
3795
|
hg log -l 10 -b .
|
|
3795
|
hg log -l 10 -b .
|
|
|
3796
|
|
|
3796
|
|
|
|
3797
|
- changesets showing all modifications of a file, including removals::
|
|
3797
|
- changesets showing all modifications of a file, including removals::
|
|
|
3798
|
|
|
3798
|
|
|
|
3799
|
hg log --removed file.c
|
|
3799
|
hg log --removed file.c
|
|
|
3800
|
|
|
3800
|
|
|
|
3801
|
- all changesets that touch a directory, with diffs, excluding merges::
|
|
3801
|
- all changesets that touch a directory, with diffs, excluding merges::
|
|
|
3802
|
|
|
3802
|
|
|
|
3803
|
hg log -Mp lib/
|
|
3803
|
hg log -Mp lib/
|
|
|
3804
|
|
|
3804
|
|
|
|
3805
|
- all revision numbers that match a keyword::
|
|
3805
|
- all revision numbers that match a keyword::
|
|
|
3806
|
|
|
3806
|
|
|
|
3807
|
hg log -k bug --template "{rev}\\n"
|
|
3807
|
hg log -k bug --template "{rev}\\n"
|
|
|
3808
|
|
|
3808
|
|
|
|
3809
|
- the full hash identifier of the working directory parent::
|
|
3809
|
- the full hash identifier of the working directory parent::
|
|
|
3810
|
|
|
3810
|
|
|
|
3811
|
hg log -r . --template "{node}\\n"
|
|
3811
|
hg log -r . --template "{node}\\n"
|
|
|
3812
|
|
|
3812
|
|
|
|
3813
|
- list available log templates::
|
|
3813
|
- list available log templates::
|
|
|
3814
|
|
|
3814
|
|
|
|
3815
|
hg log -T list
|
|
3815
|
hg log -T list
|
|
|
3816
|
|
|
3816
|
|
|
|
3817
|
- check if a given changeset is included in a tagged release::
|
|
3817
|
- check if a given changeset is included in a tagged release::
|
|
|
3818
|
|
|
3818
|
|
|
|
3819
|
hg log -r "a21ccf and ancestor(1.9)"
|
|
3819
|
hg log -r "a21ccf and ancestor(1.9)"
|
|
|
3820
|
|
|
3820
|
|
|
|
3821
|
- find all changesets by some user in a date range::
|
|
3821
|
- find all changesets by some user in a date range::
|
|
|
3822
|
|
|
3822
|
|
|
|
3823
|
hg log -k alice -d "may 2008 to jul 2008"
|
|
3823
|
hg log -k alice -d "may 2008 to jul 2008"
|
|
|
3824
|
|
|
3824
|
|
|
|
3825
|
- summary of all changesets after the last tag::
|
|
3825
|
- summary of all changesets after the last tag::
|
|
|
3826
|
|
|
3826
|
|
|
|
3827
|
hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
|
|
3827
|
hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
|
|
|
3828
|
|
|
3828
|
|
|
|
3829
|
- changesets touching lines 13 to 23 for file.c::
|
|
3829
|
- changesets touching lines 13 to 23 for file.c::
|
|
|
3830
|
|
|
3830
|
|
|
|
3831
|
hg log -L file.c,13:23
|
|
3831
|
hg log -L file.c,13:23
|
|
|
3832
|
|
|
3832
|
|
|
|
3833
|
- changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
|
|
3833
|
- changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
|
|
|
3834
|
main.c with patch::
|
|
3834
|
main.c with patch::
|
|
|
3835
|
|
|
3835
|
|
|
|
3836
|
hg log -L file.c,13:23 -L main.c,2:6 -p
|
|
3836
|
hg log -L file.c,13:23 -L main.c,2:6 -p
|
|
|
3837
|
|
|
3837
|
|
|
|
3838
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
3838
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
3839
|
|
|
3839
|
|
|
|
3840
|
See :hg:`help revisions` for more about specifying and ordering
|
|
3840
|
See :hg:`help revisions` for more about specifying and ordering
|
|
|
3841
|
revisions.
|
|
3841
|
revisions.
|
|
|
3842
|
|
|
3842
|
|
|
|
3843
|
See :hg:`help templates` for more about pre-packaged styles and
|
|
3843
|
See :hg:`help templates` for more about pre-packaged styles and
|
|
|
3844
|
specifying custom templates. The default template used by the log
|
|
3844
|
specifying custom templates. The default template used by the log
|
|
|
3845
|
command can be customized via the ``ui.logtemplate`` configuration
|
|
3845
|
command can be customized via the ``ui.logtemplate`` configuration
|
|
|
3846
|
setting.
|
|
3846
|
setting.
|
|
|
3847
|
|
|
3847
|
|
|
|
3848
|
Returns 0 on success.
|
|
3848
|
Returns 0 on success.
|
|
|
3849
|
|
|
3849
|
|
|
|
3850
|
"""
|
|
3850
|
"""
|
|
|
3851
|
opts = pycompat.byteskwargs(opts)
|
|
3851
|
opts = pycompat.byteskwargs(opts)
|
|
|
3852
|
linerange = opts.get('line_range')
|
|
3852
|
linerange = opts.get('line_range')
|
|
|
3853
|
|
|
3853
|
|
|
|
3854
|
if linerange and not opts.get('follow'):
|
|
3854
|
if linerange and not opts.get('follow'):
|
|
|
3855
|
raise error.Abort(_('--line-range requires --follow'))
|
|
3855
|
raise error.Abort(_('--line-range requires --follow'))
|
|
|
3856
|
|
|
3856
|
|
|
|
3857
|
if linerange and pats:
|
|
3857
|
if linerange and pats:
|
|
|
3858
|
# TODO: take pats as patterns with no line-range filter
|
|
3858
|
# TODO: take pats as patterns with no line-range filter
|
|
|
3859
|
raise error.Abort(
|
|
3859
|
raise error.Abort(
|
|
|
3860
|
_('FILE arguments are not compatible with --line-range option')
|
|
3860
|
_('FILE arguments are not compatible with --line-range option')
|
|
|
3861
|
)
|
|
3861
|
)
|
|
|
3862
|
|
|
3862
|
|
|
|
3863
|
repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
|
|
3863
|
repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
|
|
|
3864
|
revs, differ = logcmdutil.getrevs(repo, pats, opts)
|
|
3864
|
revs, differ = logcmdutil.getrevs(repo, pats, opts)
|
|
|
3865
|
if linerange:
|
|
3865
|
if linerange:
|
|
|
3866
|
# TODO: should follow file history from logcmdutil._initialrevs(),
|
|
3866
|
# TODO: should follow file history from logcmdutil._initialrevs(),
|
|
|
3867
|
# then filter the result by logcmdutil._makerevset() and --limit
|
|
3867
|
# then filter the result by logcmdutil._makerevset() and --limit
|
|
|
3868
|
revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
|
|
3868
|
revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
|
|
|
3869
|
|
|
3869
|
|
|
|
3870
|
getrenamed = None
|
|
3870
|
getrenamed = None
|
|
|
3871
|
if opts.get('copies'):
|
|
3871
|
if opts.get('copies'):
|
|
|
3872
|
endrev = None
|
|
3872
|
endrev = None
|
|
|
3873
|
if revs:
|
|
3873
|
if revs:
|
|
|
3874
|
endrev = revs.max() + 1
|
|
3874
|
endrev = revs.max() + 1
|
|
|
3875
|
getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
|
|
3875
|
getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
|
|
|
3876
|
|
|
3876
|
|
|
|
3877
|
ui.pager('log')
|
|
3877
|
ui.pager('log')
|
|
|
3878
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
|
|
3878
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
|
|
|
3879
|
buffered=True)
|
|
3879
|
buffered=True)
|
|
|
3880
|
if opts.get('graph'):
|
|
3880
|
if opts.get('graph'):
|
|
|
3881
|
displayfn = logcmdutil.displaygraphrevs
|
|
3881
|
displayfn = logcmdutil.displaygraphrevs
|
|
|
3882
|
else:
|
|
3882
|
else:
|
|
|
3883
|
displayfn = logcmdutil.displayrevs
|
|
3883
|
displayfn = logcmdutil.displayrevs
|
|
|
3884
|
displayfn(ui, repo, revs, displayer, getrenamed)
|
|
3884
|
displayfn(ui, repo, revs, displayer, getrenamed)
|
|
|
3885
|
|
|
3885
|
|
|
|
3886
|
@command('manifest',
|
|
3886
|
@command('manifest',
|
|
|
3887
|
[('r', 'rev', '', _('revision to display'), _('REV')),
|
|
3887
|
[('r', 'rev', '', _('revision to display'), _('REV')),
|
|
|
3888
|
('', 'all', False, _("list files from all revisions"))]
|
|
3888
|
('', 'all', False, _("list files from all revisions"))]
|
|
|
3889
|
+ formatteropts,
|
|
3889
|
+ formatteropts,
|
|
|
3890
|
_('[-r REV]'),
|
|
3890
|
_('[-r REV]'),
|
|
|
3891
|
helpcategory=command.CATEGORY_MAINTENANCE,
|
|
3891
|
helpcategory=command.CATEGORY_MAINTENANCE,
|
|
|
3892
|
intents={INTENT_READONLY})
|
|
3892
|
intents={INTENT_READONLY})
|
|
|
3893
|
def manifest(ui, repo, node=None, rev=None, **opts):
|
|
3893
|
def manifest(ui, repo, node=None, rev=None, **opts):
|
|
|
3894
|
"""output the current or given revision of the project manifest
|
|
3894
|
"""output the current or given revision of the project manifest
|
|
|
3895
|
|
|
3895
|
|
|
|
3896
|
Print a list of version controlled files for the given revision.
|
|
3896
|
Print a list of version controlled files for the given revision.
|
|
|
3897
|
If no revision is given, the first parent of the working directory
|
|
3897
|
If no revision is given, the first parent of the working directory
|
|
|
3898
|
is used, or the null revision if no revision is checked out.
|
|
3898
|
is used, or the null revision if no revision is checked out.
|
|
|
3899
|
|
|
3899
|
|
|
|
3900
|
With -v, print file permissions, symlink and executable bits.
|
|
3900
|
With -v, print file permissions, symlink and executable bits.
|
|
|
3901
|
With --debug, print file revision hashes.
|
|
3901
|
With --debug, print file revision hashes.
|
|
|
3902
|
|
|
3902
|
|
|
|
3903
|
If option --all is specified, the list of all files from all revisions
|
|
3903
|
If option --all is specified, the list of all files from all revisions
|
|
|
3904
|
is printed. This includes deleted and renamed files.
|
|
3904
|
is printed. This includes deleted and renamed files.
|
|
|
3905
|
|
|
3905
|
|
|
|
3906
|
Returns 0 on success.
|
|
3906
|
Returns 0 on success.
|
|
|
3907
|
"""
|
|
3907
|
"""
|
|
|
3908
|
opts = pycompat.byteskwargs(opts)
|
|
3908
|
opts = pycompat.byteskwargs(opts)
|
|
|
3909
|
fm = ui.formatter('manifest', opts)
|
|
3909
|
fm = ui.formatter('manifest', opts)
|
|
|
3910
|
|
|
3910
|
|
|
|
3911
|
if opts.get('all'):
|
|
3911
|
if opts.get('all'):
|
|
|
3912
|
if rev or node:
|
|
3912
|
if rev or node:
|
|
|
3913
|
raise error.Abort(_("can't specify a revision with --all"))
|
|
3913
|
raise error.Abort(_("can't specify a revision with --all"))
|
|
|
3914
|
|
|
3914
|
|
|
|
3915
|
res = set()
|
|
3915
|
res = set()
|
|
|
3916
|
for rev in repo:
|
|
3916
|
for rev in repo:
|
|
|
3917
|
ctx = repo[rev]
|
|
3917
|
ctx = repo[rev]
|
|
|
3918
|
res |= set(ctx.files())
|
|
3918
|
res |= set(ctx.files())
|
|
|
3919
|
|
|
3919
|
|
|
|
3920
|
ui.pager('manifest')
|
|
3920
|
ui.pager('manifest')
|
|
|
3921
|
for f in sorted(res):
|
|
3921
|
for f in sorted(res):
|
|
|
3922
|
fm.startitem()
|
|
3922
|
fm.startitem()
|
|
|
3923
|
fm.write("path", '%s\n', f)
|
|
3923
|
fm.write("path", '%s\n', f)
|
|
|
3924
|
fm.end()
|
|
3924
|
fm.end()
|
|
|
3925
|
return
|
|
3925
|
return
|
|
|
3926
|
|
|
3926
|
|
|
|
3927
|
if rev and node:
|
|
3927
|
if rev and node:
|
|
|
3928
|
raise error.Abort(_("please specify just one revision"))
|
|
3928
|
raise error.Abort(_("please specify just one revision"))
|
|
|
3929
|
|
|
3929
|
|
|
|
3930
|
if not node:
|
|
3930
|
if not node:
|
|
|
3931
|
node = rev
|
|
3931
|
node = rev
|
|
|
3932
|
|
|
3932
|
|
|
|
3933
|
char = {'l': '@', 'x': '*', '': '', 't': 'd'}
|
|
3933
|
char = {'l': '@', 'x': '*', '': '', 't': 'd'}
|
|
|
3934
|
mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
|
|
3934
|
mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
|
|
|
3935
|
if node:
|
|
3935
|
if node:
|
|
|
3936
|
repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
|
|
3936
|
repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
|
|
|
3937
|
ctx = scmutil.revsingle(repo, node)
|
|
3937
|
ctx = scmutil.revsingle(repo, node)
|
|
|
3938
|
mf = ctx.manifest()
|
|
3938
|
mf = ctx.manifest()
|
|
|
3939
|
ui.pager('manifest')
|
|
3939
|
ui.pager('manifest')
|
|
|
3940
|
for f in ctx:
|
|
3940
|
for f in ctx:
|
|
|
3941
|
fm.startitem()
|
|
3941
|
fm.startitem()
|
|
|
3942
|
fm.context(ctx=ctx)
|
|
3942
|
fm.context(ctx=ctx)
|
|
|
3943
|
fl = ctx[f].flags()
|
|
3943
|
fl = ctx[f].flags()
|
|
|
3944
|
fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
|
|
3944
|
fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
|
|
|
3945
|
fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
|
|
3945
|
fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
|
|
|
3946
|
fm.write('path', '%s\n', f)
|
|
3946
|
fm.write('path', '%s\n', f)
|
|
|
3947
|
fm.end()
|
|
3947
|
fm.end()
|
|
|
3948
|
|
|
3948
|
|
|
|
3949
|
@command('merge',
|
|
3949
|
@command('merge',
|
|
|
3950
|
[('f', 'force', None,
|
|
3950
|
[('f', 'force', None,
|
|
|
3951
|
_('force a merge including outstanding changes (DEPRECATED)')),
|
|
3951
|
_('force a merge including outstanding changes (DEPRECATED)')),
|
|
|
3952
|
('r', 'rev', '', _('revision to merge'), _('REV')),
|
|
3952
|
('r', 'rev', '', _('revision to merge'), _('REV')),
|
|
|
3953
|
('P', 'preview', None,
|
|
3953
|
('P', 'preview', None,
|
|
|
3954
|
_('review revisions to merge (no merge is performed)')),
|
|
3954
|
_('review revisions to merge (no merge is performed)')),
|
|
|
3955
|
('', 'abort', None, _('abort the ongoing merge')),
|
|
3955
|
('', 'abort', None, _('abort the ongoing merge')),
|
|
|
3956
|
] + mergetoolopts,
|
|
3956
|
] + mergetoolopts,
|
|
|
3957
|
_('[-P] [[-r] REV]'),
|
|
3957
|
_('[-P] [[-r] REV]'),
|
|
|
3958
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
|
|
3958
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
|
|
|
3959
|
def merge(ui, repo, node=None, **opts):
|
|
3959
|
def merge(ui, repo, node=None, **opts):
|
|
|
3960
|
"""merge another revision into working directory
|
|
3960
|
"""merge another revision into working directory
|
|
|
3961
|
|
|
3961
|
|
|
|
3962
|
The current working directory is updated with all changes made in
|
|
3962
|
The current working directory is updated with all changes made in
|
|
|
3963
|
the requested revision since the last common predecessor revision.
|
|
3963
|
the requested revision since the last common predecessor revision.
|
|
|
3964
|
|
|
3964
|
|
|
|
3965
|
Files that changed between either parent are marked as changed for
|
|
3965
|
Files that changed between either parent are marked as changed for
|
|
|
3966
|
the next commit and a commit must be performed before any further
|
|
3966
|
the next commit and a commit must be performed before any further
|
|
|
3967
|
updates to the repository are allowed. The next commit will have
|
|
3967
|
updates to the repository are allowed. The next commit will have
|
|
|
3968
|
two parents.
|
|
3968
|
two parents.
|
|
|
3969
|
|
|
3969
|
|
|
|
3970
|
``--tool`` can be used to specify the merge tool used for file
|
|
3970
|
``--tool`` can be used to specify the merge tool used for file
|
|
|
3971
|
merges. It overrides the HGMERGE environment variable and your
|
|
3971
|
merges. It overrides the HGMERGE environment variable and your
|
|
|
3972
|
configuration files. See :hg:`help merge-tools` for options.
|
|
3972
|
configuration files. See :hg:`help merge-tools` for options.
|
|
|
3973
|
|
|
3973
|
|
|
|
3974
|
If no revision is specified, the working directory's parent is a
|
|
3974
|
If no revision is specified, the working directory's parent is a
|
|
|
3975
|
head revision, and the current branch contains exactly one other
|
|
3975
|
head revision, and the current branch contains exactly one other
|
|
|
3976
|
head, the other head is merged with by default. Otherwise, an
|
|
3976
|
head, the other head is merged with by default. Otherwise, an
|
|
|
3977
|
explicit revision with which to merge with must be provided.
|
|
3977
|
explicit revision with which to merge with must be provided.
|
|
|
3978
|
|
|
3978
|
|
|
|
3979
|
See :hg:`help resolve` for information on handling file conflicts.
|
|
3979
|
See :hg:`help resolve` for information on handling file conflicts.
|
|
|
3980
|
|
|
3980
|
|
|
|
3981
|
To undo an uncommitted merge, use :hg:`merge --abort` which
|
|
3981
|
To undo an uncommitted merge, use :hg:`merge --abort` which
|
|
|
3982
|
will check out a clean copy of the original merge parent, losing
|
|
3982
|
will check out a clean copy of the original merge parent, losing
|
|
|
3983
|
all changes.
|
|
3983
|
all changes.
|
|
|
3984
|
|
|
3984
|
|
|
|
3985
|
Returns 0 on success, 1 if there are unresolved files.
|
|
3985
|
Returns 0 on success, 1 if there are unresolved files.
|
|
|
3986
|
"""
|
|
3986
|
"""
|
|
|
3987
|
|
|
3987
|
|
|
|
3988
|
opts = pycompat.byteskwargs(opts)
|
|
3988
|
opts = pycompat.byteskwargs(opts)
|
|
|
3989
|
abort = opts.get('abort')
|
|
3989
|
abort = opts.get('abort')
|
|
|
3990
|
if abort and repo.dirstate.p2() == nullid:
|
|
3990
|
if abort and repo.dirstate.p2() == nullid:
|
|
|
3991
|
cmdutil.wrongtooltocontinue(repo, _('merge'))
|
|
3991
|
cmdutil.wrongtooltocontinue(repo, _('merge'))
|
|
|
3992
|
if abort:
|
|
3992
|
if abort:
|
|
|
3993
|
if node:
|
|
3993
|
if node:
|
|
|
3994
|
raise error.Abort(_("cannot specify a node with --abort"))
|
|
3994
|
raise error.Abort(_("cannot specify a node with --abort"))
|
|
|
3995
|
if opts.get('rev'):
|
|
3995
|
if opts.get('rev'):
|
|
|
3996
|
raise error.Abort(_("cannot specify both --rev and --abort"))
|
|
3996
|
raise error.Abort(_("cannot specify both --rev and --abort"))
|
|
|
3997
|
if opts.get('preview'):
|
|
3997
|
if opts.get('preview'):
|
|
|
3998
|
raise error.Abort(_("cannot specify --preview with --abort"))
|
|
3998
|
raise error.Abort(_("cannot specify --preview with --abort"))
|
|
|
3999
|
if opts.get('rev') and node:
|
|
3999
|
if opts.get('rev') and node:
|
|
|
4000
|
raise error.Abort(_("please specify just one revision"))
|
|
4000
|
raise error.Abort(_("please specify just one revision"))
|
|
|
4001
|
if not node:
|
|
4001
|
if not node:
|
|
|
4002
|
node = opts.get('rev')
|
|
4002
|
node = opts.get('rev')
|
|
|
4003
|
|
|
4003
|
|
|
|
4004
|
if node:
|
|
4004
|
if node:
|
|
|
4005
|
node = scmutil.revsingle(repo, node).node()
|
|
4005
|
node = scmutil.revsingle(repo, node).node()
|
|
|
4006
|
|
|
4006
|
|
|
|
4007
|
if not node and not abort:
|
|
4007
|
if not node and not abort:
|
|
|
4008
|
node = repo[destutil.destmerge(repo)].node()
|
|
4008
|
node = repo[destutil.destmerge(repo)].node()
|
|
|
4009
|
|
|
4009
|
|
|
|
4010
|
if opts.get('preview'):
|
|
4010
|
if opts.get('preview'):
|
|
|
4011
|
# find nodes that are ancestors of p2 but not of p1
|
|
4011
|
# find nodes that are ancestors of p2 but not of p1
|
|
|
4012
|
p1 = repo.lookup('.')
|
|
4012
|
p1 = repo.lookup('.')
|
|
|
4013
|
p2 = node
|
|
4013
|
p2 = node
|
|
|
4014
|
nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
|
|
4014
|
nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
|
|
|
4015
|
|
|
4015
|
|
|
|
4016
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
4016
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
4017
|
for node in nodes:
|
|
4017
|
for node in nodes:
|
|
|
4018
|
displayer.show(repo[node])
|
|
4018
|
displayer.show(repo[node])
|
|
|
4019
|
displayer.close()
|
|
4019
|
displayer.close()
|
|
|
4020
|
return 0
|
|
4020
|
return 0
|
|
|
4021
|
|
|
4021
|
|
|
|
4022
|
# ui.forcemerge is an internal variable, do not document
|
|
4022
|
# ui.forcemerge is an internal variable, do not document
|
|
|
4023
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
4023
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
4024
|
with ui.configoverride(overrides, 'merge'):
|
|
4024
|
with ui.configoverride(overrides, 'merge'):
|
|
|
4025
|
force = opts.get('force')
|
|
4025
|
force = opts.get('force')
|
|
|
4026
|
labels = ['working copy', 'merge rev']
|
|
4026
|
labels = ['working copy', 'merge rev']
|
|
|
4027
|
return hg.merge(repo, node, force=force, mergeforce=force,
|
|
4027
|
return hg.merge(repo, node, force=force, mergeforce=force,
|
|
|
4028
|
labels=labels, abort=abort)
|
|
4028
|
labels=labels, abort=abort)
|
|
|
4029
|
|
|
4029
|
|
|
|
4030
|
@command('outgoing|out',
|
|
4030
|
@command('outgoing|out',
|
|
|
4031
|
[('f', 'force', None, _('run even when the destination is unrelated')),
|
|
4031
|
[('f', 'force', None, _('run even when the destination is unrelated')),
|
|
|
4032
|
('r', 'rev', [],
|
|
4032
|
('r', 'rev', [],
|
|
|
4033
|
_('a changeset intended to be included in the destination'), _('REV')),
|
|
4033
|
_('a changeset intended to be included in the destination'), _('REV')),
|
|
|
4034
|
('n', 'newest-first', None, _('show newest record first')),
|
|
4034
|
('n', 'newest-first', None, _('show newest record first')),
|
|
|
4035
|
('B', 'bookmarks', False, _('compare bookmarks')),
|
|
4035
|
('B', 'bookmarks', False, _('compare bookmarks')),
|
|
|
4036
|
('b', 'branch', [], _('a specific branch you would like to push'),
|
|
4036
|
('b', 'branch', [], _('a specific branch you would like to push'),
|
|
|
4037
|
_('BRANCH')),
|
|
4037
|
_('BRANCH')),
|
|
|
4038
|
] + logopts + remoteopts + subrepoopts,
|
|
4038
|
] + logopts + remoteopts + subrepoopts,
|
|
|
4039
|
_('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
|
|
4039
|
_('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
|
|
|
4040
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
|
|
4040
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
|
|
|
4041
|
def outgoing(ui, repo, dest=None, **opts):
|
|
4041
|
def outgoing(ui, repo, dest=None, **opts):
|
|
|
4042
|
"""show changesets not found in the destination
|
|
4042
|
"""show changesets not found in the destination
|
|
|
4043
|
|
|
4043
|
|
|
|
4044
|
Show changesets not found in the specified destination repository
|
|
4044
|
Show changesets not found in the specified destination repository
|
|
|
4045
|
or the default push location. These are the changesets that would
|
|
4045
|
or the default push location. These are the changesets that would
|
|
|
4046
|
be pushed if a push was requested.
|
|
4046
|
be pushed if a push was requested.
|
|
|
4047
|
|
|
4047
|
|
|
|
4048
|
See pull for details of valid destination formats.
|
|
4048
|
See pull for details of valid destination formats.
|
|
|
4049
|
|
|
4049
|
|
|
|
4050
|
.. container:: verbose
|
|
4050
|
.. container:: verbose
|
|
|
4051
|
|
|
4051
|
|
|
|
4052
|
With -B/--bookmarks, the result of bookmark comparison between
|
|
4052
|
With -B/--bookmarks, the result of bookmark comparison between
|
|
|
4053
|
local and remote repositories is displayed. With -v/--verbose,
|
|
4053
|
local and remote repositories is displayed. With -v/--verbose,
|
|
|
4054
|
status is also displayed for each bookmark like below::
|
|
4054
|
status is also displayed for each bookmark like below::
|
|
|
4055
|
|
|
4055
|
|
|
|
4056
|
BM1 01234567890a added
|
|
4056
|
BM1 01234567890a added
|
|
|
4057
|
BM2 deleted
|
|
4057
|
BM2 deleted
|
|
|
4058
|
BM3 234567890abc advanced
|
|
4058
|
BM3 234567890abc advanced
|
|
|
4059
|
BM4 34567890abcd diverged
|
|
4059
|
BM4 34567890abcd diverged
|
|
|
4060
|
BM5 4567890abcde changed
|
|
4060
|
BM5 4567890abcde changed
|
|
|
4061
|
|
|
4061
|
|
|
|
4062
|
The action taken when pushing depends on the
|
|
4062
|
The action taken when pushing depends on the
|
|
|
4063
|
status of each bookmark:
|
|
4063
|
status of each bookmark:
|
|
|
4064
|
|
|
4064
|
|
|
|
4065
|
:``added``: push with ``-B`` will create it
|
|
4065
|
:``added``: push with ``-B`` will create it
|
|
|
4066
|
:``deleted``: push with ``-B`` will delete it
|
|
4066
|
:``deleted``: push with ``-B`` will delete it
|
|
|
4067
|
:``advanced``: push will update it
|
|
4067
|
:``advanced``: push will update it
|
|
|
4068
|
:``diverged``: push with ``-B`` will update it
|
|
4068
|
:``diverged``: push with ``-B`` will update it
|
|
|
4069
|
:``changed``: push with ``-B`` will update it
|
|
4069
|
:``changed``: push with ``-B`` will update it
|
|
|
4070
|
|
|
4070
|
|
|
|
4071
|
From the point of view of pushing behavior, bookmarks
|
|
4071
|
From the point of view of pushing behavior, bookmarks
|
|
|
4072
|
existing only in the remote repository are treated as
|
|
4072
|
existing only in the remote repository are treated as
|
|
|
4073
|
``deleted``, even if it is in fact added remotely.
|
|
4073
|
``deleted``, even if it is in fact added remotely.
|
|
|
4074
|
|
|
4074
|
|
|
|
4075
|
Returns 0 if there are outgoing changes, 1 otherwise.
|
|
4075
|
Returns 0 if there are outgoing changes, 1 otherwise.
|
|
|
4076
|
"""
|
|
4076
|
"""
|
|
|
4077
|
# hg._outgoing() needs to re-resolve the path in order to handle #branch
|
|
4077
|
# hg._outgoing() needs to re-resolve the path in order to handle #branch
|
|
|
4078
|
# style URLs, so don't overwrite dest.
|
|
4078
|
# style URLs, so don't overwrite dest.
|
|
|
4079
|
path = ui.paths.getpath(dest, default=('default-push', 'default'))
|
|
4079
|
path = ui.paths.getpath(dest, default=('default-push', 'default'))
|
|
|
4080
|
if not path:
|
|
4080
|
if not path:
|
|
|
4081
|
raise error.Abort(_('default repository not configured!'),
|
|
4081
|
raise error.Abort(_('default repository not configured!'),
|
|
|
4082
|
hint=_("see 'hg help config.paths'"))
|
|
4082
|
hint=_("see 'hg help config.paths'"))
|
|
|
4083
|
|
|
4083
|
|
|
|
4084
|
opts = pycompat.byteskwargs(opts)
|
|
4084
|
opts = pycompat.byteskwargs(opts)
|
|
|
4085
|
if opts.get('graph'):
|
|
4085
|
if opts.get('graph'):
|
|
|
4086
|
logcmdutil.checkunsupportedgraphflags([], opts)
|
|
4086
|
logcmdutil.checkunsupportedgraphflags([], opts)
|
|
|
4087
|
o, other = hg._outgoing(ui, repo, dest, opts)
|
|
4087
|
o, other = hg._outgoing(ui, repo, dest, opts)
|
|
|
4088
|
if not o:
|
|
4088
|
if not o:
|
|
|
4089
|
cmdutil.outgoinghooks(ui, repo, other, opts, o)
|
|
4089
|
cmdutil.outgoinghooks(ui, repo, other, opts, o)
|
|
|
4090
|
return
|
|
4090
|
return
|
|
|
4091
|
|
|
4091
|
|
|
|
4092
|
revdag = logcmdutil.graphrevs(repo, o, opts)
|
|
4092
|
revdag = logcmdutil.graphrevs(repo, o, opts)
|
|
|
4093
|
ui.pager('outgoing')
|
|
4093
|
ui.pager('outgoing')
|
|
|
4094
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
|
|
4094
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
|
|
|
4095
|
logcmdutil.displaygraph(ui, repo, revdag, displayer,
|
|
4095
|
logcmdutil.displaygraph(ui, repo, revdag, displayer,
|
|
|
4096
|
graphmod.asciiedges)
|
|
4096
|
graphmod.asciiedges)
|
|
|
4097
|
cmdutil.outgoinghooks(ui, repo, other, opts, o)
|
|
4097
|
cmdutil.outgoinghooks(ui, repo, other, opts, o)
|
|
|
4098
|
return 0
|
|
4098
|
return 0
|
|
|
4099
|
|
|
4099
|
|
|
|
4100
|
if opts.get('bookmarks'):
|
|
4100
|
if opts.get('bookmarks'):
|
|
|
4101
|
dest = path.pushloc or path.loc
|
|
4101
|
dest = path.pushloc or path.loc
|
|
|
4102
|
other = hg.peer(repo, opts, dest)
|
|
4102
|
other = hg.peer(repo, opts, dest)
|
|
|
4103
|
if 'bookmarks' not in other.listkeys('namespaces'):
|
|
4103
|
if 'bookmarks' not in other.listkeys('namespaces'):
|
|
|
4104
|
ui.warn(_("remote doesn't support bookmarks\n"))
|
|
4104
|
ui.warn(_("remote doesn't support bookmarks\n"))
|
|
|
4105
|
return 0
|
|
4105
|
return 0
|
|
|
4106
|
ui.status(_('comparing with %s\n') % util.hidepassword(dest))
|
|
4106
|
ui.status(_('comparing with %s\n') % util.hidepassword(dest))
|
|
|
4107
|
ui.pager('outgoing')
|
|
4107
|
ui.pager('outgoing')
|
|
|
4108
|
return bookmarks.outgoing(ui, repo, other)
|
|
4108
|
return bookmarks.outgoing(ui, repo, other)
|
|
|
4109
|
|
|
4109
|
|
|
|
4110
|
repo._subtoppath = path.pushloc or path.loc
|
|
4110
|
repo._subtoppath = path.pushloc or path.loc
|
|
|
4111
|
try:
|
|
4111
|
try:
|
|
|
4112
|
return hg.outgoing(ui, repo, dest, opts)
|
|
4112
|
return hg.outgoing(ui, repo, dest, opts)
|
|
|
4113
|
finally:
|
|
4113
|
finally:
|
|
|
4114
|
del repo._subtoppath
|
|
4114
|
del repo._subtoppath
|
|
|
4115
|
|
|
4115
|
|
|
|
4116
|
@command('parents',
|
|
4116
|
@command('parents',
|
|
|
4117
|
[('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
|
|
4117
|
[('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
|
|
|
4118
|
] + templateopts,
|
|
4118
|
] + templateopts,
|
|
|
4119
|
_('[-r REV] [FILE]'),
|
|
4119
|
_('[-r REV] [FILE]'),
|
|
|
4120
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
4120
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
4121
|
inferrepo=True)
|
|
4121
|
inferrepo=True)
|
|
|
4122
|
def parents(ui, repo, file_=None, **opts):
|
|
4122
|
def parents(ui, repo, file_=None, **opts):
|
|
|
4123
|
"""show the parents of the working directory or revision (DEPRECATED)
|
|
4123
|
"""show the parents of the working directory or revision (DEPRECATED)
|
|
|
4124
|
|
|
4124
|
|
|
|
4125
|
Print the working directory's parent revisions. If a revision is
|
|
4125
|
Print the working directory's parent revisions. If a revision is
|
|
|
4126
|
given via -r/--rev, the parent of that revision will be printed.
|
|
4126
|
given via -r/--rev, the parent of that revision will be printed.
|
|
|
4127
|
If a file argument is given, the revision in which the file was
|
|
4127
|
If a file argument is given, the revision in which the file was
|
|
|
4128
|
last changed (before the working directory revision or the
|
|
4128
|
last changed (before the working directory revision or the
|
|
|
4129
|
argument to --rev if given) is printed.
|
|
4129
|
argument to --rev if given) is printed.
|
|
|
4130
|
|
|
4130
|
|
|
|
4131
|
This command is equivalent to::
|
|
4131
|
This command is equivalent to::
|
|
|
4132
|
|
|
4132
|
|
|
|
4133
|
hg log -r "p1()+p2()" or
|
|
4133
|
hg log -r "p1()+p2()" or
|
|
|
4134
|
hg log -r "p1(REV)+p2(REV)" or
|
|
4134
|
hg log -r "p1(REV)+p2(REV)" or
|
|
|
4135
|
hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
|
|
4135
|
hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
|
|
|
4136
|
hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
|
|
4136
|
hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
|
|
|
4137
|
|
|
4137
|
|
|
|
4138
|
See :hg:`summary` and :hg:`help revsets` for related information.
|
|
4138
|
See :hg:`summary` and :hg:`help revsets` for related information.
|
|
|
4139
|
|
|
4139
|
|
|
|
4140
|
Returns 0 on success.
|
|
4140
|
Returns 0 on success.
|
|
|
4141
|
"""
|
|
4141
|
"""
|
|
|
4142
|
|
|
4142
|
|
|
|
4143
|
opts = pycompat.byteskwargs(opts)
|
|
4143
|
opts = pycompat.byteskwargs(opts)
|
|
|
4144
|
rev = opts.get('rev')
|
|
4144
|
rev = opts.get('rev')
|
|
|
4145
|
if rev:
|
|
4145
|
if rev:
|
|
|
4146
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
4146
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
4147
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
4147
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
|
4148
|
|
|
4148
|
|
|
|
4149
|
if file_:
|
|
4149
|
if file_:
|
|
|
4150
|
m = scmutil.match(ctx, (file_,), opts)
|
|
4150
|
m = scmutil.match(ctx, (file_,), opts)
|
|
|
4151
|
if m.anypats() or len(m.files()) != 1:
|
|
4151
|
if m.anypats() or len(m.files()) != 1:
|
|
|
4152
|
raise error.Abort(_('can only specify an explicit filename'))
|
|
4152
|
raise error.Abort(_('can only specify an explicit filename'))
|
|
|
4153
|
file_ = m.files()[0]
|
|
4153
|
file_ = m.files()[0]
|
|
|
4154
|
filenodes = []
|
|
4154
|
filenodes = []
|
|
|
4155
|
for cp in ctx.parents():
|
|
4155
|
for cp in ctx.parents():
|
|
|
4156
|
if not cp:
|
|
4156
|
if not cp:
|
|
|
4157
|
continue
|
|
4157
|
continue
|
|
|
4158
|
try:
|
|
4158
|
try:
|
|
|
4159
|
filenodes.append(cp.filenode(file_))
|
|
4159
|
filenodes.append(cp.filenode(file_))
|
|
|
4160
|
except error.LookupError:
|
|
4160
|
except error.LookupError:
|
|
|
4161
|
pass
|
|
4161
|
pass
|
|
|
4162
|
if not filenodes:
|
|
4162
|
if not filenodes:
|
|
|
4163
|
raise error.Abort(_("'%s' not found in manifest!") % file_)
|
|
4163
|
raise error.Abort(_("'%s' not found in manifest!") % file_)
|
|
|
4164
|
p = []
|
|
4164
|
p = []
|
|
|
4165
|
for fn in filenodes:
|
|
4165
|
for fn in filenodes:
|
|
|
4166
|
fctx = repo.filectx(file_, fileid=fn)
|
|
4166
|
fctx = repo.filectx(file_, fileid=fn)
|
|
|
4167
|
p.append(fctx.node())
|
|
4167
|
p.append(fctx.node())
|
|
|
4168
|
else:
|
|
4168
|
else:
|
|
|
4169
|
p = [cp.node() for cp in ctx.parents()]
|
|
4169
|
p = [cp.node() for cp in ctx.parents()]
|
|
|
4170
|
|
|
4170
|
|
|
|
4171
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
4171
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
4172
|
for n in p:
|
|
4172
|
for n in p:
|
|
|
4173
|
if n != nullid:
|
|
4173
|
if n != nullid:
|
|
|
4174
|
displayer.show(repo[n])
|
|
4174
|
displayer.show(repo[n])
|
|
|
4175
|
displayer.close()
|
|
4175
|
displayer.close()
|
|
|
4176
|
|
|
4176
|
|
|
|
4177
|
@command('paths', formatteropts, _('[NAME]'),
|
|
4177
|
@command('paths', formatteropts, _('[NAME]'),
|
|
|
4178
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
4178
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
4179
|
optionalrepo=True, intents={INTENT_READONLY})
|
|
4179
|
optionalrepo=True, intents={INTENT_READONLY})
|
|
|
4180
|
def paths(ui, repo, search=None, **opts):
|
|
4180
|
def paths(ui, repo, search=None, **opts):
|
|
|
4181
|
"""show aliases for remote repositories
|
|
4181
|
"""show aliases for remote repositories
|
|
|
4182
|
|
|
4182
|
|
|
|
4183
|
Show definition of symbolic path name NAME. If no name is given,
|
|
4183
|
Show definition of symbolic path name NAME. If no name is given,
|
|
|
4184
|
show definition of all available names.
|
|
4184
|
show definition of all available names.
|
|
|
4185
|
|
|
4185
|
|
|
|
4186
|
Option -q/--quiet suppresses all output when searching for NAME
|
|
4186
|
Option -q/--quiet suppresses all output when searching for NAME
|
|
|
4187
|
and shows only the path names when listing all definitions.
|
|
4187
|
and shows only the path names when listing all definitions.
|
|
|
4188
|
|
|
4188
|
|
|
|
4189
|
Path names are defined in the [paths] section of your
|
|
4189
|
Path names are defined in the [paths] section of your
|
|
|
4190
|
configuration file and in ``/etc/mercurial/hgrc``. If run inside a
|
|
4190
|
configuration file and in ``/etc/mercurial/hgrc``. If run inside a
|
|
|
4191
|
repository, ``.hg/hgrc`` is used, too.
|
|
4191
|
repository, ``.hg/hgrc`` is used, too.
|
|
|
4192
|
|
|
4192
|
|
|
|
4193
|
The path names ``default`` and ``default-push`` have a special
|
|
4193
|
The path names ``default`` and ``default-push`` have a special
|
|
|
4194
|
meaning. When performing a push or pull operation, they are used
|
|
4194
|
meaning. When performing a push or pull operation, they are used
|
|
|
4195
|
as fallbacks if no location is specified on the command-line.
|
|
4195
|
as fallbacks if no location is specified on the command-line.
|
|
|
4196
|
When ``default-push`` is set, it will be used for push and
|
|
4196
|
When ``default-push`` is set, it will be used for push and
|
|
|
4197
|
``default`` will be used for pull; otherwise ``default`` is used
|
|
4197
|
``default`` will be used for pull; otherwise ``default`` is used
|
|
|
4198
|
as the fallback for both. When cloning a repository, the clone
|
|
4198
|
as the fallback for both. When cloning a repository, the clone
|
|
|
4199
|
source is written as ``default`` in ``.hg/hgrc``.
|
|
4199
|
source is written as ``default`` in ``.hg/hgrc``.
|
|
|
4200
|
|
|
4200
|
|
|
|
4201
|
.. note::
|
|
4201
|
.. note::
|
|
|
4202
|
|
|
4202
|
|
|
|
4203
|
``default`` and ``default-push`` apply to all inbound (e.g.
|
|
4203
|
``default`` and ``default-push`` apply to all inbound (e.g.
|
|
|
4204
|
:hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
|
|
4204
|
:hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
|
|
|
4205
|
and :hg:`bundle`) operations.
|
|
4205
|
and :hg:`bundle`) operations.
|
|
|
4206
|
|
|
4206
|
|
|
|
4207
|
See :hg:`help urls` for more information.
|
|
4207
|
See :hg:`help urls` for more information.
|
|
|
4208
|
|
|
4208
|
|
|
|
4209
|
.. container:: verbose
|
|
4209
|
.. container:: verbose
|
|
|
4210
|
|
|
4210
|
|
|
|
4211
|
Template:
|
|
4211
|
Template:
|
|
|
4212
|
|
|
4212
|
|
|
|
4213
|
The following keywords are supported. See also :hg:`help templates`.
|
|
4213
|
The following keywords are supported. See also :hg:`help templates`.
|
|
|
4214
|
|
|
4214
|
|
|
|
4215
|
:name: String. Symbolic name of the path alias.
|
|
4215
|
:name: String. Symbolic name of the path alias.
|
|
|
4216
|
:pushurl: String. URL for push operations.
|
|
4216
|
:pushurl: String. URL for push operations.
|
|
|
4217
|
:url: String. URL or directory path for the other operations.
|
|
4217
|
:url: String. URL or directory path for the other operations.
|
|
|
4218
|
|
|
4218
|
|
|
|
4219
|
Returns 0 on success.
|
|
4219
|
Returns 0 on success.
|
|
|
4220
|
"""
|
|
4220
|
"""
|
|
|
4221
|
|
|
4221
|
|
|
|
4222
|
opts = pycompat.byteskwargs(opts)
|
|
4222
|
opts = pycompat.byteskwargs(opts)
|
|
|
4223
|
ui.pager('paths')
|
|
4223
|
ui.pager('paths')
|
|
|
4224
|
if search:
|
|
4224
|
if search:
|
|
|
4225
|
pathitems = [(name, path) for name, path in ui.paths.iteritems()
|
|
4225
|
pathitems = [(name, path) for name, path in ui.paths.iteritems()
|
|
|
4226
|
if name == search]
|
|
4226
|
if name == search]
|
|
|
4227
|
else:
|
|
4227
|
else:
|
|
|
4228
|
pathitems = sorted(ui.paths.iteritems())
|
|
4228
|
pathitems = sorted(ui.paths.iteritems())
|
|
|
4229
|
|
|
4229
|
|
|
|
4230
|
fm = ui.formatter('paths', opts)
|
|
4230
|
fm = ui.formatter('paths', opts)
|
|
|
4231
|
if fm.isplain():
|
|
4231
|
if fm.isplain():
|
|
|
4232
|
hidepassword = util.hidepassword
|
|
4232
|
hidepassword = util.hidepassword
|
|
|
4233
|
else:
|
|
4233
|
else:
|
|
|
4234
|
hidepassword = bytes
|
|
4234
|
hidepassword = bytes
|
|
|
4235
|
if ui.quiet:
|
|
4235
|
if ui.quiet:
|
|
|
4236
|
namefmt = '%s\n'
|
|
4236
|
namefmt = '%s\n'
|
|
|
4237
|
else:
|
|
4237
|
else:
|
|
|
4238
|
namefmt = '%s = '
|
|
4238
|
namefmt = '%s = '
|
|
|
4239
|
showsubopts = not search and not ui.quiet
|
|
4239
|
showsubopts = not search and not ui.quiet
|
|
|
4240
|
|
|
4240
|
|
|
|
4241
|
for name, path in pathitems:
|
|
4241
|
for name, path in pathitems:
|
|
|
4242
|
fm.startitem()
|
|
4242
|
fm.startitem()
|
|
|
4243
|
fm.condwrite(not search, 'name', namefmt, name)
|
|
4243
|
fm.condwrite(not search, 'name', namefmt, name)
|
|
|
4244
|
fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
|
|
4244
|
fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
|
|
|
4245
|
for subopt, value in sorted(path.suboptions.items()):
|
|
4245
|
for subopt, value in sorted(path.suboptions.items()):
|
|
|
4246
|
assert subopt not in ('name', 'url')
|
|
4246
|
assert subopt not in ('name', 'url')
|
|
|
4247
|
if showsubopts:
|
|
4247
|
if showsubopts:
|
|
|
4248
|
fm.plain('%s:%s = ' % (name, subopt))
|
|
4248
|
fm.plain('%s:%s = ' % (name, subopt))
|
|
|
4249
|
fm.condwrite(showsubopts, subopt, '%s\n', value)
|
|
4249
|
fm.condwrite(showsubopts, subopt, '%s\n', value)
|
|
|
4250
|
|
|
4250
|
|
|
|
4251
|
fm.end()
|
|
4251
|
fm.end()
|
|
|
4252
|
|
|
4252
|
|
|
|
4253
|
if search and not pathitems:
|
|
4253
|
if search and not pathitems:
|
|
|
4254
|
if not ui.quiet:
|
|
4254
|
if not ui.quiet:
|
|
|
4255
|
ui.warn(_("not found!\n"))
|
|
4255
|
ui.warn(_("not found!\n"))
|
|
|
4256
|
return 1
|
|
4256
|
return 1
|
|
|
4257
|
else:
|
|
4257
|
else:
|
|
|
4258
|
return 0
|
|
4258
|
return 0
|
|
|
4259
|
|
|
4259
|
|
|
|
4260
|
@command('phase',
|
|
4260
|
@command('phase',
|
|
|
4261
|
[('p', 'public', False, _('set changeset phase to public')),
|
|
4261
|
[('p', 'public', False, _('set changeset phase to public')),
|
|
|
4262
|
('d', 'draft', False, _('set changeset phase to draft')),
|
|
4262
|
('d', 'draft', False, _('set changeset phase to draft')),
|
|
|
4263
|
('s', 'secret', False, _('set changeset phase to secret')),
|
|
4263
|
('s', 'secret', False, _('set changeset phase to secret')),
|
|
|
4264
|
('f', 'force', False, _('allow to move boundary backward')),
|
|
4264
|
('f', 'force', False, _('allow to move boundary backward')),
|
|
|
4265
|
('r', 'rev', [], _('target revision'), _('REV')),
|
|
4265
|
('r', 'rev', [], _('target revision'), _('REV')),
|
|
|
4266
|
],
|
|
4266
|
],
|
|
|
4267
|
_('[-p|-d|-s] [-f] [-r] [REV...]'),
|
|
4267
|
_('[-p|-d|-s] [-f] [-r] [REV...]'),
|
|
|
4268
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
4268
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
4269
|
def phase(ui, repo, *revs, **opts):
|
|
4269
|
def phase(ui, repo, *revs, **opts):
|
|
|
4270
|
"""set or show the current phase name
|
|
4270
|
"""set or show the current phase name
|
|
|
4271
|
|
|
4271
|
|
|
|
4272
|
With no argument, show the phase name of the current revision(s).
|
|
4272
|
With no argument, show the phase name of the current revision(s).
|
|
|
4273
|
|
|
4273
|
|
|
|
4274
|
With one of -p/--public, -d/--draft or -s/--secret, change the
|
|
4274
|
With one of -p/--public, -d/--draft or -s/--secret, change the
|
|
|
4275
|
phase value of the specified revisions.
|
|
4275
|
phase value of the specified revisions.
|
|
|
4276
|
|
|
4276
|
|
|
|
4277
|
Unless -f/--force is specified, :hg:`phase` won't move changesets from a
|
|
4277
|
Unless -f/--force is specified, :hg:`phase` won't move changesets from a
|
|
|
4278
|
lower phase to a higher phase. Phases are ordered as follows::
|
|
4278
|
lower phase to a higher phase. Phases are ordered as follows::
|
|
|
4279
|
|
|
4279
|
|
|
|
4280
|
public < draft < secret
|
|
4280
|
public < draft < secret
|
|
|
4281
|
|
|
4281
|
|
|
|
4282
|
Returns 0 on success, 1 if some phases could not be changed.
|
|
4282
|
Returns 0 on success, 1 if some phases could not be changed.
|
|
|
4283
|
|
|
4283
|
|
|
|
4284
|
(For more information about the phases concept, see :hg:`help phases`.)
|
|
4284
|
(For more information about the phases concept, see :hg:`help phases`.)
|
|
|
4285
|
"""
|
|
4285
|
"""
|
|
|
4286
|
opts = pycompat.byteskwargs(opts)
|
|
4286
|
opts = pycompat.byteskwargs(opts)
|
|
|
4287
|
# search for a unique phase argument
|
|
4287
|
# search for a unique phase argument
|
|
|
4288
|
targetphase = None
|
|
4288
|
targetphase = None
|
|
|
4289
|
for idx, name in enumerate(phases.cmdphasenames):
|
|
4289
|
for idx, name in enumerate(phases.cmdphasenames):
|
|
|
4290
|
if opts[name]:
|
|
4290
|
if opts[name]:
|
|
|
4291
|
if targetphase is not None:
|
|
4291
|
if targetphase is not None:
|
|
|
4292
|
raise error.Abort(_('only one phase can be specified'))
|
|
4292
|
raise error.Abort(_('only one phase can be specified'))
|
|
|
4293
|
targetphase = idx
|
|
4293
|
targetphase = idx
|
|
|
4294
|
|
|
4294
|
|
|
|
4295
|
# look for specified revision
|
|
4295
|
# look for specified revision
|
|
|
4296
|
revs = list(revs)
|
|
4296
|
revs = list(revs)
|
|
|
4297
|
revs.extend(opts['rev'])
|
|
4297
|
revs.extend(opts['rev'])
|
|
|
4298
|
if not revs:
|
|
4298
|
if not revs:
|
|
|
4299
|
# display both parents as the second parent phase can influence
|
|
4299
|
# display both parents as the second parent phase can influence
|
|
|
4300
|
# the phase of a merge commit
|
|
4300
|
# the phase of a merge commit
|
|
|
4301
|
revs = [c.rev() for c in repo[None].parents()]
|
|
4301
|
revs = [c.rev() for c in repo[None].parents()]
|
|
|
4302
|
|
|
4302
|
|
|
|
4303
|
revs = scmutil.revrange(repo, revs)
|
|
4303
|
revs = scmutil.revrange(repo, revs)
|
|
|
4304
|
|
|
4304
|
|
|
|
4305
|
ret = 0
|
|
4305
|
ret = 0
|
|
|
4306
|
if targetphase is None:
|
|
4306
|
if targetphase is None:
|
|
|
4307
|
# display
|
|
4307
|
# display
|
|
|
4308
|
for r in revs:
|
|
4308
|
for r in revs:
|
|
|
4309
|
ctx = repo[r]
|
|
4309
|
ctx = repo[r]
|
|
|
4310
|
ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
|
|
4310
|
ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
|
|
|
4311
|
else:
|
|
4311
|
else:
|
|
|
4312
|
with repo.lock(), repo.transaction("phase") as tr:
|
|
4312
|
with repo.lock(), repo.transaction("phase") as tr:
|
|
|
4313
|
# set phase
|
|
4313
|
# set phase
|
|
|
4314
|
if not revs:
|
|
4314
|
if not revs:
|
|
|
4315
|
raise error.Abort(_('empty revision set'))
|
|
4315
|
raise error.Abort(_('empty revision set'))
|
|
|
4316
|
nodes = [repo[r].node() for r in revs]
|
|
4316
|
nodes = [repo[r].node() for r in revs]
|
|
|
4317
|
# moving revision from public to draft may hide them
|
|
4317
|
# moving revision from public to draft may hide them
|
|
|
4318
|
# We have to check result on an unfiltered repository
|
|
4318
|
# We have to check result on an unfiltered repository
|
|
|
4319
|
unfi = repo.unfiltered()
|
|
4319
|
unfi = repo.unfiltered()
|
|
|
4320
|
getphase = unfi._phasecache.phase
|
|
4320
|
getphase = unfi._phasecache.phase
|
|
|
4321
|
olddata = [getphase(unfi, r) for r in unfi]
|
|
4321
|
olddata = [getphase(unfi, r) for r in unfi]
|
|
|
4322
|
phases.advanceboundary(repo, tr, targetphase, nodes)
|
|
4322
|
phases.advanceboundary(repo, tr, targetphase, nodes)
|
|
|
4323
|
if opts['force']:
|
|
4323
|
if opts['force']:
|
|
|
4324
|
phases.retractboundary(repo, tr, targetphase, nodes)
|
|
4324
|
phases.retractboundary(repo, tr, targetphase, nodes)
|
|
|
4325
|
getphase = unfi._phasecache.phase
|
|
4325
|
getphase = unfi._phasecache.phase
|
|
|
4326
|
newdata = [getphase(unfi, r) for r in unfi]
|
|
4326
|
newdata = [getphase(unfi, r) for r in unfi]
|
|
|
4327
|
changes = sum(newdata[r] != olddata[r] for r in unfi)
|
|
4327
|
changes = sum(newdata[r] != olddata[r] for r in unfi)
|
|
|
4328
|
cl = unfi.changelog
|
|
4328
|
cl = unfi.changelog
|
|
|
4329
|
rejected = [n for n in nodes
|
|
4329
|
rejected = [n for n in nodes
|
|
|
4330
|
if newdata[cl.rev(n)] < targetphase]
|
|
4330
|
if newdata[cl.rev(n)] < targetphase]
|
|
|
4331
|
if rejected:
|
|
4331
|
if rejected:
|
|
|
4332
|
ui.warn(_('cannot move %i changesets to a higher '
|
|
4332
|
ui.warn(_('cannot move %i changesets to a higher '
|
|
|
4333
|
'phase, use --force\n') % len(rejected))
|
|
4333
|
'phase, use --force\n') % len(rejected))
|
|
|
4334
|
ret = 1
|
|
4334
|
ret = 1
|
|
|
4335
|
if changes:
|
|
4335
|
if changes:
|
|
|
4336
|
msg = _('phase changed for %i changesets\n') % changes
|
|
4336
|
msg = _('phase changed for %i changesets\n') % changes
|
|
|
4337
|
if ret:
|
|
4337
|
if ret:
|
|
|
4338
|
ui.status(msg)
|
|
4338
|
ui.status(msg)
|
|
|
4339
|
else:
|
|
4339
|
else:
|
|
|
4340
|
ui.note(msg)
|
|
4340
|
ui.note(msg)
|
|
|
4341
|
else:
|
|
4341
|
else:
|
|
|
4342
|
ui.warn(_('no phases changed\n'))
|
|
4342
|
ui.warn(_('no phases changed\n'))
|
|
|
4343
|
return ret
|
|
4343
|
return ret
|
|
|
4344
|
|
|
4344
|
|
|
|
4345
|
def postincoming(ui, repo, modheads, optupdate, checkout, brev):
|
|
4345
|
def postincoming(ui, repo, modheads, optupdate, checkout, brev):
|
|
|
4346
|
"""Run after a changegroup has been added via pull/unbundle
|
|
4346
|
"""Run after a changegroup has been added via pull/unbundle
|
|
|
4347
|
|
|
4347
|
|
|
|
4348
|
This takes arguments below:
|
|
4348
|
This takes arguments below:
|
|
|
4349
|
|
|
4349
|
|
|
|
4350
|
:modheads: change of heads by pull/unbundle
|
|
4350
|
:modheads: change of heads by pull/unbundle
|
|
|
4351
|
:optupdate: updating working directory is needed or not
|
|
4351
|
:optupdate: updating working directory is needed or not
|
|
|
4352
|
:checkout: update destination revision (or None to default destination)
|
|
4352
|
:checkout: update destination revision (or None to default destination)
|
|
|
4353
|
:brev: a name, which might be a bookmark to be activated after updating
|
|
4353
|
:brev: a name, which might be a bookmark to be activated after updating
|
|
|
4354
|
"""
|
|
4354
|
"""
|
|
|
4355
|
if modheads == 0:
|
|
4355
|
if modheads == 0:
|
|
|
4356
|
return
|
|
4356
|
return
|
|
|
4357
|
if optupdate:
|
|
4357
|
if optupdate:
|
|
|
4358
|
try:
|
|
4358
|
try:
|
|
|
4359
|
return hg.updatetotally(ui, repo, checkout, brev)
|
|
4359
|
return hg.updatetotally(ui, repo, checkout, brev)
|
|
|
4360
|
except error.UpdateAbort as inst:
|
|
4360
|
except error.UpdateAbort as inst:
|
|
|
4361
|
msg = _("not updating: %s") % stringutil.forcebytestr(inst)
|
|
4361
|
msg = _("not updating: %s") % stringutil.forcebytestr(inst)
|
|
|
4362
|
hint = inst.hint
|
|
4362
|
hint = inst.hint
|
|
|
4363
|
raise error.UpdateAbort(msg, hint=hint)
|
|
4363
|
raise error.UpdateAbort(msg, hint=hint)
|
|
|
4364
|
if modheads > 1:
|
|
4364
|
if modheads > 1:
|
|
|
4365
|
currentbranchheads = len(repo.branchheads())
|
|
4365
|
currentbranchheads = len(repo.branchheads())
|
|
|
4366
|
if currentbranchheads == modheads:
|
|
4366
|
if currentbranchheads == modheads:
|
|
|
4367
|
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
|
|
4367
|
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
|
|
|
4368
|
elif currentbranchheads > 1:
|
|
4368
|
elif currentbranchheads > 1:
|
|
|
4369
|
ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
|
|
4369
|
ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
|
|
|
4370
|
"merge)\n"))
|
|
4370
|
"merge)\n"))
|
|
|
4371
|
else:
|
|
4371
|
else:
|
|
|
4372
|
ui.status(_("(run 'hg heads' to see heads)\n"))
|
|
4372
|
ui.status(_("(run 'hg heads' to see heads)\n"))
|
|
|
4373
|
elif not ui.configbool('commands', 'update.requiredest'):
|
|
4373
|
elif not ui.configbool('commands', 'update.requiredest'):
|
|
|
4374
|
ui.status(_("(run 'hg update' to get a working copy)\n"))
|
|
4374
|
ui.status(_("(run 'hg update' to get a working copy)\n"))
|
|
|
4375
|
|
|
4375
|
|
|
|
4376
|
@command('pull',
|
|
4376
|
@command('pull',
|
|
|
4377
|
[('u', 'update', None,
|
|
4377
|
[('u', 'update', None,
|
|
|
4378
|
_('update to new branch head if new descendants were pulled')),
|
|
4378
|
_('update to new branch head if new descendants were pulled')),
|
|
|
4379
|
('f', 'force', None, _('run even when remote repository is unrelated')),
|
|
4379
|
('f', 'force', None, _('run even when remote repository is unrelated')),
|
|
|
4380
|
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
|
|
4380
|
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
|
|
|
4381
|
('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
|
|
4381
|
('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
|
|
|
4382
|
('b', 'branch', [], _('a specific branch you would like to pull'),
|
|
4382
|
('b', 'branch', [], _('a specific branch you would like to pull'),
|
|
|
4383
|
_('BRANCH')),
|
|
4383
|
_('BRANCH')),
|
|
|
4384
|
] + remoteopts,
|
|
4384
|
] + remoteopts,
|
|
|
4385
|
_('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
|
|
4385
|
_('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
|
|
|
4386
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
4386
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
4387
|
helpbasic=True)
|
|
4387
|
helpbasic=True)
|
|
|
4388
|
def pull(ui, repo, source="default", **opts):
|
|
4388
|
def pull(ui, repo, source="default", **opts):
|
|
|
4389
|
"""pull changes from the specified source
|
|
4389
|
"""pull changes from the specified source
|
|
|
4390
|
|
|
4390
|
|
|
|
4391
|
Pull changes from a remote repository to a local one.
|
|
4391
|
Pull changes from a remote repository to a local one.
|
|
|
4392
|
|
|
4392
|
|
|
|
4393
|
This finds all changes from the repository at the specified path
|
|
4393
|
This finds all changes from the repository at the specified path
|
|
|
4394
|
or URL and adds them to a local repository (the current one unless
|
|
4394
|
or URL and adds them to a local repository (the current one unless
|
|
|
4395
|
-R is specified). By default, this does not update the copy of the
|
|
4395
|
-R is specified). By default, this does not update the copy of the
|
|
|
4396
|
project in the working directory.
|
|
4396
|
project in the working directory.
|
|
|
4397
|
|
|
4397
|
|
|
|
4398
|
When cloning from servers that support it, Mercurial may fetch
|
|
4398
|
When cloning from servers that support it, Mercurial may fetch
|
|
|
4399
|
pre-generated data. When this is done, hooks operating on incoming
|
|
4399
|
pre-generated data. When this is done, hooks operating on incoming
|
|
|
4400
|
changesets and changegroups may fire more than once, once for each
|
|
4400
|
changesets and changegroups may fire more than once, once for each
|
|
|
4401
|
pre-generated bundle and as well as for any additional remaining
|
|
4401
|
pre-generated bundle and as well as for any additional remaining
|
|
|
4402
|
data. See :hg:`help -e clonebundles` for more.
|
|
4402
|
data. See :hg:`help -e clonebundles` for more.
|
|
|
4403
|
|
|
4403
|
|
|
|
4404
|
Use :hg:`incoming` if you want to see what would have been added
|
|
4404
|
Use :hg:`incoming` if you want to see what would have been added
|
|
|
4405
|
by a pull at the time you issued this command. If you then decide
|
|
4405
|
by a pull at the time you issued this command. If you then decide
|
|
|
4406
|
to add those changes to the repository, you should use :hg:`pull
|
|
4406
|
to add those changes to the repository, you should use :hg:`pull
|
|
|
4407
|
-r X` where ``X`` is the last changeset listed by :hg:`incoming`.
|
|
4407
|
-r X` where ``X`` is the last changeset listed by :hg:`incoming`.
|
|
|
4408
|
|
|
4408
|
|
|
|
4409
|
If SOURCE is omitted, the 'default' path will be used.
|
|
4409
|
If SOURCE is omitted, the 'default' path will be used.
|
|
|
4410
|
See :hg:`help urls` for more information.
|
|
4410
|
See :hg:`help urls` for more information.
|
|
|
4411
|
|
|
4411
|
|
|
|
4412
|
Specifying bookmark as ``.`` is equivalent to specifying the active
|
|
4412
|
Specifying bookmark as ``.`` is equivalent to specifying the active
|
|
|
4413
|
bookmark's name.
|
|
4413
|
bookmark's name.
|
|
|
4414
|
|
|
4414
|
|
|
|
4415
|
Returns 0 on success, 1 if an update had unresolved files.
|
|
4415
|
Returns 0 on success, 1 if an update had unresolved files.
|
|
|
4416
|
"""
|
|
4416
|
"""
|
|
|
4417
|
|
|
4417
|
|
|
|
4418
|
opts = pycompat.byteskwargs(opts)
|
|
4418
|
opts = pycompat.byteskwargs(opts)
|
|
|
4419
|
if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
|
|
4419
|
if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
|
|
|
4420
|
msg = _('update destination required by configuration')
|
|
4420
|
msg = _('update destination required by configuration')
|
|
|
4421
|
hint = _('use hg pull followed by hg update DEST')
|
|
4421
|
hint = _('use hg pull followed by hg update DEST')
|
|
|
4422
|
raise error.Abort(msg, hint=hint)
|
|
4422
|
raise error.Abort(msg, hint=hint)
|
|
|
4423
|
|
|
4423
|
|
|
|
4424
|
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
|
|
4424
|
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
|
|
|
4425
|
ui.status(_('pulling from %s\n') % util.hidepassword(source))
|
|
4425
|
ui.status(_('pulling from %s\n') % util.hidepassword(source))
|
|
|
4426
|
other = hg.peer(repo, opts, source)
|
|
4426
|
other = hg.peer(repo, opts, source)
|
|
|
4427
|
try:
|
|
4427
|
try:
|
|
|
4428
|
revs, checkout = hg.addbranchrevs(repo, other, branches,
|
|
4428
|
revs, checkout = hg.addbranchrevs(repo, other, branches,
|
|
|
4429
|
opts.get('rev'))
|
|
4429
|
opts.get('rev'))
|
|
|
4430
|
|
|
4430
|
|
|
|
4431
|
pullopargs = {}
|
|
4431
|
pullopargs = {}
|
|
|
4432
|
|
|
4432
|
|
|
|
4433
|
nodes = None
|
|
4433
|
nodes = None
|
|
|
4434
|
if opts.get('bookmark') or revs:
|
|
4434
|
if opts.get('bookmark') or revs:
|
|
|
4435
|
# The list of bookmark used here is the same used to actually update
|
|
4435
|
# The list of bookmark used here is the same used to actually update
|
|
|
4436
|
# the bookmark names, to avoid the race from issue 4689 and we do
|
|
4436
|
# the bookmark names, to avoid the race from issue 4689 and we do
|
|
|
4437
|
# all lookup and bookmark queries in one go so they see the same
|
|
4437
|
# all lookup and bookmark queries in one go so they see the same
|
|
|
4438
|
# version of the server state (issue 4700).
|
|
4438
|
# version of the server state (issue 4700).
|
|
|
4439
|
nodes = []
|
|
4439
|
nodes = []
|
|
|
4440
|
fnodes = []
|
|
4440
|
fnodes = []
|
|
|
4441
|
revs = revs or []
|
|
4441
|
revs = revs or []
|
|
|
4442
|
if revs and not other.capable('lookup'):
|
|
4442
|
if revs and not other.capable('lookup'):
|
|
|
4443
|
err = _("other repository doesn't support revision lookup, "
|
|
4443
|
err = _("other repository doesn't support revision lookup, "
|
|
|
4444
|
"so a rev cannot be specified.")
|
|
4444
|
"so a rev cannot be specified.")
|
|
|
4445
|
raise error.Abort(err)
|
|
4445
|
raise error.Abort(err)
|
|
|
4446
|
with other.commandexecutor() as e:
|
|
4446
|
with other.commandexecutor() as e:
|
|
|
4447
|
fremotebookmarks = e.callcommand('listkeys', {
|
|
4447
|
fremotebookmarks = e.callcommand('listkeys', {
|
|
|
4448
|
'namespace': 'bookmarks'
|
|
4448
|
'namespace': 'bookmarks'
|
|
|
4449
|
})
|
|
4449
|
})
|
|
|
4450
|
for r in revs:
|
|
4450
|
for r in revs:
|
|
|
4451
|
fnodes.append(e.callcommand('lookup', {'key': r}))
|
|
4451
|
fnodes.append(e.callcommand('lookup', {'key': r}))
|
|
|
4452
|
remotebookmarks = fremotebookmarks.result()
|
|
4452
|
remotebookmarks = fremotebookmarks.result()
|
|
|
4453
|
remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
|
|
4453
|
remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
|
|
|
4454
|
pullopargs['remotebookmarks'] = remotebookmarks
|
|
4454
|
pullopargs['remotebookmarks'] = remotebookmarks
|
|
|
4455
|
for b in opts.get('bookmark', []):
|
|
4455
|
for b in opts.get('bookmark', []):
|
|
|
4456
|
b = repo._bookmarks.expandname(b)
|
|
4456
|
b = repo._bookmarks.expandname(b)
|
|
|
4457
|
if b not in remotebookmarks:
|
|
4457
|
if b not in remotebookmarks:
|
|
|
4458
|
raise error.Abort(_('remote bookmark %s not found!') % b)
|
|
4458
|
raise error.Abort(_('remote bookmark %s not found!') % b)
|
|
|
4459
|
nodes.append(remotebookmarks[b])
|
|
4459
|
nodes.append(remotebookmarks[b])
|
|
|
4460
|
for i, rev in enumerate(revs):
|
|
4460
|
for i, rev in enumerate(revs):
|
|
|
4461
|
node = fnodes[i].result()
|
|
4461
|
node = fnodes[i].result()
|
|
|
4462
|
nodes.append(node)
|
|
4462
|
nodes.append(node)
|
|
|
4463
|
if rev == checkout:
|
|
4463
|
if rev == checkout:
|
|
|
4464
|
checkout = node
|
|
4464
|
checkout = node
|
|
|
4465
|
|
|
4465
|
|
|
|
4466
|
wlock = util.nullcontextmanager()
|
|
4466
|
wlock = util.nullcontextmanager()
|
|
|
4467
|
if opts.get('update'):
|
|
4467
|
if opts.get('update'):
|
|
|
4468
|
wlock = repo.wlock()
|
|
4468
|
wlock = repo.wlock()
|
|
|
4469
|
with wlock:
|
|
4469
|
with wlock:
|
|
|
4470
|
pullopargs.update(opts.get('opargs', {}))
|
|
4470
|
pullopargs.update(opts.get('opargs', {}))
|
|
|
4471
|
modheads = exchange.pull(repo, other, heads=nodes,
|
|
4471
|
modheads = exchange.pull(repo, other, heads=nodes,
|
|
|
4472
|
force=opts.get('force'),
|
|
4472
|
force=opts.get('force'),
|
|
|
4473
|
bookmarks=opts.get('bookmark', ()),
|
|
4473
|
bookmarks=opts.get('bookmark', ()),
|
|
|
4474
|
opargs=pullopargs).cgresult
|
|
4474
|
opargs=pullopargs).cgresult
|
|
|
4475
|
|
|
4475
|
|
|
|
4476
|
# brev is a name, which might be a bookmark to be activated at
|
|
4476
|
# brev is a name, which might be a bookmark to be activated at
|
|
|
4477
|
# the end of the update. In other words, it is an explicit
|
|
4477
|
# the end of the update. In other words, it is an explicit
|
|
|
4478
|
# destination of the update
|
|
4478
|
# destination of the update
|
|
|
4479
|
brev = None
|
|
4479
|
brev = None
|
|
|
4480
|
|
|
4480
|
|
|
|
4481
|
if checkout:
|
|
4481
|
if checkout:
|
|
|
4482
|
checkout = repo.changelog.rev(checkout)
|
|
4482
|
checkout = repo.changelog.rev(checkout)
|
|
|
4483
|
|
|
4483
|
|
|
|
4484
|
# order below depends on implementation of
|
|
4484
|
# order below depends on implementation of
|
|
|
4485
|
# hg.addbranchrevs(). opts['bookmark'] is ignored,
|
|
4485
|
# hg.addbranchrevs(). opts['bookmark'] is ignored,
|
|
|
4486
|
# because 'checkout' is determined without it.
|
|
4486
|
# because 'checkout' is determined without it.
|
|
|
4487
|
if opts.get('rev'):
|
|
4487
|
if opts.get('rev'):
|
|
|
4488
|
brev = opts['rev'][0]
|
|
4488
|
brev = opts['rev'][0]
|
|
|
4489
|
elif opts.get('branch'):
|
|
4489
|
elif opts.get('branch'):
|
|
|
4490
|
brev = opts['branch'][0]
|
|
4490
|
brev = opts['branch'][0]
|
|
|
4491
|
else:
|
|
4491
|
else:
|
|
|
4492
|
brev = branches[0]
|
|
4492
|
brev = branches[0]
|
|
|
4493
|
repo._subtoppath = source
|
|
4493
|
repo._subtoppath = source
|
|
|
4494
|
try:
|
|
4494
|
try:
|
|
|
4495
|
ret = postincoming(ui, repo, modheads, opts.get('update'),
|
|
4495
|
ret = postincoming(ui, repo, modheads, opts.get('update'),
|
|
|
4496
|
checkout, brev)
|
|
4496
|
checkout, brev)
|
|
|
4497
|
|
|
4497
|
|
|
|
4498
|
finally:
|
|
4498
|
finally:
|
|
|
4499
|
del repo._subtoppath
|
|
4499
|
del repo._subtoppath
|
|
|
4500
|
|
|
4500
|
|
|
|
4501
|
finally:
|
|
4501
|
finally:
|
|
|
4502
|
other.close()
|
|
4502
|
other.close()
|
|
|
4503
|
return ret
|
|
4503
|
return ret
|
|
|
4504
|
|
|
4504
|
|
|
|
4505
|
@command('push',
|
|
4505
|
@command('push',
|
|
|
4506
|
[('f', 'force', None, _('force push')),
|
|
4506
|
[('f', 'force', None, _('force push')),
|
|
|
4507
|
('r', 'rev', [],
|
|
4507
|
('r', 'rev', [],
|
|
|
4508
|
_('a changeset intended to be included in the destination'),
|
|
4508
|
_('a changeset intended to be included in the destination'),
|
|
|
4509
|
_('REV')),
|
|
4509
|
_('REV')),
|
|
|
4510
|
('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
|
|
4510
|
('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
|
|
|
4511
|
('b', 'branch', [],
|
|
4511
|
('b', 'branch', [],
|
|
|
4512
|
_('a specific branch you would like to push'), _('BRANCH')),
|
|
4512
|
_('a specific branch you would like to push'), _('BRANCH')),
|
|
|
4513
|
('', 'new-branch', False, _('allow pushing a new branch')),
|
|
4513
|
('', 'new-branch', False, _('allow pushing a new branch')),
|
|
|
4514
|
('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
|
|
4514
|
('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
|
|
|
4515
|
('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
|
|
4515
|
('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
|
|
|
4516
|
] + remoteopts,
|
|
4516
|
] + remoteopts,
|
|
|
4517
|
_('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
|
|
4517
|
_('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
|
|
|
4518
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
4518
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
4519
|
helpbasic=True)
|
|
4519
|
helpbasic=True)
|
|
|
4520
|
def push(ui, repo, dest=None, **opts):
|
|
4520
|
def push(ui, repo, dest=None, **opts):
|
|
|
4521
|
"""push changes to the specified destination
|
|
4521
|
"""push changes to the specified destination
|
|
|
4522
|
|
|
4522
|
|
|
|
4523
|
Push changesets from the local repository to the specified
|
|
4523
|
Push changesets from the local repository to the specified
|
|
|
4524
|
destination.
|
|
4524
|
destination.
|
|
|
4525
|
|
|
4525
|
|
|
|
4526
|
This operation is symmetrical to pull: it is identical to a pull
|
|
4526
|
This operation is symmetrical to pull: it is identical to a pull
|
|
|
4527
|
in the destination repository from the current one.
|
|
4527
|
in the destination repository from the current one.
|
|
|
4528
|
|
|
4528
|
|
|
|
4529
|
By default, push will not allow creation of new heads at the
|
|
4529
|
By default, push will not allow creation of new heads at the
|
|
|
4530
|
destination, since multiple heads would make it unclear which head
|
|
4530
|
destination, since multiple heads would make it unclear which head
|
|
|
4531
|
to use. In this situation, it is recommended to pull and merge
|
|
4531
|
to use. In this situation, it is recommended to pull and merge
|
|
|
4532
|
before pushing.
|
|
4532
|
before pushing.
|
|
|
4533
|
|
|
4533
|
|
|
|
4534
|
Use --new-branch if you want to allow push to create a new named
|
|
4534
|
Use --new-branch if you want to allow push to create a new named
|
|
|
4535
|
branch that is not present at the destination. This allows you to
|
|
4535
|
branch that is not present at the destination. This allows you to
|
|
|
4536
|
only create a new branch without forcing other changes.
|
|
4536
|
only create a new branch without forcing other changes.
|
|
|
4537
|
|
|
4537
|
|
|
|
4538
|
.. note::
|
|
4538
|
.. note::
|
|
|
4539
|
|
|
4539
|
|
|
|
4540
|
Extra care should be taken with the -f/--force option,
|
|
4540
|
Extra care should be taken with the -f/--force option,
|
|
|
4541
|
which will push all new heads on all branches, an action which will
|
|
4541
|
which will push all new heads on all branches, an action which will
|
|
|
4542
|
almost always cause confusion for collaborators.
|
|
4542
|
almost always cause confusion for collaborators.
|
|
|
4543
|
|
|
4543
|
|
|
|
4544
|
If -r/--rev is used, the specified revision and all its ancestors
|
|
4544
|
If -r/--rev is used, the specified revision and all its ancestors
|
|
|
4545
|
will be pushed to the remote repository.
|
|
4545
|
will be pushed to the remote repository.
|
|
|
4546
|
|
|
4546
|
|
|
|
4547
|
If -B/--bookmark is used, the specified bookmarked revision, its
|
|
4547
|
If -B/--bookmark is used, the specified bookmarked revision, its
|
|
|
4548
|
ancestors, and the bookmark will be pushed to the remote
|
|
4548
|
ancestors, and the bookmark will be pushed to the remote
|
|
|
4549
|
repository. Specifying ``.`` is equivalent to specifying the active
|
|
4549
|
repository. Specifying ``.`` is equivalent to specifying the active
|
|
|
4550
|
bookmark's name.
|
|
4550
|
bookmark's name.
|
|
|
4551
|
|
|
4551
|
|
|
|
4552
|
Please see :hg:`help urls` for important details about ``ssh://``
|
|
4552
|
Please see :hg:`help urls` for important details about ``ssh://``
|
|
|
4553
|
URLs. If DESTINATION is omitted, a default path will be used.
|
|
4553
|
URLs. If DESTINATION is omitted, a default path will be used.
|
|
|
4554
|
|
|
4554
|
|
|
|
4555
|
.. container:: verbose
|
|
4555
|
.. container:: verbose
|
|
|
4556
|
|
|
4556
|
|
|
|
4557
|
The --pushvars option sends strings to the server that become
|
|
4557
|
The --pushvars option sends strings to the server that become
|
|
|
4558
|
environment variables prepended with ``HG_USERVAR_``. For example,
|
|
4558
|
environment variables prepended with ``HG_USERVAR_``. For example,
|
|
|
4559
|
``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
|
|
4559
|
``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
|
|
|
4560
|
``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
|
|
4560
|
``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
|
|
|
4561
|
|
|
4561
|
|
|
|
4562
|
pushvars can provide for user-overridable hooks as well as set debug
|
|
4562
|
pushvars can provide for user-overridable hooks as well as set debug
|
|
|
4563
|
levels. One example is having a hook that blocks commits containing
|
|
4563
|
levels. One example is having a hook that blocks commits containing
|
|
|
4564
|
conflict markers, but enables the user to override the hook if the file
|
|
4564
|
conflict markers, but enables the user to override the hook if the file
|
|
|
4565
|
is using conflict markers for testing purposes or the file format has
|
|
4565
|
is using conflict markers for testing purposes or the file format has
|
|
|
4566
|
strings that look like conflict markers.
|
|
4566
|
strings that look like conflict markers.
|
|
|
4567
|
|
|
4567
|
|
|
|
4568
|
By default, servers will ignore `--pushvars`. To enable it add the
|
|
4568
|
By default, servers will ignore `--pushvars`. To enable it add the
|
|
|
4569
|
following to your configuration file::
|
|
4569
|
following to your configuration file::
|
|
|
4570
|
|
|
4570
|
|
|
|
4571
|
[push]
|
|
4571
|
[push]
|
|
|
4572
|
pushvars.server = true
|
|
4572
|
pushvars.server = true
|
|
|
4573
|
|
|
4573
|
|
|
|
4574
|
Returns 0 if push was successful, 1 if nothing to push.
|
|
4574
|
Returns 0 if push was successful, 1 if nothing to push.
|
|
|
4575
|
"""
|
|
4575
|
"""
|
|
|
4576
|
|
|
4576
|
|
|
|
4577
|
opts = pycompat.byteskwargs(opts)
|
|
4577
|
opts = pycompat.byteskwargs(opts)
|
|
|
4578
|
if opts.get('bookmark'):
|
|
4578
|
if opts.get('bookmark'):
|
|
|
4579
|
ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
|
|
4579
|
ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
|
|
|
4580
|
for b in opts['bookmark']:
|
|
4580
|
for b in opts['bookmark']:
|
|
|
4581
|
# translate -B options to -r so changesets get pushed
|
|
4581
|
# translate -B options to -r so changesets get pushed
|
|
|
4582
|
b = repo._bookmarks.expandname(b)
|
|
4582
|
b = repo._bookmarks.expandname(b)
|
|
|
4583
|
if b in repo._bookmarks:
|
|
4583
|
if b in repo._bookmarks:
|
|
|
4584
|
opts.setdefault('rev', []).append(b)
|
|
4584
|
opts.setdefault('rev', []).append(b)
|
|
|
4585
|
else:
|
|
4585
|
else:
|
|
|
4586
|
# if we try to push a deleted bookmark, translate it to null
|
|
4586
|
# if we try to push a deleted bookmark, translate it to null
|
|
|
4587
|
# this lets simultaneous -r, -b options continue working
|
|
4587
|
# this lets simultaneous -r, -b options continue working
|
|
|
4588
|
opts.setdefault('rev', []).append("null")
|
|
4588
|
opts.setdefault('rev', []).append("null")
|
|
|
4589
|
|
|
4589
|
|
|
|
4590
|
path = ui.paths.getpath(dest, default=('default-push', 'default'))
|
|
4590
|
path = ui.paths.getpath(dest, default=('default-push', 'default'))
|
|
|
4591
|
if not path:
|
|
4591
|
if not path:
|
|
|
4592
|
raise error.Abort(_('default repository not configured!'),
|
|
4592
|
raise error.Abort(_('default repository not configured!'),
|
|
|
4593
|
hint=_("see 'hg help config.paths'"))
|
|
4593
|
hint=_("see 'hg help config.paths'"))
|
|
|
4594
|
dest = path.pushloc or path.loc
|
|
4594
|
dest = path.pushloc or path.loc
|
|
|
4595
|
branches = (path.branch, opts.get('branch') or [])
|
|
4595
|
branches = (path.branch, opts.get('branch') or [])
|
|
|
4596
|
ui.status(_('pushing to %s\n') % util.hidepassword(dest))
|
|
4596
|
ui.status(_('pushing to %s\n') % util.hidepassword(dest))
|
|
|
4597
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
|
|
4597
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
|
|
|
4598
|
other = hg.peer(repo, opts, dest)
|
|
4598
|
other = hg.peer(repo, opts, dest)
|
|
|
4599
|
|
|
4599
|
|
|
|
4600
|
if revs:
|
|
4600
|
if revs:
|
|
|
4601
|
revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
|
|
4601
|
revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
|
|
|
4602
|
if not revs:
|
|
4602
|
if not revs:
|
|
|
4603
|
raise error.Abort(_("specified revisions evaluate to an empty set"),
|
|
4603
|
raise error.Abort(_("specified revisions evaluate to an empty set"),
|
|
|
4604
|
hint=_("use different revision arguments"))
|
|
4604
|
hint=_("use different revision arguments"))
|
|
|
4605
|
elif path.pushrev:
|
|
4605
|
elif path.pushrev:
|
|
|
4606
|
# It doesn't make any sense to specify ancestor revisions. So limit
|
|
4606
|
# It doesn't make any sense to specify ancestor revisions. So limit
|
|
|
4607
|
# to DAG heads to make discovery simpler.
|
|
4607
|
# to DAG heads to make discovery simpler.
|
|
|
4608
|
expr = revsetlang.formatspec('heads(%r)', path.pushrev)
|
|
4608
|
expr = revsetlang.formatspec('heads(%r)', path.pushrev)
|
|
|
4609
|
revs = scmutil.revrange(repo, [expr])
|
|
4609
|
revs = scmutil.revrange(repo, [expr])
|
|
|
4610
|
revs = [repo[rev].node() for rev in revs]
|
|
4610
|
revs = [repo[rev].node() for rev in revs]
|
|
|
4611
|
if not revs:
|
|
4611
|
if not revs:
|
|
|
4612
|
raise error.Abort(_('default push revset for path evaluates to an '
|
|
4612
|
raise error.Abort(_('default push revset for path evaluates to an '
|
|
|
4613
|
'empty set'))
|
|
4613
|
'empty set'))
|
|
|
4614
|
|
|
4614
|
|
|
|
4615
|
repo._subtoppath = dest
|
|
4615
|
repo._subtoppath = dest
|
|
|
4616
|
try:
|
|
4616
|
try:
|
|
|
4617
|
# push subrepos depth-first for coherent ordering
|
|
4617
|
# push subrepos depth-first for coherent ordering
|
|
|
4618
|
c = repo['.']
|
|
4618
|
c = repo['.']
|
|
|
4619
|
subs = c.substate # only repos that are committed
|
|
4619
|
subs = c.substate # only repos that are committed
|
|
|
4620
|
for s in sorted(subs):
|
|
4620
|
for s in sorted(subs):
|
|
|
4621
|
result = c.sub(s).push(opts)
|
|
4621
|
result = c.sub(s).push(opts)
|
|
|
4622
|
if result == 0:
|
|
4622
|
if result == 0:
|
|
|
4623
|
return not result
|
|
4623
|
return not result
|
|
|
4624
|
finally:
|
|
4624
|
finally:
|
|
|
4625
|
del repo._subtoppath
|
|
4625
|
del repo._subtoppath
|
|
|
4626
|
|
|
4626
|
|
|
|
4627
|
opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
|
|
4627
|
opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
|
|
|
4628
|
opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
|
|
4628
|
opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
|
|
|
4629
|
|
|
4629
|
|
|
|
4630
|
pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
|
|
4630
|
pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
|
|
|
4631
|
newbranch=opts.get('new_branch'),
|
|
4631
|
newbranch=opts.get('new_branch'),
|
|
|
4632
|
bookmarks=opts.get('bookmark', ()),
|
|
4632
|
bookmarks=opts.get('bookmark', ()),
|
|
|
4633
|
publish=opts.get('publish'),
|
|
4633
|
publish=opts.get('publish'),
|
|
|
4634
|
opargs=opargs)
|
|
4634
|
opargs=opargs)
|
|
|
4635
|
|
|
4635
|
|
|
|
4636
|
result = not pushop.cgresult
|
|
4636
|
result = not pushop.cgresult
|
|
|
4637
|
|
|
4637
|
|
|
|
4638
|
if pushop.bkresult is not None:
|
|
4638
|
if pushop.bkresult is not None:
|
|
|
4639
|
if pushop.bkresult == 2:
|
|
4639
|
if pushop.bkresult == 2:
|
|
|
4640
|
result = 2
|
|
4640
|
result = 2
|
|
|
4641
|
elif not result and pushop.bkresult:
|
|
4641
|
elif not result and pushop.bkresult:
|
|
|
4642
|
result = 2
|
|
4642
|
result = 2
|
|
|
4643
|
|
|
4643
|
|
|
|
4644
|
return result
|
|
4644
|
return result
|
|
|
4645
|
|
|
4645
|
|
|
|
4646
|
@command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
|
|
4646
|
@command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
|
|
|
4647
|
def recover(ui, repo):
|
|
4647
|
def recover(ui, repo):
|
|
|
4648
|
"""roll back an interrupted transaction
|
|
4648
|
"""roll back an interrupted transaction
|
|
|
4649
|
|
|
4649
|
|
|
|
4650
|
Recover from an interrupted commit or pull.
|
|
4650
|
Recover from an interrupted commit or pull.
|
|
|
4651
|
|
|
4651
|
|
|
|
4652
|
This command tries to fix the repository status after an
|
|
4652
|
This command tries to fix the repository status after an
|
|
|
4653
|
interrupted operation. It should only be necessary when Mercurial
|
|
4653
|
interrupted operation. It should only be necessary when Mercurial
|
|
|
4654
|
suggests it.
|
|
4654
|
suggests it.
|
|
|
4655
|
|
|
4655
|
|
|
|
4656
|
Returns 0 if successful, 1 if nothing to recover or verify fails.
|
|
4656
|
Returns 0 if successful, 1 if nothing to recover or verify fails.
|
|
|
4657
|
"""
|
|
4657
|
"""
|
|
|
4658
|
if repo.recover():
|
|
4658
|
if repo.recover():
|
|
|
4659
|
return hg.verify(repo)
|
|
4659
|
return hg.verify(repo)
|
|
|
4660
|
return 1
|
|
4660
|
return 1
|
|
|
4661
|
|
|
4661
|
|
|
|
4662
|
@command('remove|rm',
|
|
4662
|
@command('remove|rm',
|
|
|
4663
|
[('A', 'after', None, _('record delete for missing files')),
|
|
4663
|
[('A', 'after', None, _('record delete for missing files')),
|
|
|
4664
|
('f', 'force', None,
|
|
4664
|
('f', 'force', None,
|
|
|
4665
|
_('forget added files, delete modified files')),
|
|
4665
|
_('forget added files, delete modified files')),
|
|
|
4666
|
] + subrepoopts + walkopts + dryrunopts,
|
|
4666
|
] + subrepoopts + walkopts + dryrunopts,
|
|
|
4667
|
_('[OPTION]... FILE...'),
|
|
4667
|
_('[OPTION]... FILE...'),
|
|
|
4668
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
4668
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
4669
|
helpbasic=True, inferrepo=True)
|
|
4669
|
helpbasic=True, inferrepo=True)
|
|
|
4670
|
def remove(ui, repo, *pats, **opts):
|
|
4670
|
def remove(ui, repo, *pats, **opts):
|
|
|
4671
|
"""remove the specified files on the next commit
|
|
4671
|
"""remove the specified files on the next commit
|
|
|
4672
|
|
|
4672
|
|
|
|
4673
|
Schedule the indicated files for removal from the current branch.
|
|
4673
|
Schedule the indicated files for removal from the current branch.
|
|
|
4674
|
|
|
4674
|
|
|
|
4675
|
This command schedules the files to be removed at the next commit.
|
|
4675
|
This command schedules the files to be removed at the next commit.
|
|
|
4676
|
To undo a remove before that, see :hg:`revert`. To undo added
|
|
4676
|
To undo a remove before that, see :hg:`revert`. To undo added
|
|
|
4677
|
files, see :hg:`forget`.
|
|
4677
|
files, see :hg:`forget`.
|
|
|
4678
|
|
|
4678
|
|
|
|
4679
|
.. container:: verbose
|
|
4679
|
.. container:: verbose
|
|
|
4680
|
|
|
4680
|
|
|
|
4681
|
-A/--after can be used to remove only files that have already
|
|
4681
|
-A/--after can be used to remove only files that have already
|
|
|
4682
|
been deleted, -f/--force can be used to force deletion, and -Af
|
|
4682
|
been deleted, -f/--force can be used to force deletion, and -Af
|
|
|
4683
|
can be used to remove files from the next revision without
|
|
4683
|
can be used to remove files from the next revision without
|
|
|
4684
|
deleting them from the working directory.
|
|
4684
|
deleting them from the working directory.
|
|
|
4685
|
|
|
4685
|
|
|
|
4686
|
The following table details the behavior of remove for different
|
|
4686
|
The following table details the behavior of remove for different
|
|
|
4687
|
file states (columns) and option combinations (rows). The file
|
|
4687
|
file states (columns) and option combinations (rows). The file
|
|
|
4688
|
states are Added [A], Clean [C], Modified [M] and Missing [!]
|
|
4688
|
states are Added [A], Clean [C], Modified [M] and Missing [!]
|
|
|
4689
|
(as reported by :hg:`status`). The actions are Warn, Remove
|
|
4689
|
(as reported by :hg:`status`). The actions are Warn, Remove
|
|
|
4690
|
(from branch) and Delete (from disk):
|
|
4690
|
(from branch) and Delete (from disk):
|
|
|
4691
|
|
|
4691
|
|
|
|
4692
|
========= == == == ==
|
|
4692
|
========= == == == ==
|
|
|
4693
|
opt/state A C M !
|
|
4693
|
opt/state A C M !
|
|
|
4694
|
========= == == == ==
|
|
4694
|
========= == == == ==
|
|
|
4695
|
none W RD W R
|
|
4695
|
none W RD W R
|
|
|
4696
|
-f R RD RD R
|
|
4696
|
-f R RD RD R
|
|
|
4697
|
-A W W W R
|
|
4697
|
-A W W W R
|
|
|
4698
|
-Af R R R R
|
|
4698
|
-Af R R R R
|
|
|
4699
|
========= == == == ==
|
|
4699
|
========= == == == ==
|
|
|
4700
|
|
|
4700
|
|
|
|
4701
|
.. note::
|
|
4701
|
.. note::
|
|
|
4702
|
|
|
4702
|
|
|
|
4703
|
:hg:`remove` never deletes files in Added [A] state from the
|
|
4703
|
:hg:`remove` never deletes files in Added [A] state from the
|
|
|
4704
|
working directory, not even if ``--force`` is specified.
|
|
4704
|
working directory, not even if ``--force`` is specified.
|
|
|
4705
|
|
|
4705
|
|
|
|
4706
|
Returns 0 on success, 1 if any warnings encountered.
|
|
4706
|
Returns 0 on success, 1 if any warnings encountered.
|
|
|
4707
|
"""
|
|
4707
|
"""
|
|
|
4708
|
|
|
4708
|
|
|
|
4709
|
opts = pycompat.byteskwargs(opts)
|
|
4709
|
opts = pycompat.byteskwargs(opts)
|
|
|
4710
|
after, force = opts.get('after'), opts.get('force')
|
|
4710
|
after, force = opts.get('after'), opts.get('force')
|
|
|
4711
|
dryrun = opts.get('dry_run')
|
|
4711
|
dryrun = opts.get('dry_run')
|
|
|
4712
|
if not pats and not after:
|
|
4712
|
if not pats and not after:
|
|
|
4713
|
raise error.Abort(_('no files specified'))
|
|
4713
|
raise error.Abort(_('no files specified'))
|
|
|
4714
|
|
|
4714
|
|
|
|
4715
|
m = scmutil.match(repo[None], pats, opts)
|
|
4715
|
m = scmutil.match(repo[None], pats, opts)
|
|
|
4716
|
subrepos = opts.get('subrepos')
|
|
4716
|
subrepos = opts.get('subrepos')
|
|
|
4717
|
return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
|
|
4717
|
return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
|
|
|
4718
|
dryrun=dryrun)
|
|
4718
|
dryrun=dryrun)
|
|
|
4719
|
|
|
4719
|
|
|
|
4720
|
@command('rename|move|mv',
|
|
4720
|
@command('rename|move|mv',
|
|
|
4721
|
[('A', 'after', None, _('record a rename that has already occurred')),
|
|
4721
|
[('A', 'after', None, _('record a rename that has already occurred')),
|
|
|
4722
|
('f', 'force', None, _('forcibly copy over an existing managed file')),
|
|
4722
|
('f', 'force', None, _('forcibly copy over an existing managed file')),
|
|
|
4723
|
] + walkopts + dryrunopts,
|
|
4723
|
] + walkopts + dryrunopts,
|
|
|
4724
|
_('[OPTION]... SOURCE... DEST'),
|
|
4724
|
_('[OPTION]... SOURCE... DEST'),
|
|
|
4725
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
4725
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
4726
|
def rename(ui, repo, *pats, **opts):
|
|
4726
|
def rename(ui, repo, *pats, **opts):
|
|
|
4727
|
"""rename files; equivalent of copy + remove
|
|
4727
|
"""rename files; equivalent of copy + remove
|
|
|
4728
|
|
|
4728
|
|
|
|
4729
|
Mark dest as copies of sources; mark sources for deletion. If dest
|
|
4729
|
Mark dest as copies of sources; mark sources for deletion. If dest
|
|
|
4730
|
is a directory, copies are put in that directory. If dest is a
|
|
4730
|
is a directory, copies are put in that directory. If dest is a
|
|
|
4731
|
file, there can only be one source.
|
|
4731
|
file, there can only be one source.
|
|
|
4732
|
|
|
4732
|
|
|
|
4733
|
By default, this command copies the contents of files as they
|
|
4733
|
By default, this command copies the contents of files as they
|
|
|
4734
|
exist in the working directory. If invoked with -A/--after, the
|
|
4734
|
exist in the working directory. If invoked with -A/--after, the
|
|
|
4735
|
operation is recorded, but no copying is performed.
|
|
4735
|
operation is recorded, but no copying is performed.
|
|
|
4736
|
|
|
4736
|
|
|
|
4737
|
This command takes effect at the next commit. To undo a rename
|
|
4737
|
This command takes effect at the next commit. To undo a rename
|
|
|
4738
|
before that, see :hg:`revert`.
|
|
4738
|
before that, see :hg:`revert`.
|
|
|
4739
|
|
|
4739
|
|
|
|
4740
|
Returns 0 on success, 1 if errors are encountered.
|
|
4740
|
Returns 0 on success, 1 if errors are encountered.
|
|
|
4741
|
"""
|
|
4741
|
"""
|
|
|
4742
|
opts = pycompat.byteskwargs(opts)
|
|
4742
|
opts = pycompat.byteskwargs(opts)
|
|
|
4743
|
with repo.wlock(False):
|
|
4743
|
with repo.wlock(False):
|
|
|
4744
|
return cmdutil.copy(ui, repo, pats, opts, rename=True)
|
|
4744
|
return cmdutil.copy(ui, repo, pats, opts, rename=True)
|
|
|
4745
|
|
|
4745
|
|
|
|
4746
|
@command('resolve',
|
|
4746
|
@command('resolve',
|
|
|
4747
|
[('a', 'all', None, _('select all unresolved files')),
|
|
4747
|
[('a', 'all', None, _('select all unresolved files')),
|
|
|
4748
|
('l', 'list', None, _('list state of files needing merge')),
|
|
4748
|
('l', 'list', None, _('list state of files needing merge')),
|
|
|
4749
|
('m', 'mark', None, _('mark files as resolved')),
|
|
4749
|
('m', 'mark', None, _('mark files as resolved')),
|
|
|
4750
|
('u', 'unmark', None, _('mark files as unresolved')),
|
|
4750
|
('u', 'unmark', None, _('mark files as unresolved')),
|
|
|
4751
|
('n', 'no-status', None, _('hide status prefix')),
|
|
4751
|
('n', 'no-status', None, _('hide status prefix')),
|
|
|
4752
|
('', 're-merge', None, _('re-merge files'))]
|
|
4752
|
('', 're-merge', None, _('re-merge files'))]
|
|
|
4753
|
+ mergetoolopts + walkopts + formatteropts,
|
|
4753
|
+ mergetoolopts + walkopts + formatteropts,
|
|
|
4754
|
_('[OPTION]... [FILE]...'),
|
|
4754
|
_('[OPTION]... [FILE]...'),
|
|
|
4755
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
4755
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
4756
|
inferrepo=True)
|
|
4756
|
inferrepo=True)
|
|
|
4757
|
def resolve(ui, repo, *pats, **opts):
|
|
4757
|
def resolve(ui, repo, *pats, **opts):
|
|
|
4758
|
"""redo merges or set/view the merge status of files
|
|
4758
|
"""redo merges or set/view the merge status of files
|
|
|
4759
|
|
|
4759
|
|
|
|
4760
|
Merges with unresolved conflicts are often the result of
|
|
4760
|
Merges with unresolved conflicts are often the result of
|
|
|
4761
|
non-interactive merging using the ``internal:merge`` configuration
|
|
4761
|
non-interactive merging using the ``internal:merge`` configuration
|
|
|
4762
|
setting, or a command-line merge tool like ``diff3``. The resolve
|
|
4762
|
setting, or a command-line merge tool like ``diff3``. The resolve
|
|
|
4763
|
command is used to manage the files involved in a merge, after
|
|
4763
|
command is used to manage the files involved in a merge, after
|
|
|
4764
|
:hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
|
|
4764
|
:hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
|
|
|
4765
|
working directory must have two parents). See :hg:`help
|
|
4765
|
working directory must have two parents). See :hg:`help
|
|
|
4766
|
merge-tools` for information on configuring merge tools.
|
|
4766
|
merge-tools` for information on configuring merge tools.
|
|
|
4767
|
|
|
4767
|
|
|
|
4768
|
The resolve command can be used in the following ways:
|
|
4768
|
The resolve command can be used in the following ways:
|
|
|
4769
|
|
|
4769
|
|
|
|
4770
|
- :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
|
|
4770
|
- :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
|
|
|
4771
|
the specified files, discarding any previous merge attempts. Re-merging
|
|
4771
|
the specified files, discarding any previous merge attempts. Re-merging
|
|
|
4772
|
is not performed for files already marked as resolved. Use ``--all/-a``
|
|
4772
|
is not performed for files already marked as resolved. Use ``--all/-a``
|
|
|
4773
|
to select all unresolved files. ``--tool`` can be used to specify
|
|
4773
|
to select all unresolved files. ``--tool`` can be used to specify
|
|
|
4774
|
the merge tool used for the given files. It overrides the HGMERGE
|
|
4774
|
the merge tool used for the given files. It overrides the HGMERGE
|
|
|
4775
|
environment variable and your configuration files. Previous file
|
|
4775
|
environment variable and your configuration files. Previous file
|
|
|
4776
|
contents are saved with a ``.orig`` suffix.
|
|
4776
|
contents are saved with a ``.orig`` suffix.
|
|
|
4777
|
|
|
4777
|
|
|
|
4778
|
- :hg:`resolve -m [FILE]`: mark a file as having been resolved
|
|
4778
|
- :hg:`resolve -m [FILE]`: mark a file as having been resolved
|
|
|
4779
|
(e.g. after having manually fixed-up the files). The default is
|
|
4779
|
(e.g. after having manually fixed-up the files). The default is
|
|
|
4780
|
to mark all unresolved files.
|
|
4780
|
to mark all unresolved files.
|
|
|
4781
|
|
|
4781
|
|
|
|
4782
|
- :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
|
|
4782
|
- :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
|
|
|
4783
|
default is to mark all resolved files.
|
|
4783
|
default is to mark all resolved files.
|
|
|
4784
|
|
|
4784
|
|
|
|
4785
|
- :hg:`resolve -l`: list files which had or still have conflicts.
|
|
4785
|
- :hg:`resolve -l`: list files which had or still have conflicts.
|
|
|
4786
|
In the printed list, ``U`` = unresolved and ``R`` = resolved.
|
|
4786
|
In the printed list, ``U`` = unresolved and ``R`` = resolved.
|
|
|
4787
|
You can use ``set:unresolved()`` or ``set:resolved()`` to filter
|
|
4787
|
You can use ``set:unresolved()`` or ``set:resolved()`` to filter
|
|
|
4788
|
the list. See :hg:`help filesets` for details.
|
|
4788
|
the list. See :hg:`help filesets` for details.
|
|
|
4789
|
|
|
4789
|
|
|
|
4790
|
.. note::
|
|
4790
|
.. note::
|
|
|
4791
|
|
|
4791
|
|
|
|
4792
|
Mercurial will not let you commit files with unresolved merge
|
|
4792
|
Mercurial will not let you commit files with unresolved merge
|
|
|
4793
|
conflicts. You must use :hg:`resolve -m ...` before you can
|
|
4793
|
conflicts. You must use :hg:`resolve -m ...` before you can
|
|
|
4794
|
commit after a conflicting merge.
|
|
4794
|
commit after a conflicting merge.
|
|
|
4795
|
|
|
4795
|
|
|
|
4796
|
.. container:: verbose
|
|
4796
|
.. container:: verbose
|
|
|
4797
|
|
|
4797
|
|
|
|
4798
|
Template:
|
|
4798
|
Template:
|
|
|
4799
|
|
|
4799
|
|
|
|
4800
|
The following keywords are supported in addition to the common template
|
|
4800
|
The following keywords are supported in addition to the common template
|
|
|
4801
|
keywords and functions. See also :hg:`help templates`.
|
|
4801
|
keywords and functions. See also :hg:`help templates`.
|
|
|
4802
|
|
|
4802
|
|
|
|
4803
|
:mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
|
|
4803
|
:mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
|
|
|
4804
|
:path: String. Repository-absolute path of the file.
|
|
4804
|
:path: String. Repository-absolute path of the file.
|
|
|
4805
|
|
|
4805
|
|
|
|
4806
|
Returns 0 on success, 1 if any files fail a resolve attempt.
|
|
4806
|
Returns 0 on success, 1 if any files fail a resolve attempt.
|
|
|
4807
|
"""
|
|
4807
|
"""
|
|
|
4808
|
|
|
4808
|
|
|
|
4809
|
opts = pycompat.byteskwargs(opts)
|
|
4809
|
opts = pycompat.byteskwargs(opts)
|
|
|
4810
|
confirm = ui.configbool('commands', 'resolve.confirm')
|
|
4810
|
confirm = ui.configbool('commands', 'resolve.confirm')
|
|
|
4811
|
flaglist = 'all mark unmark list no_status re_merge'.split()
|
|
4811
|
flaglist = 'all mark unmark list no_status re_merge'.split()
|
|
|
4812
|
all, mark, unmark, show, nostatus, remerge = \
|
|
4812
|
all, mark, unmark, show, nostatus, remerge = \
|
|
|
4813
|
[opts.get(o) for o in flaglist]
|
|
4813
|
[opts.get(o) for o in flaglist]
|
|
|
4814
|
|
|
4814
|
|
|
|
4815
|
actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
|
|
4815
|
actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
|
|
|
4816
|
if actioncount > 1:
|
|
4816
|
if actioncount > 1:
|
|
|
4817
|
raise error.Abort(_("too many actions specified"))
|
|
4817
|
raise error.Abort(_("too many actions specified"))
|
|
|
4818
|
elif (actioncount == 0
|
|
4818
|
elif (actioncount == 0
|
|
|
4819
|
and ui.configbool('commands', 'resolve.explicit-re-merge')):
|
|
4819
|
and ui.configbool('commands', 'resolve.explicit-re-merge')):
|
|
|
4820
|
hint = _('use --mark, --unmark, --list or --re-merge')
|
|
4820
|
hint = _('use --mark, --unmark, --list or --re-merge')
|
|
|
4821
|
raise error.Abort(_('no action specified'), hint=hint)
|
|
4821
|
raise error.Abort(_('no action specified'), hint=hint)
|
|
|
4822
|
if pats and all:
|
|
4822
|
if pats and all:
|
|
|
4823
|
raise error.Abort(_("can't specify --all and patterns"))
|
|
4823
|
raise error.Abort(_("can't specify --all and patterns"))
|
|
|
4824
|
if not (all or pats or show or mark or unmark):
|
|
4824
|
if not (all or pats or show or mark or unmark):
|
|
|
4825
|
raise error.Abort(_('no files or directories specified'),
|
|
4825
|
raise error.Abort(_('no files or directories specified'),
|
|
|
4826
|
hint=('use --all to re-merge all unresolved files'))
|
|
4826
|
hint=('use --all to re-merge all unresolved files'))
|
|
|
4827
|
|
|
4827
|
|
|
|
4828
|
if confirm:
|
|
4828
|
if confirm:
|
|
|
4829
|
if all:
|
|
4829
|
if all:
|
|
|
4830
|
if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
|
|
4830
|
if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
|
|
|
4831
|
b'$$ &Yes $$ &No')):
|
|
4831
|
b'$$ &Yes $$ &No')):
|
|
|
4832
|
raise error.Abort(_('user quit'))
|
|
4832
|
raise error.Abort(_('user quit'))
|
|
|
4833
|
if mark and not pats:
|
|
4833
|
if mark and not pats:
|
|
|
4834
|
if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
|
|
4834
|
if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
|
|
|
4835
|
b'$$ &Yes $$ &No')):
|
|
4835
|
b'$$ &Yes $$ &No')):
|
|
|
4836
|
raise error.Abort(_('user quit'))
|
|
4836
|
raise error.Abort(_('user quit'))
|
|
|
4837
|
if unmark and not pats:
|
|
4837
|
if unmark and not pats:
|
|
|
4838
|
if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
|
|
4838
|
if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
|
|
|
4839
|
b'$$ &Yes $$ &No')):
|
|
4839
|
b'$$ &Yes $$ &No')):
|
|
|
4840
|
raise error.Abort(_('user quit'))
|
|
4840
|
raise error.Abort(_('user quit'))
|
|
|
4841
|
|
|
4841
|
|
|
|
4842
|
if show:
|
|
4842
|
if show:
|
|
|
4843
|
ui.pager('resolve')
|
|
4843
|
ui.pager('resolve')
|
|
|
4844
|
fm = ui.formatter('resolve', opts)
|
|
4844
|
fm = ui.formatter('resolve', opts)
|
|
|
4845
|
ms = mergemod.mergestate.read(repo)
|
|
4845
|
ms = mergemod.mergestate.read(repo)
|
|
|
4846
|
wctx = repo[None]
|
|
4846
|
wctx = repo[None]
|
|
|
4847
|
m = scmutil.match(wctx, pats, opts)
|
|
4847
|
m = scmutil.match(wctx, pats, opts)
|
|
|
4848
|
|
|
4848
|
|
|
|
4849
|
# Labels and keys based on merge state. Unresolved path conflicts show
|
|
4849
|
# Labels and keys based on merge state. Unresolved path conflicts show
|
|
|
4850
|
# as 'P'. Resolved path conflicts show as 'R', the same as normal
|
|
4850
|
# as 'P'. Resolved path conflicts show as 'R', the same as normal
|
|
|
4851
|
# resolved conflicts.
|
|
4851
|
# resolved conflicts.
|
|
|
4852
|
mergestateinfo = {
|
|
4852
|
mergestateinfo = {
|
|
|
4853
|
mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
|
|
4853
|
mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
|
|
|
4854
|
mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
|
|
4854
|
mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
|
|
|
4855
|
mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
|
|
4855
|
mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
|
|
|
4856
|
mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
|
|
4856
|
mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
|
|
|
4857
|
mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
|
|
4857
|
mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
|
|
|
4858
|
'D'),
|
|
4858
|
'D'),
|
|
|
4859
|
}
|
|
4859
|
}
|
|
|
4860
|
|
|
4860
|
|
|
|
4861
|
for f in ms:
|
|
4861
|
for f in ms:
|
|
|
4862
|
if not m(f):
|
|
4862
|
if not m(f):
|
|
|
4863
|
continue
|
|
4863
|
continue
|
|
|
4864
|
|
|
4864
|
|
|
|
4865
|
label, key = mergestateinfo[ms[f]]
|
|
4865
|
label, key = mergestateinfo[ms[f]]
|
|
|
4866
|
fm.startitem()
|
|
4866
|
fm.startitem()
|
|
|
4867
|
fm.context(ctx=wctx)
|
|
4867
|
fm.context(ctx=wctx)
|
|
|
4868
|
fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
|
|
4868
|
fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
|
|
|
4869
|
fm.write('path', '%s\n', f, label=label)
|
|
4869
|
fm.write('path', '%s\n', f, label=label)
|
|
|
4870
|
fm.end()
|
|
4870
|
fm.end()
|
|
|
4871
|
return 0
|
|
4871
|
return 0
|
|
|
4872
|
|
|
4872
|
|
|
|
4873
|
with repo.wlock():
|
|
4873
|
with repo.wlock():
|
|
|
4874
|
ms = mergemod.mergestate.read(repo)
|
|
4874
|
ms = mergemod.mergestate.read(repo)
|
|
|
4875
|
|
|
4875
|
|
|
|
4876
|
if not (ms.active() or repo.dirstate.p2() != nullid):
|
|
4876
|
if not (ms.active() or repo.dirstate.p2() != nullid):
|
|
|
4877
|
raise error.Abort(
|
|
4877
|
raise error.Abort(
|
|
|
4878
|
_('resolve command not applicable when not merging'))
|
|
4878
|
_('resolve command not applicable when not merging'))
|
|
|
4879
|
|
|
4879
|
|
|
|
4880
|
wctx = repo[None]
|
|
4880
|
wctx = repo[None]
|
|
|
4881
|
|
|
4881
|
|
|
|
4882
|
if (ms.mergedriver
|
|
4882
|
if (ms.mergedriver
|
|
|
4883
|
and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
|
|
4883
|
and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
|
|
|
4884
|
proceed = mergemod.driverpreprocess(repo, ms, wctx)
|
|
4884
|
proceed = mergemod.driverpreprocess(repo, ms, wctx)
|
|
|
4885
|
ms.commit()
|
|
4885
|
ms.commit()
|
|
|
4886
|
# allow mark and unmark to go through
|
|
4886
|
# allow mark and unmark to go through
|
|
|
4887
|
if not mark and not unmark and not proceed:
|
|
4887
|
if not mark and not unmark and not proceed:
|
|
|
4888
|
return 1
|
|
4888
|
return 1
|
|
|
4889
|
|
|
4889
|
|
|
|
4890
|
m = scmutil.match(wctx, pats, opts)
|
|
4890
|
m = scmutil.match(wctx, pats, opts)
|
|
|
4891
|
ret = 0
|
|
4891
|
ret = 0
|
|
|
4892
|
didwork = False
|
|
4892
|
didwork = False
|
|
|
4893
|
runconclude = False
|
|
4893
|
runconclude = False
|
|
|
4894
|
|
|
4894
|
|
|
|
4895
|
tocomplete = []
|
|
4895
|
tocomplete = []
|
|
|
4896
|
hasconflictmarkers = []
|
|
4896
|
hasconflictmarkers = []
|
|
|
4897
|
if mark:
|
|
4897
|
if mark:
|
|
|
4898
|
markcheck = ui.config('commands', 'resolve.mark-check')
|
|
4898
|
markcheck = ui.config('commands', 'resolve.mark-check')
|
|
|
4899
|
if markcheck not in ['warn', 'abort']:
|
|
4899
|
if markcheck not in ['warn', 'abort']:
|
|
|
4900
|
# Treat all invalid / unrecognized values as 'none'.
|
|
4900
|
# Treat all invalid / unrecognized values as 'none'.
|
|
|
4901
|
markcheck = False
|
|
4901
|
markcheck = False
|
|
|
4902
|
for f in ms:
|
|
4902
|
for f in ms:
|
|
|
4903
|
if not m(f):
|
|
4903
|
if not m(f):
|
|
|
4904
|
continue
|
|
4904
|
continue
|
|
|
4905
|
|
|
4905
|
|
|
|
4906
|
didwork = True
|
|
4906
|
didwork = True
|
|
|
4907
|
|
|
4907
|
|
|
|
4908
|
# don't let driver-resolved files be marked, and run the conclude
|
|
4908
|
# don't let driver-resolved files be marked, and run the conclude
|
|
|
4909
|
# step if asked to resolve
|
|
4909
|
# step if asked to resolve
|
|
|
4910
|
if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
|
|
4910
|
if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
|
|
|
4911
|
exact = m.exact(f)
|
|
4911
|
exact = m.exact(f)
|
|
|
4912
|
if mark:
|
|
4912
|
if mark:
|
|
|
4913
|
if exact:
|
|
4913
|
if exact:
|
|
|
4914
|
ui.warn(_('not marking %s as it is driver-resolved\n')
|
|
4914
|
ui.warn(_('not marking %s as it is driver-resolved\n')
|
|
|
4915
|
% f)
|
|
4915
|
% f)
|
|
|
4916
|
elif unmark:
|
|
4916
|
elif unmark:
|
|
|
4917
|
if exact:
|
|
4917
|
if exact:
|
|
|
4918
|
ui.warn(_('not unmarking %s as it is driver-resolved\n')
|
|
4918
|
ui.warn(_('not unmarking %s as it is driver-resolved\n')
|
|
|
4919
|
% f)
|
|
4919
|
% f)
|
|
|
4920
|
else:
|
|
4920
|
else:
|
|
|
4921
|
runconclude = True
|
|
4921
|
runconclude = True
|
|
|
4922
|
continue
|
|
4922
|
continue
|
|
|
4923
|
|
|
4923
|
|
|
|
4924
|
# path conflicts must be resolved manually
|
|
4924
|
# path conflicts must be resolved manually
|
|
|
4925
|
if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
|
|
4925
|
if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
|
|
|
4926
|
mergemod.MERGE_RECORD_RESOLVED_PATH):
|
|
4926
|
mergemod.MERGE_RECORD_RESOLVED_PATH):
|
|
|
4927
|
if mark:
|
|
4927
|
if mark:
|
|
|
4928
|
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
|
|
4928
|
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
|
|
|
4929
|
elif unmark:
|
|
4929
|
elif unmark:
|
|
|
4930
|
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
|
|
4930
|
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
|
|
|
4931
|
elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
|
|
4931
|
elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
|
|
|
4932
|
ui.warn(_('%s: path conflict must be resolved manually\n')
|
|
4932
|
ui.warn(_('%s: path conflict must be resolved manually\n')
|
|
|
4933
|
% f)
|
|
4933
|
% f)
|
|
|
4934
|
continue
|
|
4934
|
continue
|
|
|
4935
|
|
|
4935
|
|
|
|
4936
|
if mark:
|
|
4936
|
if mark:
|
|
|
4937
|
if markcheck:
|
|
4937
|
if markcheck:
|
|
|
4938
|
fdata = repo.wvfs.tryread(f)
|
|
4938
|
fdata = repo.wvfs.tryread(f)
|
|
|
4939
|
if filemerge.hasconflictmarkers(fdata) and \
|
|
4939
|
if filemerge.hasconflictmarkers(fdata) and \
|
|
|
4940
|
ms[f] != mergemod.MERGE_RECORD_RESOLVED:
|
|
4940
|
ms[f] != mergemod.MERGE_RECORD_RESOLVED:
|
|
|
4941
|
hasconflictmarkers.append(f)
|
|
4941
|
hasconflictmarkers.append(f)
|
|
|
4942
|
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
|
|
4942
|
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
|
|
|
4943
|
elif unmark:
|
|
4943
|
elif unmark:
|
|
|
4944
|
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
|
|
4944
|
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
|
|
|
4945
|
else:
|
|
4945
|
else:
|
|
|
4946
|
# backup pre-resolve (merge uses .orig for its own purposes)
|
|
4946
|
# backup pre-resolve (merge uses .orig for its own purposes)
|
|
|
4947
|
a = repo.wjoin(f)
|
|
4947
|
a = repo.wjoin(f)
|
|
|
4948
|
try:
|
|
4948
|
try:
|
|
|
4949
|
util.copyfile(a, a + ".resolve")
|
|
4949
|
util.copyfile(a, a + ".resolve")
|
|
|
4950
|
except (IOError, OSError) as inst:
|
|
4950
|
except (IOError, OSError) as inst:
|
|
|
4951
|
if inst.errno != errno.ENOENT:
|
|
4951
|
if inst.errno != errno.ENOENT:
|
|
|
4952
|
raise
|
|
4952
|
raise
|
|
|
4953
|
|
|
4953
|
|
|
|
4954
|
try:
|
|
4954
|
try:
|
|
|
4955
|
# preresolve file
|
|
4955
|
# preresolve file
|
|
|
4956
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
4956
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
4957
|
with ui.configoverride(overrides, 'resolve'):
|
|
4957
|
with ui.configoverride(overrides, 'resolve'):
|
|
|
4958
|
complete, r = ms.preresolve(f, wctx)
|
|
4958
|
complete, r = ms.preresolve(f, wctx)
|
|
|
4959
|
if not complete:
|
|
4959
|
if not complete:
|
|
|
4960
|
tocomplete.append(f)
|
|
4960
|
tocomplete.append(f)
|
|
|
4961
|
elif r:
|
|
4961
|
elif r:
|
|
|
4962
|
ret = 1
|
|
4962
|
ret = 1
|
|
|
4963
|
finally:
|
|
4963
|
finally:
|
|
|
4964
|
ms.commit()
|
|
4964
|
ms.commit()
|
|
|
4965
|
|
|
4965
|
|
|
|
4966
|
# replace filemerge's .orig file with our resolve file, but only
|
|
4966
|
# replace filemerge's .orig file with our resolve file, but only
|
|
|
4967
|
# for merges that are complete
|
|
4967
|
# for merges that are complete
|
|
|
4968
|
if complete:
|
|
4968
|
if complete:
|
|
|
4969
|
try:
|
|
4969
|
try:
|
|
|
4970
|
util.rename(a + ".resolve",
|
|
4970
|
util.rename(a + ".resolve",
|
|
|
4971
|
scmutil.origpath(ui, repo, a))
|
|
4971
|
scmutil.origpath(ui, repo, a))
|
|
|
4972
|
except OSError as inst:
|
|
4972
|
except OSError as inst:
|
|
|
4973
|
if inst.errno != errno.ENOENT:
|
|
4973
|
if inst.errno != errno.ENOENT:
|
|
|
4974
|
raise
|
|
4974
|
raise
|
|
|
4975
|
|
|
4975
|
|
|
|
4976
|
if hasconflictmarkers:
|
|
4976
|
if hasconflictmarkers:
|
|
|
4977
|
ui.warn(_('warning: the following files still have conflict '
|
|
4977
|
ui.warn(_('warning: the following files still have conflict '
|
|
|
4978
|
'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
|
|
4978
|
'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
|
|
|
4979
|
if markcheck == 'abort' and not all and not pats:
|
|
4979
|
if markcheck == 'abort' and not all and not pats:
|
|
|
4980
|
raise error.Abort(_('conflict markers detected'),
|
|
4980
|
raise error.Abort(_('conflict markers detected'),
|
|
|
4981
|
hint=_('use --all to mark anyway'))
|
|
4981
|
hint=_('use --all to mark anyway'))
|
|
|
4982
|
|
|
4982
|
|
|
|
4983
|
for f in tocomplete:
|
|
4983
|
for f in tocomplete:
|
|
|
4984
|
try:
|
|
4984
|
try:
|
|
|
4985
|
# resolve file
|
|
4985
|
# resolve file
|
|
|
4986
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
4986
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
4987
|
with ui.configoverride(overrides, 'resolve'):
|
|
4987
|
with ui.configoverride(overrides, 'resolve'):
|
|
|
4988
|
r = ms.resolve(f, wctx)
|
|
4988
|
r = ms.resolve(f, wctx)
|
|
|
4989
|
if r:
|
|
4989
|
if r:
|
|
|
4990
|
ret = 1
|
|
4990
|
ret = 1
|
|
|
4991
|
finally:
|
|
4991
|
finally:
|
|
|
4992
|
ms.commit()
|
|
4992
|
ms.commit()
|
|
|
4993
|
|
|
4993
|
|
|
|
4994
|
# replace filemerge's .orig file with our resolve file
|
|
4994
|
# replace filemerge's .orig file with our resolve file
|
|
|
4995
|
a = repo.wjoin(f)
|
|
4995
|
a = repo.wjoin(f)
|
|
|
4996
|
try:
|
|
4996
|
try:
|
|
|
4997
|
util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
|
|
4997
|
util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
|
|
|
4998
|
except OSError as inst:
|
|
4998
|
except OSError as inst:
|
|
|
4999
|
if inst.errno != errno.ENOENT:
|
|
4999
|
if inst.errno != errno.ENOENT:
|
|
|
5000
|
raise
|
|
5000
|
raise
|
|
|
5001
|
|
|
5001
|
|
|
|
5002
|
ms.commit()
|
|
5002
|
ms.commit()
|
|
|
5003
|
ms.recordactions()
|
|
5003
|
ms.recordactions()
|
|
|
5004
|
|
|
5004
|
|
|
|
5005
|
if not didwork and pats:
|
|
5005
|
if not didwork and pats:
|
|
|
5006
|
hint = None
|
|
5006
|
hint = None
|
|
|
5007
|
if not any([p for p in pats if p.find(':') >= 0]):
|
|
5007
|
if not any([p for p in pats if p.find(':') >= 0]):
|
|
|
5008
|
pats = ['path:%s' % p for p in pats]
|
|
5008
|
pats = ['path:%s' % p for p in pats]
|
|
|
5009
|
m = scmutil.match(wctx, pats, opts)
|
|
5009
|
m = scmutil.match(wctx, pats, opts)
|
|
|
5010
|
for f in ms:
|
|
5010
|
for f in ms:
|
|
|
5011
|
if not m(f):
|
|
5011
|
if not m(f):
|
|
|
5012
|
continue
|
|
5012
|
continue
|
|
|
5013
|
def flag(o):
|
|
5013
|
def flag(o):
|
|
|
5014
|
if o == 're_merge':
|
|
5014
|
if o == 're_merge':
|
|
|
5015
|
return '--re-merge '
|
|
5015
|
return '--re-merge '
|
|
|
5016
|
return '-%s ' % o[0:1]
|
|
5016
|
return '-%s ' % o[0:1]
|
|
|
5017
|
flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
|
|
5017
|
flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
|
|
|
5018
|
hint = _("(try: hg resolve %s%s)\n") % (
|
|
5018
|
hint = _("(try: hg resolve %s%s)\n") % (
|
|
|
5019
|
flags,
|
|
5019
|
flags,
|
|
|
5020
|
' '.join(pats))
|
|
5020
|
' '.join(pats))
|
|
|
5021
|
break
|
|
5021
|
break
|
|
|
5022
|
ui.warn(_("arguments do not match paths that need resolving\n"))
|
|
5022
|
ui.warn(_("arguments do not match paths that need resolving\n"))
|
|
|
5023
|
if hint:
|
|
5023
|
if hint:
|
|
|
5024
|
ui.warn(hint)
|
|
5024
|
ui.warn(hint)
|
|
|
5025
|
elif ms.mergedriver and ms.mdstate() != 's':
|
|
5025
|
elif ms.mergedriver and ms.mdstate() != 's':
|
|
|
5026
|
# run conclude step when either a driver-resolved file is requested
|
|
5026
|
# run conclude step when either a driver-resolved file is requested
|
|
|
5027
|
# or there are no driver-resolved files
|
|
5027
|
# or there are no driver-resolved files
|
|
|
5028
|
# we can't use 'ret' to determine whether any files are unresolved
|
|
5028
|
# we can't use 'ret' to determine whether any files are unresolved
|
|
|
5029
|
# because we might not have tried to resolve some
|
|
5029
|
# because we might not have tried to resolve some
|
|
|
5030
|
if ((runconclude or not list(ms.driverresolved()))
|
|
5030
|
if ((runconclude or not list(ms.driverresolved()))
|
|
|
5031
|
and not list(ms.unresolved())):
|
|
5031
|
and not list(ms.unresolved())):
|
|
|
5032
|
proceed = mergemod.driverconclude(repo, ms, wctx)
|
|
5032
|
proceed = mergemod.driverconclude(repo, ms, wctx)
|
|
|
5033
|
ms.commit()
|
|
5033
|
ms.commit()
|
|
|
5034
|
if not proceed:
|
|
5034
|
if not proceed:
|
|
|
5035
|
return 1
|
|
5035
|
return 1
|
|
|
5036
|
|
|
5036
|
|
|
|
5037
|
# Nudge users into finishing an unfinished operation
|
|
5037
|
# Nudge users into finishing an unfinished operation
|
|
|
5038
|
unresolvedf = list(ms.unresolved())
|
|
5038
|
unresolvedf = list(ms.unresolved())
|
|
|
5039
|
driverresolvedf = list(ms.driverresolved())
|
|
5039
|
driverresolvedf = list(ms.driverresolved())
|
|
|
5040
|
if not unresolvedf and not driverresolvedf:
|
|
5040
|
if not unresolvedf and not driverresolvedf:
|
|
|
5041
|
ui.status(_('(no more unresolved files)\n'))
|
|
5041
|
ui.status(_('(no more unresolved files)\n'))
|
|
|
5042
|
cmdutil.checkafterresolved(repo)
|
|
5042
|
cmdutil.checkafterresolved(repo)
|
|
|
5043
|
elif not unresolvedf:
|
|
5043
|
elif not unresolvedf:
|
|
|
5044
|
ui.status(_('(no more unresolved files -- '
|
|
5044
|
ui.status(_('(no more unresolved files -- '
|
|
|
5045
|
'run "hg resolve --all" to conclude)\n'))
|
|
5045
|
'run "hg resolve --all" to conclude)\n'))
|
|
|
5046
|
|
|
5046
|
|
|
|
5047
|
return ret
|
|
5047
|
return ret
|
|
|
5048
|
|
|
5048
|
|
|
|
5049
|
@command('revert',
|
|
5049
|
@command('revert',
|
|
|
5050
|
[('a', 'all', None, _('revert all changes when no arguments given')),
|
|
5050
|
[('a', 'all', None, _('revert all changes when no arguments given')),
|
|
|
5051
|
('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
|
|
5051
|
('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
|
|
|
5052
|
('r', 'rev', '', _('revert to the specified revision'), _('REV')),
|
|
5052
|
('r', 'rev', '', _('revert to the specified revision'), _('REV')),
|
|
|
5053
|
('C', 'no-backup', None, _('do not save backup copies of files')),
|
|
5053
|
('C', 'no-backup', None, _('do not save backup copies of files')),
|
|
|
5054
|
('i', 'interactive', None, _('interactively select the changes')),
|
|
5054
|
('i', 'interactive', None, _('interactively select the changes')),
|
|
|
5055
|
] + walkopts + dryrunopts,
|
|
5055
|
] + walkopts + dryrunopts,
|
|
|
5056
|
_('[OPTION]... [-r REV] [NAME]...'),
|
|
5056
|
_('[OPTION]... [-r REV] [NAME]...'),
|
|
|
5057
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
5057
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
5058
|
def revert(ui, repo, *pats, **opts):
|
|
5058
|
def revert(ui, repo, *pats, **opts):
|
|
|
5059
|
"""restore files to their checkout state
|
|
5059
|
"""restore files to their checkout state
|
|
|
5060
|
|
|
5060
|
|
|
|
5061
|
.. note::
|
|
5061
|
.. note::
|
|
|
5062
|
|
|
5062
|
|
|
|
5063
|
To check out earlier revisions, you should use :hg:`update REV`.
|
|
5063
|
To check out earlier revisions, you should use :hg:`update REV`.
|
|
|
5064
|
To cancel an uncommitted merge (and lose your changes),
|
|
5064
|
To cancel an uncommitted merge (and lose your changes),
|
|
|
5065
|
use :hg:`merge --abort`.
|
|
5065
|
use :hg:`merge --abort`.
|
|
|
5066
|
|
|
5066
|
|
|
|
5067
|
With no revision specified, revert the specified files or directories
|
|
5067
|
With no revision specified, revert the specified files or directories
|
|
|
5068
|
to the contents they had in the parent of the working directory.
|
|
5068
|
to the contents they had in the parent of the working directory.
|
|
|
5069
|
This restores the contents of files to an unmodified
|
|
5069
|
This restores the contents of files to an unmodified
|
|
|
5070
|
state and unschedules adds, removes, copies, and renames. If the
|
|
5070
|
state and unschedules adds, removes, copies, and renames. If the
|
|
|
5071
|
working directory has two parents, you must explicitly specify a
|
|
5071
|
working directory has two parents, you must explicitly specify a
|
|
|
5072
|
revision.
|
|
5072
|
revision.
|
|
|
5073
|
|
|
5073
|
|
|
|
5074
|
Using the -r/--rev or -d/--date options, revert the given files or
|
|
5074
|
Using the -r/--rev or -d/--date options, revert the given files or
|
|
|
5075
|
directories to their states as of a specific revision. Because
|
|
5075
|
directories to their states as of a specific revision. Because
|
|
|
5076
|
revert does not change the working directory parents, this will
|
|
5076
|
revert does not change the working directory parents, this will
|
|
|
5077
|
cause these files to appear modified. This can be helpful to "back
|
|
5077
|
cause these files to appear modified. This can be helpful to "back
|
|
|
5078
|
out" some or all of an earlier change. See :hg:`backout` for a
|
|
5078
|
out" some or all of an earlier change. See :hg:`backout` for a
|
|
|
5079
|
related method.
|
|
5079
|
related method.
|
|
|
5080
|
|
|
5080
|
|
|
|
5081
|
Modified files are saved with a .orig suffix before reverting.
|
|
5081
|
Modified files are saved with a .orig suffix before reverting.
|
|
|
5082
|
To disable these backups, use --no-backup. It is possible to store
|
|
5082
|
To disable these backups, use --no-backup. It is possible to store
|
|
|
5083
|
the backup files in a custom directory relative to the root of the
|
|
5083
|
the backup files in a custom directory relative to the root of the
|
|
|
5084
|
repository by setting the ``ui.origbackuppath`` configuration
|
|
5084
|
repository by setting the ``ui.origbackuppath`` configuration
|
|
|
5085
|
option.
|
|
5085
|
option.
|
|
|
5086
|
|
|
5086
|
|
|
|
5087
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
5087
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
5088
|
|
|
5088
|
|
|
|
5089
|
See :hg:`help backout` for a way to reverse the effect of an
|
|
5089
|
See :hg:`help backout` for a way to reverse the effect of an
|
|
|
5090
|
earlier changeset.
|
|
5090
|
earlier changeset.
|
|
|
5091
|
|
|
5091
|
|
|
|
5092
|
Returns 0 on success.
|
|
5092
|
Returns 0 on success.
|
|
|
5093
|
"""
|
|
5093
|
"""
|
|
|
5094
|
|
|
5094
|
|
|
|
5095
|
opts = pycompat.byteskwargs(opts)
|
|
5095
|
opts = pycompat.byteskwargs(opts)
|
|
|
5096
|
if opts.get("date"):
|
|
5096
|
if opts.get("date"):
|
|
|
5097
|
if opts.get("rev"):
|
|
5097
|
if opts.get("rev"):
|
|
|
5098
|
raise error.Abort(_("you can't specify a revision and a date"))
|
|
5098
|
raise error.Abort(_("you can't specify a revision and a date"))
|
|
|
5099
|
opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
|
|
5099
|
opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
|
|
|
5100
|
|
|
5100
|
|
|
|
5101
|
parent, p2 = repo.dirstate.parents()
|
|
5101
|
parent, p2 = repo.dirstate.parents()
|
|
|
5102
|
if not opts.get('rev') and p2 != nullid:
|
|
5102
|
if not opts.get('rev') and p2 != nullid:
|
|
|
5103
|
# revert after merge is a trap for new users (issue2915)
|
|
5103
|
# revert after merge is a trap for new users (issue2915)
|
|
|
5104
|
raise error.Abort(_('uncommitted merge with no revision specified'),
|
|
5104
|
raise error.Abort(_('uncommitted merge with no revision specified'),
|
|
|
5105
|
hint=_("use 'hg update' or see 'hg help revert'"))
|
|
5105
|
hint=_("use 'hg update' or see 'hg help revert'"))
|
|
|
5106
|
|
|
5106
|
|
|
|
5107
|
rev = opts.get('rev')
|
|
5107
|
rev = opts.get('rev')
|
|
|
5108
|
if rev:
|
|
5108
|
if rev:
|
|
|
5109
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
5109
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
5110
|
ctx = scmutil.revsingle(repo, rev)
|
|
5110
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
5111
|
|
|
5111
|
|
|
|
5112
|
if (not (pats or opts.get('include') or opts.get('exclude') or
|
|
5112
|
if (not (pats or opts.get('include') or opts.get('exclude') or
|
|
|
5113
|
opts.get('all') or opts.get('interactive'))):
|
|
5113
|
opts.get('all') or opts.get('interactive'))):
|
|
|
5114
|
msg = _("no files or directories specified")
|
|
5114
|
msg = _("no files or directories specified")
|
|
|
5115
|
if p2 != nullid:
|
|
5115
|
if p2 != nullid:
|
|
|
5116
|
hint = _("uncommitted merge, use --all to discard all changes,"
|
|
5116
|
hint = _("uncommitted merge, use --all to discard all changes,"
|
|
|
5117
|
" or 'hg update -C .' to abort the merge")
|
|
5117
|
" or 'hg update -C .' to abort the merge")
|
|
|
5118
|
raise error.Abort(msg, hint=hint)
|
|
5118
|
raise error.Abort(msg, hint=hint)
|
|
|
5119
|
dirty = any(repo.status())
|
|
5119
|
dirty = any(repo.status())
|
|
|
5120
|
node = ctx.node()
|
|
5120
|
node = ctx.node()
|
|
|
5121
|
if node != parent:
|
|
5121
|
if node != parent:
|
|
|
5122
|
if dirty:
|
|
5122
|
if dirty:
|
|
|
5123
|
hint = _("uncommitted changes, use --all to discard all"
|
|
5123
|
hint = _("uncommitted changes, use --all to discard all"
|
|
|
5124
|
" changes, or 'hg update %d' to update") % ctx.rev()
|
|
5124
|
" changes, or 'hg update %d' to update") % ctx.rev()
|
|
|
5125
|
else:
|
|
5125
|
else:
|
|
|
5126
|
hint = _("use --all to revert all files,"
|
|
5126
|
hint = _("use --all to revert all files,"
|
|
|
5127
|
" or 'hg update %d' to update") % ctx.rev()
|
|
5127
|
" or 'hg update %d' to update") % ctx.rev()
|
|
|
5128
|
elif dirty:
|
|
5128
|
elif dirty:
|
|
|
5129
|
hint = _("uncommitted changes, use --all to discard all changes")
|
|
5129
|
hint = _("uncommitted changes, use --all to discard all changes")
|
|
|
5130
|
else:
|
|
5130
|
else:
|
|
|
5131
|
hint = _("use --all to revert all files")
|
|
5131
|
hint = _("use --all to revert all files")
|
|
|
5132
|
raise error.Abort(msg, hint=hint)
|
|
5132
|
raise error.Abort(msg, hint=hint)
|
|
|
5133
|
|
|
5133
|
|
|
|
5134
|
return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
|
|
5134
|
return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
|
|
|
5135
|
**pycompat.strkwargs(opts))
|
|
5135
|
**pycompat.strkwargs(opts))
|
|
|
5136
|
|
|
5136
|
|
|
|
5137
|
@command(
|
|
5137
|
@command(
|
|
|
5138
|
'rollback',
|
|
5138
|
'rollback',
|
|
|
5139
|
dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
|
|
5139
|
dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
|
|
|
5140
|
helpcategory=command.CATEGORY_MAINTENANCE)
|
|
5140
|
helpcategory=command.CATEGORY_MAINTENANCE)
|
|
|
5141
|
def rollback(ui, repo, **opts):
|
|
5141
|
def rollback(ui, repo, **opts):
|
|
|
5142
|
"""roll back the last transaction (DANGEROUS) (DEPRECATED)
|
|
5142
|
"""roll back the last transaction (DANGEROUS) (DEPRECATED)
|
|
|
5143
|
|
|
5143
|
|
|
|
5144
|
Please use :hg:`commit --amend` instead of rollback to correct
|
|
5144
|
Please use :hg:`commit --amend` instead of rollback to correct
|
|
|
5145
|
mistakes in the last commit.
|
|
5145
|
mistakes in the last commit.
|
|
|
5146
|
|
|
5146
|
|
|
|
5147
|
This command should be used with care. There is only one level of
|
|
5147
|
This command should be used with care. There is only one level of
|
|
|
5148
|
rollback, and there is no way to undo a rollback. It will also
|
|
5148
|
rollback, and there is no way to undo a rollback. It will also
|
|
|
5149
|
restore the dirstate at the time of the last transaction, losing
|
|
5149
|
restore the dirstate at the time of the last transaction, losing
|
|
|
5150
|
any dirstate changes since that time. This command does not alter
|
|
5150
|
any dirstate changes since that time. This command does not alter
|
|
|
5151
|
the working directory.
|
|
5151
|
the working directory.
|
|
|
5152
|
|
|
5152
|
|
|
|
5153
|
Transactions are used to encapsulate the effects of all commands
|
|
5153
|
Transactions are used to encapsulate the effects of all commands
|
|
|
5154
|
that create new changesets or propagate existing changesets into a
|
|
5154
|
that create new changesets or propagate existing changesets into a
|
|
|
5155
|
repository.
|
|
5155
|
repository.
|
|
|
5156
|
|
|
5156
|
|
|
|
5157
|
.. container:: verbose
|
|
5157
|
.. container:: verbose
|
|
|
5158
|
|
|
5158
|
|
|
|
5159
|
For example, the following commands are transactional, and their
|
|
5159
|
For example, the following commands are transactional, and their
|
|
|
5160
|
effects can be rolled back:
|
|
5160
|
effects can be rolled back:
|
|
|
5161
|
|
|
5161
|
|
|
|
5162
|
- commit
|
|
5162
|
- commit
|
|
|
5163
|
- import
|
|
5163
|
- import
|
|
|
5164
|
- pull
|
|
5164
|
- pull
|
|
|
5165
|
- push (with this repository as the destination)
|
|
5165
|
- push (with this repository as the destination)
|
|
|
5166
|
- unbundle
|
|
5166
|
- unbundle
|
|
|
5167
|
|
|
5167
|
|
|
|
5168
|
To avoid permanent data loss, rollback will refuse to rollback a
|
|
5168
|
To avoid permanent data loss, rollback will refuse to rollback a
|
|
|
5169
|
commit transaction if it isn't checked out. Use --force to
|
|
5169
|
commit transaction if it isn't checked out. Use --force to
|
|
|
5170
|
override this protection.
|
|
5170
|
override this protection.
|
|
|
5171
|
|
|
5171
|
|
|
|
5172
|
The rollback command can be entirely disabled by setting the
|
|
5172
|
The rollback command can be entirely disabled by setting the
|
|
|
5173
|
``ui.rollback`` configuration setting to false. If you're here
|
|
5173
|
``ui.rollback`` configuration setting to false. If you're here
|
|
|
5174
|
because you want to use rollback and it's disabled, you can
|
|
5174
|
because you want to use rollback and it's disabled, you can
|
|
|
5175
|
re-enable the command by setting ``ui.rollback`` to true.
|
|
5175
|
re-enable the command by setting ``ui.rollback`` to true.
|
|
|
5176
|
|
|
5176
|
|
|
|
5177
|
This command is not intended for use on public repositories. Once
|
|
5177
|
This command is not intended for use on public repositories. Once
|
|
|
5178
|
changes are visible for pull by other users, rolling a transaction
|
|
5178
|
changes are visible for pull by other users, rolling a transaction
|
|
|
5179
|
back locally is ineffective (someone else may already have pulled
|
|
5179
|
back locally is ineffective (someone else may already have pulled
|
|
|
5180
|
the changes). Furthermore, a race is possible with readers of the
|
|
5180
|
the changes). Furthermore, a race is possible with readers of the
|
|
|
5181
|
repository; for example an in-progress pull from the repository
|
|
5181
|
repository; for example an in-progress pull from the repository
|
|
|
5182
|
may fail if a rollback is performed.
|
|
5182
|
may fail if a rollback is performed.
|
|
|
5183
|
|
|
5183
|
|
|
|
5184
|
Returns 0 on success, 1 if no rollback data is available.
|
|
5184
|
Returns 0 on success, 1 if no rollback data is available.
|
|
|
5185
|
"""
|
|
5185
|
"""
|
|
|
5186
|
if not ui.configbool('ui', 'rollback'):
|
|
5186
|
if not ui.configbool('ui', 'rollback'):
|
|
|
5187
|
raise error.Abort(_('rollback is disabled because it is unsafe'),
|
|
5187
|
raise error.Abort(_('rollback is disabled because it is unsafe'),
|
|
|
5188
|
hint=('see `hg help -v rollback` for information'))
|
|
5188
|
hint=('see `hg help -v rollback` for information'))
|
|
|
5189
|
return repo.rollback(dryrun=opts.get(r'dry_run'),
|
|
5189
|
return repo.rollback(dryrun=opts.get(r'dry_run'),
|
|
|
5190
|
force=opts.get(r'force'))
|
|
5190
|
force=opts.get(r'force'))
|
|
|
5191
|
|
|
5191
|
|
|
|
5192
|
@command(
|
|
5192
|
@command(
|
|
|
5193
|
'root', [], intents={INTENT_READONLY},
|
|
5193
|
'root', [], intents={INTENT_READONLY},
|
|
|
5194
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
5194
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
5195
|
def root(ui, repo):
|
|
5195
|
def root(ui, repo):
|
|
|
5196
|
"""print the root (top) of the current working directory
|
|
5196
|
"""print the root (top) of the current working directory
|
|
|
5197
|
|
|
5197
|
|
|
|
5198
|
Print the root directory of the current repository.
|
|
5198
|
Print the root directory of the current repository.
|
|
|
5199
|
|
|
5199
|
|
|
|
5200
|
Returns 0 on success.
|
|
5200
|
Returns 0 on success.
|
|
|
5201
|
"""
|
|
5201
|
"""
|
|
|
5202
|
ui.write(repo.root + "\n")
|
|
5202
|
ui.write(repo.root + "\n")
|
|
|
5203
|
|
|
5203
|
|
|
|
5204
|
@command('serve',
|
|
5204
|
@command('serve',
|
|
|
5205
|
[('A', 'accesslog', '', _('name of access log file to write to'),
|
|
5205
|
[('A', 'accesslog', '', _('name of access log file to write to'),
|
|
|
5206
|
_('FILE')),
|
|
5206
|
_('FILE')),
|
|
|
5207
|
('d', 'daemon', None, _('run server in background')),
|
|
5207
|
('d', 'daemon', None, _('run server in background')),
|
|
|
5208
|
('', 'daemon-postexec', [], _('used internally by daemon mode')),
|
|
5208
|
('', 'daemon-postexec', [], _('used internally by daemon mode')),
|
|
|
5209
|
('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
|
|
5209
|
('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
|
|
|
5210
|
# use string type, then we can check if something was passed
|
|
5210
|
# use string type, then we can check if something was passed
|
|
|
5211
|
('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
|
|
5211
|
('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
|
|
|
5212
|
('a', 'address', '', _('address to listen on (default: all interfaces)'),
|
|
5212
|
('a', 'address', '', _('address to listen on (default: all interfaces)'),
|
|
|
5213
|
_('ADDR')),
|
|
5213
|
_('ADDR')),
|
|
|
5214
|
('', 'prefix', '', _('prefix path to serve from (default: server root)'),
|
|
5214
|
('', 'prefix', '', _('prefix path to serve from (default: server root)'),
|
|
|
5215
|
_('PREFIX')),
|
|
5215
|
_('PREFIX')),
|
|
|
5216
|
('n', 'name', '',
|
|
5216
|
('n', 'name', '',
|
|
|
5217
|
_('name to show in web pages (default: working directory)'), _('NAME')),
|
|
5217
|
_('name to show in web pages (default: working directory)'), _('NAME')),
|
|
|
5218
|
('', 'web-conf', '',
|
|
5218
|
('', 'web-conf', '',
|
|
|
5219
|
_("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
|
|
5219
|
_("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
|
|
|
5220
|
('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
|
|
5220
|
('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
|
|
|
5221
|
_('FILE')),
|
|
5221
|
_('FILE')),
|
|
|
5222
|
('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
|
|
5222
|
('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
|
|
|
5223
|
('', 'stdio', None, _('for remote clients (ADVANCED)')),
|
|
5223
|
('', 'stdio', None, _('for remote clients (ADVANCED)')),
|
|
|
5224
|
('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
|
|
5224
|
('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
|
|
|
5225
|
('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
|
|
5225
|
('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
|
|
|
5226
|
('', 'style', '', _('template style to use'), _('STYLE')),
|
|
5226
|
('', 'style', '', _('template style to use'), _('STYLE')),
|
|
|
5227
|
('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
|
|
5227
|
('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
|
|
|
5228
|
('', 'certificate', '', _('SSL certificate file'), _('FILE')),
|
|
5228
|
('', 'certificate', '', _('SSL certificate file'), _('FILE')),
|
|
|
5229
|
('', 'print-url', None, _('start and print only the URL'))]
|
|
5229
|
('', 'print-url', None, _('start and print only the URL'))]
|
|
|
5230
|
+ subrepoopts,
|
|
5230
|
+ subrepoopts,
|
|
|
5231
|
_('[OPTION]...'),
|
|
5231
|
_('[OPTION]...'),
|
|
|
5232
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
5232
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
5233
|
helpbasic=True, optionalrepo=True)
|
|
5233
|
helpbasic=True, optionalrepo=True)
|
|
|
5234
|
def serve(ui, repo, **opts):
|
|
5234
|
def serve(ui, repo, **opts):
|
|
|
5235
|
"""start stand-alone webserver
|
|
5235
|
"""start stand-alone webserver
|
|
|
5236
|
|
|
5236
|
|
|
|
5237
|
Start a local HTTP repository browser and pull server. You can use
|
|
5237
|
Start a local HTTP repository browser and pull server. You can use
|
|
|
5238
|
this for ad-hoc sharing and browsing of repositories. It is
|
|
5238
|
this for ad-hoc sharing and browsing of repositories. It is
|
|
|
5239
|
recommended to use a real web server to serve a repository for
|
|
5239
|
recommended to use a real web server to serve a repository for
|
|
|
5240
|
longer periods of time.
|
|
5240
|
longer periods of time.
|
|
|
5241
|
|
|
5241
|
|
|
|
5242
|
Please note that the server does not implement access control.
|
|
5242
|
Please note that the server does not implement access control.
|
|
|
5243
|
This means that, by default, anybody can read from the server and
|
|
5243
|
This means that, by default, anybody can read from the server and
|
|
|
5244
|
nobody can write to it by default. Set the ``web.allow-push``
|
|
5244
|
nobody can write to it by default. Set the ``web.allow-push``
|
|
|
5245
|
option to ``*`` to allow everybody to push to the server. You
|
|
5245
|
option to ``*`` to allow everybody to push to the server. You
|
|
|
5246
|
should use a real web server if you need to authenticate users.
|
|
5246
|
should use a real web server if you need to authenticate users.
|
|
|
5247
|
|
|
5247
|
|
|
|
5248
|
By default, the server logs accesses to stdout and errors to
|
|
5248
|
By default, the server logs accesses to stdout and errors to
|
|
|
5249
|
stderr. Use the -A/--accesslog and -E/--errorlog options to log to
|
|
5249
|
stderr. Use the -A/--accesslog and -E/--errorlog options to log to
|
|
|
5250
|
files.
|
|
5250
|
files.
|
|
|
5251
|
|
|
5251
|
|
|
|
5252
|
To have the server choose a free port number to listen on, specify
|
|
5252
|
To have the server choose a free port number to listen on, specify
|
|
|
5253
|
a port number of 0; in this case, the server will print the port
|
|
5253
|
a port number of 0; in this case, the server will print the port
|
|
|
5254
|
number it uses.
|
|
5254
|
number it uses.
|
|
|
5255
|
|
|
5255
|
|
|
|
5256
|
Returns 0 on success.
|
|
5256
|
Returns 0 on success.
|
|
|
5257
|
"""
|
|
5257
|
"""
|
|
|
5258
|
|
|
5258
|
|
|
|
5259
|
opts = pycompat.byteskwargs(opts)
|
|
5259
|
opts = pycompat.byteskwargs(opts)
|
|
|
5260
|
if opts["stdio"] and opts["cmdserver"]:
|
|
5260
|
if opts["stdio"] and opts["cmdserver"]:
|
|
|
5261
|
raise error.Abort(_("cannot use --stdio with --cmdserver"))
|
|
5261
|
raise error.Abort(_("cannot use --stdio with --cmdserver"))
|
|
|
5262
|
if opts["print_url"] and ui.verbose:
|
|
5262
|
if opts["print_url"] and ui.verbose:
|
|
|
5263
|
raise error.Abort(_("cannot use --print-url with --verbose"))
|
|
5263
|
raise error.Abort(_("cannot use --print-url with --verbose"))
|
|
|
5264
|
|
|
5264
|
|
|
|
5265
|
if opts["stdio"]:
|
|
5265
|
if opts["stdio"]:
|
|
|
5266
|
if repo is None:
|
|
5266
|
if repo is None:
|
|
|
5267
|
raise error.RepoError(_("there is no Mercurial repository here"
|
|
5267
|
raise error.RepoError(_("there is no Mercurial repository here"
|
|
|
5268
|
" (.hg not found)"))
|
|
5268
|
" (.hg not found)"))
|
|
|
5269
|
s = wireprotoserver.sshserver(ui, repo)
|
|
5269
|
s = wireprotoserver.sshserver(ui, repo)
|
|
|
5270
|
s.serve_forever()
|
|
5270
|
s.serve_forever()
|
|
|
5271
|
|
|
5271
|
|
|
|
5272
|
service = server.createservice(ui, repo, opts)
|
|
5272
|
service = server.createservice(ui, repo, opts)
|
|
|
5273
|
return server.runservice(opts, initfn=service.init, runfn=service.run)
|
|
5273
|
return server.runservice(opts, initfn=service.init, runfn=service.run)
|
|
|
5274
|
|
|
5274
|
|
|
|
5275
|
_NOTTERSE = 'nothing'
|
|
5275
|
_NOTTERSE = 'nothing'
|
|
|
5276
|
|
|
5276
|
|
|
|
5277
|
@command('status|st',
|
|
5277
|
@command('status|st',
|
|
|
5278
|
[('A', 'all', None, _('show status of all files')),
|
|
5278
|
[('A', 'all', None, _('show status of all files')),
|
|
|
5279
|
('m', 'modified', None, _('show only modified files')),
|
|
5279
|
('m', 'modified', None, _('show only modified files')),
|
|
|
5280
|
('a', 'added', None, _('show only added files')),
|
|
5280
|
('a', 'added', None, _('show only added files')),
|
|
|
5281
|
('r', 'removed', None, _('show only removed files')),
|
|
5281
|
('r', 'removed', None, _('show only removed files')),
|
|
|
5282
|
('d', 'deleted', None, _('show only deleted (but tracked) files')),
|
|
5282
|
('d', 'deleted', None, _('show only deleted (but tracked) files')),
|
|
|
5283
|
('c', 'clean', None, _('show only files without changes')),
|
|
5283
|
('c', 'clean', None, _('show only files without changes')),
|
|
|
5284
|
('u', 'unknown', None, _('show only unknown (not tracked) files')),
|
|
5284
|
('u', 'unknown', None, _('show only unknown (not tracked) files')),
|
|
|
5285
|
('i', 'ignored', None, _('show only ignored files')),
|
|
5285
|
('i', 'ignored', None, _('show only ignored files')),
|
|
|
5286
|
('n', 'no-status', None, _('hide status prefix')),
|
|
5286
|
('n', 'no-status', None, _('hide status prefix')),
|
|
|
5287
|
('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
|
|
5287
|
('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
|
|
|
5288
|
('C', 'copies', None, _('show source of copied files')),
|
|
5288
|
('C', 'copies', None, _('show source of copied files')),
|
|
|
5289
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
5289
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
|
5290
|
('', 'rev', [], _('show difference from revision'), _('REV')),
|
|
5290
|
('', 'rev', [], _('show difference from revision'), _('REV')),
|
|
|
5291
|
('', 'change', '', _('list the changed files of a revision'), _('REV')),
|
|
5291
|
('', 'change', '', _('list the changed files of a revision'), _('REV')),
|
|
|
5292
|
] + walkopts + subrepoopts + formatteropts,
|
|
5292
|
] + walkopts + subrepoopts + formatteropts,
|
|
|
5293
|
_('[OPTION]... [FILE]...'),
|
|
5293
|
_('[OPTION]... [FILE]...'),
|
|
|
5294
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
5294
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
5295
|
helpbasic=True, inferrepo=True,
|
|
5295
|
helpbasic=True, inferrepo=True,
|
|
|
5296
|
intents={INTENT_READONLY})
|
|
5296
|
intents={INTENT_READONLY})
|
|
|
5297
|
def status(ui, repo, *pats, **opts):
|
|
5297
|
def status(ui, repo, *pats, **opts):
|
|
|
5298
|
"""show changed files in the working directory
|
|
5298
|
"""show changed files in the working directory
|
|
|
5299
|
|
|
5299
|
|
|
|
5300
|
Show status of files in the repository. If names are given, only
|
|
5300
|
Show status of files in the repository. If names are given, only
|
|
|
5301
|
files that match are shown. Files that are clean or ignored or
|
|
5301
|
files that match are shown. Files that are clean or ignored or
|
|
|
5302
|
the source of a copy/move operation, are not listed unless
|
|
5302
|
the source of a copy/move operation, are not listed unless
|
|
|
5303
|
-c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
|
|
5303
|
-c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
|
|
|
5304
|
Unless options described with "show only ..." are given, the
|
|
5304
|
Unless options described with "show only ..." are given, the
|
|
|
5305
|
options -mardu are used.
|
|
5305
|
options -mardu are used.
|
|
|
5306
|
|
|
5306
|
|
|
|
5307
|
Option -q/--quiet hides untracked (unknown and ignored) files
|
|
5307
|
Option -q/--quiet hides untracked (unknown and ignored) files
|
|
|
5308
|
unless explicitly requested with -u/--unknown or -i/--ignored.
|
|
5308
|
unless explicitly requested with -u/--unknown or -i/--ignored.
|
|
|
5309
|
|
|
5309
|
|
|
|
5310
|
.. note::
|
|
5310
|
.. note::
|
|
|
5311
|
|
|
5311
|
|
|
|
5312
|
:hg:`status` may appear to disagree with diff if permissions have
|
|
5312
|
:hg:`status` may appear to disagree with diff if permissions have
|
|
|
5313
|
changed or a merge has occurred. The standard diff format does
|
|
5313
|
changed or a merge has occurred. The standard diff format does
|
|
|
5314
|
not report permission changes and diff only reports changes
|
|
5314
|
not report permission changes and diff only reports changes
|
|
|
5315
|
relative to one merge parent.
|
|
5315
|
relative to one merge parent.
|
|
|
5316
|
|
|
5316
|
|
|
|
5317
|
If one revision is given, it is used as the base revision.
|
|
5317
|
If one revision is given, it is used as the base revision.
|
|
|
5318
|
If two revisions are given, the differences between them are
|
|
5318
|
If two revisions are given, the differences between them are
|
|
|
5319
|
shown. The --change option can also be used as a shortcut to list
|
|
5319
|
shown. The --change option can also be used as a shortcut to list
|
|
|
5320
|
the changed files of a revision from its first parent.
|
|
5320
|
the changed files of a revision from its first parent.
|
|
|
5321
|
|
|
5321
|
|
|
|
5322
|
The codes used to show the status of files are::
|
|
5322
|
The codes used to show the status of files are::
|
|
|
5323
|
|
|
5323
|
|
|
|
5324
|
M = modified
|
|
5324
|
M = modified
|
|
|
5325
|
A = added
|
|
5325
|
A = added
|
|
|
5326
|
R = removed
|
|
5326
|
R = removed
|
|
|
5327
|
C = clean
|
|
5327
|
C = clean
|
|
|
5328
|
! = missing (deleted by non-hg command, but still tracked)
|
|
5328
|
! = missing (deleted by non-hg command, but still tracked)
|
|
|
5329
|
? = not tracked
|
|
5329
|
? = not tracked
|
|
|
5330
|
I = ignored
|
|
5330
|
I = ignored
|
|
|
5331
|
= origin of the previous file (with --copies)
|
|
5331
|
= origin of the previous file (with --copies)
|
|
|
5332
|
|
|
5332
|
|
|
|
5333
|
.. container:: verbose
|
|
5333
|
.. container:: verbose
|
|
|
5334
|
|
|
5334
|
|
|
|
5335
|
The -t/--terse option abbreviates the output by showing only the directory
|
|
5335
|
The -t/--terse option abbreviates the output by showing only the directory
|
|
|
5336
|
name if all the files in it share the same status. The option takes an
|
|
5336
|
name if all the files in it share the same status. The option takes an
|
|
|
5337
|
argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
|
|
5337
|
argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
|
|
|
5338
|
for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
|
|
5338
|
for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
|
|
|
5339
|
for 'ignored' and 'c' for clean.
|
|
5339
|
for 'ignored' and 'c' for clean.
|
|
|
5340
|
|
|
5340
|
|
|
|
5341
|
It abbreviates only those statuses which are passed. Note that clean and
|
|
5341
|
It abbreviates only those statuses which are passed. Note that clean and
|
|
|
5342
|
ignored files are not displayed with '--terse ic' unless the -c/--clean
|
|
5342
|
ignored files are not displayed with '--terse ic' unless the -c/--clean
|
|
|
5343
|
and -i/--ignored options are also used.
|
|
5343
|
and -i/--ignored options are also used.
|
|
|
5344
|
|
|
5344
|
|
|
|
5345
|
The -v/--verbose option shows information when the repository is in an
|
|
5345
|
The -v/--verbose option shows information when the repository is in an
|
|
|
5346
|
unfinished merge, shelve, rebase state etc. You can have this behavior
|
|
5346
|
unfinished merge, shelve, rebase state etc. You can have this behavior
|
|
|
5347
|
turned on by default by enabling the ``commands.status.verbose`` option.
|
|
5347
|
turned on by default by enabling the ``commands.status.verbose`` option.
|
|
|
5348
|
|
|
5348
|
|
|
|
5349
|
You can skip displaying some of these states by setting
|
|
5349
|
You can skip displaying some of these states by setting
|
|
|
5350
|
``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
|
|
5350
|
``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
|
|
|
5351
|
'histedit', 'merge', 'rebase', or 'unshelve'.
|
|
5351
|
'histedit', 'merge', 'rebase', or 'unshelve'.
|
|
|
5352
|
|
|
5352
|
|
|
|
5353
|
Template:
|
|
5353
|
Template:
|
|
|
5354
|
|
|
5354
|
|
|
|
5355
|
The following keywords are supported in addition to the common template
|
|
5355
|
The following keywords are supported in addition to the common template
|
|
|
5356
|
keywords and functions. See also :hg:`help templates`.
|
|
5356
|
keywords and functions. See also :hg:`help templates`.
|
|
|
5357
|
|
|
5357
|
|
|
|
5358
|
:path: String. Repository-absolute path of the file.
|
|
5358
|
:path: String. Repository-absolute path of the file.
|
|
|
5359
|
:source: String. Repository-absolute path of the file originated from.
|
|
5359
|
:source: String. Repository-absolute path of the file originated from.
|
|
|
5360
|
Available if ``--copies`` is specified.
|
|
5360
|
Available if ``--copies`` is specified.
|
|
|
5361
|
:status: String. Character denoting file's status.
|
|
5361
|
:status: String. Character denoting file's status.
|
|
|
5362
|
|
|
5362
|
|
|
|
5363
|
Examples:
|
|
5363
|
Examples:
|
|
|
5364
|
|
|
5364
|
|
|
|
5365
|
- show changes in the working directory relative to a
|
|
5365
|
- show changes in the working directory relative to a
|
|
|
5366
|
changeset::
|
|
5366
|
changeset::
|
|
|
5367
|
|
|
5367
|
|
|
|
5368
|
hg status --rev 9353
|
|
5368
|
hg status --rev 9353
|
|
|
5369
|
|
|
5369
|
|
|
|
5370
|
- show changes in the working directory relative to the
|
|
5370
|
- show changes in the working directory relative to the
|
|
|
5371
|
current directory (see :hg:`help patterns` for more information)::
|
|
5371
|
current directory (see :hg:`help patterns` for more information)::
|
|
|
5372
|
|
|
5372
|
|
|
|
5373
|
hg status re:
|
|
5373
|
hg status re:
|
|
|
5374
|
|
|
5374
|
|
|
|
5375
|
- show all changes including copies in an existing changeset::
|
|
5375
|
- show all changes including copies in an existing changeset::
|
|
|
5376
|
|
|
5376
|
|
|
|
5377
|
hg status --copies --change 9353
|
|
5377
|
hg status --copies --change 9353
|
|
|
5378
|
|
|
5378
|
|
|
|
5379
|
- get a NUL separated list of added files, suitable for xargs::
|
|
5379
|
- get a NUL separated list of added files, suitable for xargs::
|
|
|
5380
|
|
|
5380
|
|
|
|
5381
|
hg status -an0
|
|
5381
|
hg status -an0
|
|
|
5382
|
|
|
5382
|
|
|
|
5383
|
- show more information about the repository status, abbreviating
|
|
5383
|
- show more information about the repository status, abbreviating
|
|
|
5384
|
added, removed, modified, deleted, and untracked paths::
|
|
5384
|
added, removed, modified, deleted, and untracked paths::
|
|
|
5385
|
|
|
5385
|
|
|
|
5386
|
hg status -v -t mardu
|
|
5386
|
hg status -v -t mardu
|
|
|
5387
|
|
|
5387
|
|
|
|
5388
|
Returns 0 on success.
|
|
5388
|
Returns 0 on success.
|
|
|
5389
|
|
|
5389
|
|
|
|
5390
|
"""
|
|
5390
|
"""
|
|
|
5391
|
|
|
5391
|
|
|
|
5392
|
opts = pycompat.byteskwargs(opts)
|
|
5392
|
opts = pycompat.byteskwargs(opts)
|
|
|
5393
|
revs = opts.get('rev')
|
|
5393
|
revs = opts.get('rev')
|
|
|
5394
|
change = opts.get('change')
|
|
5394
|
change = opts.get('change')
|
|
|
5395
|
terse = opts.get('terse')
|
|
5395
|
terse = opts.get('terse')
|
|
|
5396
|
if terse is _NOTTERSE:
|
|
5396
|
if terse is _NOTTERSE:
|
|
|
5397
|
if revs:
|
|
5397
|
if revs:
|
|
|
5398
|
terse = ''
|
|
5398
|
terse = ''
|
|
|
5399
|
else:
|
|
5399
|
else:
|
|
|
5400
|
terse = ui.config('commands', 'status.terse')
|
|
5400
|
terse = ui.config('commands', 'status.terse')
|
|
|
5401
|
|
|
5401
|
|
|
|
5402
|
if revs and change:
|
|
5402
|
if revs and change:
|
|
|
5403
|
msg = _('cannot specify --rev and --change at the same time')
|
|
5403
|
msg = _('cannot specify --rev and --change at the same time')
|
|
|
5404
|
raise error.Abort(msg)
|
|
5404
|
raise error.Abort(msg)
|
|
|
5405
|
elif revs and terse:
|
|
5405
|
elif revs and terse:
|
|
|
5406
|
msg = _('cannot use --terse with --rev')
|
|
5406
|
msg = _('cannot use --terse with --rev')
|
|
|
5407
|
raise error.Abort(msg)
|
|
5407
|
raise error.Abort(msg)
|
|
|
5408
|
elif change:
|
|
5408
|
elif change:
|
|
|
5409
|
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
|
|
5409
|
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
|
|
|
5410
|
ctx2 = scmutil.revsingle(repo, change, None)
|
|
5410
|
ctx2 = scmutil.revsingle(repo, change, None)
|
|
|
5411
|
ctx1 = ctx2.p1()
|
|
5411
|
ctx1 = ctx2.p1()
|
|
|
5412
|
else:
|
|
5412
|
else:
|
|
|
5413
|
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
|
|
5413
|
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
|
|
|
5414
|
ctx1, ctx2 = scmutil.revpair(repo, revs)
|
|
5414
|
ctx1, ctx2 = scmutil.revpair(repo, revs)
|
|
|
5415
|
|
|
5415
|
|
|
|
5416
|
if pats or ui.configbool('commands', 'status.relative'):
|
|
5416
|
if pats or ui.configbool('commands', 'status.relative'):
|
|
|
5417
|
cwd = repo.getcwd()
|
|
5417
|
cwd = repo.getcwd()
|
|
|
5418
|
else:
|
|
5418
|
else:
|
|
|
5419
|
cwd = ''
|
|
5419
|
cwd = ''
|
|
|
5420
|
|
|
5420
|
|
|
|
5421
|
if opts.get('print0'):
|
|
5421
|
if opts.get('print0'):
|
|
|
5422
|
end = '\0'
|
|
5422
|
end = '\0'
|
|
|
5423
|
else:
|
|
5423
|
else:
|
|
|
5424
|
end = '\n'
|
|
5424
|
end = '\n'
|
|
|
5425
|
copy = {}
|
|
5425
|
copy = {}
|
|
|
5426
|
states = 'modified added removed deleted unknown ignored clean'.split()
|
|
5426
|
states = 'modified added removed deleted unknown ignored clean'.split()
|
|
|
5427
|
show = [k for k in states if opts.get(k)]
|
|
5427
|
show = [k for k in states if opts.get(k)]
|
|
|
5428
|
if opts.get('all'):
|
|
5428
|
if opts.get('all'):
|
|
|
5429
|
show += ui.quiet and (states[:4] + ['clean']) or states
|
|
5429
|
show += ui.quiet and (states[:4] + ['clean']) or states
|
|
|
5430
|
|
|
5430
|
|
|
|
5431
|
if not show:
|
|
5431
|
if not show:
|
|
|
5432
|
if ui.quiet:
|
|
5432
|
if ui.quiet:
|
|
|
5433
|
show = states[:4]
|
|
5433
|
show = states[:4]
|
|
|
5434
|
else:
|
|
5434
|
else:
|
|
|
5435
|
show = states[:5]
|
|
5435
|
show = states[:5]
|
|
|
5436
|
|
|
5436
|
|
|
|
5437
|
m = scmutil.match(ctx2, pats, opts)
|
|
5437
|
m = scmutil.match(ctx2, pats, opts)
|
|
|
5438
|
if terse:
|
|
5438
|
if terse:
|
|
|
5439
|
# we need to compute clean and unknown to terse
|
|
5439
|
# we need to compute clean and unknown to terse
|
|
|
5440
|
stat = repo.status(ctx1.node(), ctx2.node(), m,
|
|
5440
|
stat = repo.status(ctx1.node(), ctx2.node(), m,
|
|
|
5441
|
'ignored' in show or 'i' in terse,
|
|
5441
|
'ignored' in show or 'i' in terse,
|
|
|
5442
|
clean=True, unknown=True,
|
|
5442
|
clean=True, unknown=True,
|
|
|
5443
|
listsubrepos=opts.get('subrepos'))
|
|
5443
|
listsubrepos=opts.get('subrepos'))
|
|
|
5444
|
|
|
5444
|
|
|
|
5445
|
stat = cmdutil.tersedir(stat, terse)
|
|
5445
|
stat = cmdutil.tersedir(stat, terse)
|
|
|
5446
|
else:
|
|
5446
|
else:
|
|
|
5447
|
stat = repo.status(ctx1.node(), ctx2.node(), m,
|
|
5447
|
stat = repo.status(ctx1.node(), ctx2.node(), m,
|
|
|
5448
|
'ignored' in show, 'clean' in show,
|
|
5448
|
'ignored' in show, 'clean' in show,
|
|
|
5449
|
'unknown' in show, opts.get('subrepos'))
|
|
5449
|
'unknown' in show, opts.get('subrepos'))
|
|
|
5450
|
|
|
5450
|
|
|
|
5451
|
changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
|
|
5451
|
changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
|
|
|
5452
|
|
|
5452
|
|
|
|
5453
|
if (opts.get('all') or opts.get('copies')
|
|
5453
|
if (opts.get('all') or opts.get('copies')
|
|
|
5454
|
or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
|
|
5454
|
or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
|
|
|
5455
|
copy = copies.pathcopies(ctx1, ctx2, m)
|
|
5455
|
copy = copies.pathcopies(ctx1, ctx2, m)
|
|
|
5456
|
|
|
5456
|
|
|
|
5457
|
ui.pager('status')
|
|
5457
|
ui.pager('status')
|
|
|
5458
|
fm = ui.formatter('status', opts)
|
|
5458
|
fm = ui.formatter('status', opts)
|
|
|
5459
|
fmt = '%s' + end
|
|
5459
|
fmt = '%s' + end
|
|
|
5460
|
showchar = not opts.get('no_status')
|
|
5460
|
showchar = not opts.get('no_status')
|
|
|
5461
|
|
|
5461
|
|
|
|
5462
|
for state, char, files in changestates:
|
|
5462
|
for state, char, files in changestates:
|
|
|
5463
|
if state in show:
|
|
5463
|
if state in show:
|
|
|
5464
|
label = 'status.' + state
|
|
5464
|
label = 'status.' + state
|
|
|
5465
|
for f in files:
|
|
5465
|
for f in files:
|
|
|
5466
|
fm.startitem()
|
|
5466
|
fm.startitem()
|
|
|
5467
|
fm.context(ctx=ctx2)
|
|
5467
|
fm.context(ctx=ctx2)
|
|
|
5468
|
fm.data(path=f)
|
|
5468
|
fm.data(path=f)
|
|
|
5469
|
fm.condwrite(showchar, 'status', '%s ', char, label=label)
|
|
5469
|
fm.condwrite(showchar, 'status', '%s ', char, label=label)
|
|
|
5470
|
fm.plain(fmt % repo.pathto(f, cwd), label=label)
|
|
5470
|
fm.plain(fmt % repo.pathto(f, cwd), label=label)
|
|
|
5471
|
if f in copy:
|
|
5471
|
if f in copy:
|
|
|
5472
|
fm.data(source=copy[f])
|
|
5472
|
fm.data(source=copy[f])
|
|
|
5473
|
fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
|
|
5473
|
fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
|
|
|
5474
|
label='status.copied')
|
|
5474
|
label='status.copied')
|
|
|
5475
|
|
|
5475
|
|
|
|
5476
|
if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
|
|
5476
|
if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
|
|
|
5477
|
and not ui.plain()):
|
|
5477
|
and not ui.plain()):
|
|
|
5478
|
cmdutil.morestatus(repo, fm)
|
|
5478
|
cmdutil.morestatus(repo, fm)
|
|
|
5479
|
fm.end()
|
|
5479
|
fm.end()
|
|
|
5480
|
|
|
5480
|
|
|
|
5481
|
@command('summary|sum',
|
|
5481
|
@command('summary|sum',
|
|
|
5482
|
[('', 'remote', None, _('check for push and pull'))],
|
|
5482
|
[('', 'remote', None, _('check for push and pull'))],
|
|
|
5483
|
'[--remote]',
|
|
5483
|
'[--remote]',
|
|
|
5484
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
5484
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
5485
|
helpbasic=True,
|
|
5485
|
helpbasic=True,
|
|
|
5486
|
intents={INTENT_READONLY})
|
|
5486
|
intents={INTENT_READONLY})
|
|
|
5487
|
def summary(ui, repo, **opts):
|
|
5487
|
def summary(ui, repo, **opts):
|
|
|
5488
|
"""summarize working directory state
|
|
5488
|
"""summarize working directory state
|
|
|
5489
|
|
|
5489
|
|
|
|
5490
|
This generates a brief summary of the working directory state,
|
|
5490
|
This generates a brief summary of the working directory state,
|
|
|
5491
|
including parents, branch, commit status, phase and available updates.
|
|
5491
|
including parents, branch, commit status, phase and available updates.
|
|
|
5492
|
|
|
5492
|
|
|
|
5493
|
With the --remote option, this will check the default paths for
|
|
5493
|
With the --remote option, this will check the default paths for
|
|
|
5494
|
incoming and outgoing changes. This can be time-consuming.
|
|
5494
|
incoming and outgoing changes. This can be time-consuming.
|
|
|
5495
|
|
|
5495
|
|
|
|
5496
|
Returns 0 on success.
|
|
5496
|
Returns 0 on success.
|
|
|
5497
|
"""
|
|
5497
|
"""
|
|
|
5498
|
|
|
5498
|
|
|
|
5499
|
opts = pycompat.byteskwargs(opts)
|
|
5499
|
opts = pycompat.byteskwargs(opts)
|
|
|
5500
|
ui.pager('summary')
|
|
5500
|
ui.pager('summary')
|
|
|
5501
|
ctx = repo[None]
|
|
5501
|
ctx = repo[None]
|
|
|
5502
|
parents = ctx.parents()
|
|
5502
|
parents = ctx.parents()
|
|
|
5503
|
pnode = parents[0].node()
|
|
5503
|
pnode = parents[0].node()
|
|
|
5504
|
marks = []
|
|
5504
|
marks = []
|
|
|
5505
|
|
|
5505
|
|
|
|
5506
|
ms = None
|
|
5506
|
ms = None
|
|
|
5507
|
try:
|
|
5507
|
try:
|
|
|
5508
|
ms = mergemod.mergestate.read(repo)
|
|
5508
|
ms = mergemod.mergestate.read(repo)
|
|
|
5509
|
except error.UnsupportedMergeRecords as e:
|
|
5509
|
except error.UnsupportedMergeRecords as e:
|
|
|
5510
|
s = ' '.join(e.recordtypes)
|
|
5510
|
s = ' '.join(e.recordtypes)
|
|
|
5511
|
ui.warn(
|
|
5511
|
ui.warn(
|
|
|
5512
|
_('warning: merge state has unsupported record types: %s\n') % s)
|
|
5512
|
_('warning: merge state has unsupported record types: %s\n') % s)
|
|
|
5513
|
unresolved = []
|
|
5513
|
unresolved = []
|
|
|
5514
|
else:
|
|
5514
|
else:
|
|
|
5515
|
unresolved = list(ms.unresolved())
|
|
5515
|
unresolved = list(ms.unresolved())
|
|
|
5516
|
|
|
5516
|
|
|
|
5517
|
for p in parents:
|
|
5517
|
for p in parents:
|
|
|
5518
|
# label with log.changeset (instead of log.parent) since this
|
|
5518
|
# label with log.changeset (instead of log.parent) since this
|
|
|
5519
|
# shows a working directory parent *changeset*:
|
|
5519
|
# shows a working directory parent *changeset*:
|
|
|
5520
|
# i18n: column positioning for "hg summary"
|
|
5520
|
# i18n: column positioning for "hg summary"
|
|
|
5521
|
ui.write(_('parent: %d:%s ') % (p.rev(), p),
|
|
5521
|
ui.write(_('parent: %d:%s ') % (p.rev(), p),
|
|
|
5522
|
label=logcmdutil.changesetlabels(p))
|
|
5522
|
label=logcmdutil.changesetlabels(p))
|
|
|
5523
|
ui.write(' '.join(p.tags()), label='log.tag')
|
|
5523
|
ui.write(' '.join(p.tags()), label='log.tag')
|
|
|
5524
|
if p.bookmarks():
|
|
5524
|
if p.bookmarks():
|
|
|
5525
|
marks.extend(p.bookmarks())
|
|
5525
|
marks.extend(p.bookmarks())
|
|
|
5526
|
if p.rev() == -1:
|
|
5526
|
if p.rev() == -1:
|
|
|
5527
|
if not len(repo):
|
|
5527
|
if not len(repo):
|
|
|
5528
|
ui.write(_(' (empty repository)'))
|
|
5528
|
ui.write(_(' (empty repository)'))
|
|
|
5529
|
else:
|
|
5529
|
else:
|
|
|
5530
|
ui.write(_(' (no revision checked out)'))
|
|
5530
|
ui.write(_(' (no revision checked out)'))
|
|
|
5531
|
if p.obsolete():
|
|
5531
|
if p.obsolete():
|
|
|
5532
|
ui.write(_(' (obsolete)'))
|
|
5532
|
ui.write(_(' (obsolete)'))
|
|
|
5533
|
if p.isunstable():
|
|
5533
|
if p.isunstable():
|
|
|
5534
|
instabilities = (ui.label(instability, 'trouble.%s' % instability)
|
|
5534
|
instabilities = (ui.label(instability, 'trouble.%s' % instability)
|
|
|
5535
|
for instability in p.instabilities())
|
|
5535
|
for instability in p.instabilities())
|
|
|
5536
|
ui.write(' ('
|
|
5536
|
ui.write(' ('
|
|
|
5537
|
+ ', '.join(instabilities)
|
|
5537
|
+ ', '.join(instabilities)
|
|
|
5538
|
+ ')')
|
|
5538
|
+ ')')
|
|
|
5539
|
ui.write('\n')
|
|
5539
|
ui.write('\n')
|
|
|
5540
|
if p.description():
|
|
5540
|
if p.description():
|
|
|
5541
|
ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
|
|
5541
|
ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
|
|
|
5542
|
label='log.summary')
|
|
5542
|
label='log.summary')
|
|
|
5543
|
|
|
5543
|
|
|
|
5544
|
branch = ctx.branch()
|
|
5544
|
branch = ctx.branch()
|
|
|
5545
|
bheads = repo.branchheads(branch)
|
|
5545
|
bheads = repo.branchheads(branch)
|
|
|
5546
|
# i18n: column positioning for "hg summary"
|
|
5546
|
# i18n: column positioning for "hg summary"
|
|
|
5547
|
m = _('branch: %s\n') % branch
|
|
5547
|
m = _('branch: %s\n') % branch
|
|
|
5548
|
if branch != 'default':
|
|
5548
|
if branch != 'default':
|
|
|
5549
|
ui.write(m, label='log.branch')
|
|
5549
|
ui.write(m, label='log.branch')
|
|
|
5550
|
else:
|
|
5550
|
else:
|
|
|
5551
|
ui.status(m, label='log.branch')
|
|
5551
|
ui.status(m, label='log.branch')
|
|
|
5552
|
|
|
5552
|
|
|
|
5553
|
if marks:
|
|
5553
|
if marks:
|
|
|
5554
|
active = repo._activebookmark
|
|
5554
|
active = repo._activebookmark
|
|
|
5555
|
# i18n: column positioning for "hg summary"
|
|
5555
|
# i18n: column positioning for "hg summary"
|
|
|
5556
|
ui.write(_('bookmarks:'), label='log.bookmark')
|
|
5556
|
ui.write(_('bookmarks:'), label='log.bookmark')
|
|
|
5557
|
if active is not None:
|
|
5557
|
if active is not None:
|
|
|
5558
|
if active in marks:
|
|
5558
|
if active in marks:
|
|
|
5559
|
ui.write(' *' + active, label=bookmarks.activebookmarklabel)
|
|
5559
|
ui.write(' *' + active, label=bookmarks.activebookmarklabel)
|
|
|
5560
|
marks.remove(active)
|
|
5560
|
marks.remove(active)
|
|
|
5561
|
else:
|
|
5561
|
else:
|
|
|
5562
|
ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
|
|
5562
|
ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
|
|
|
5563
|
for m in marks:
|
|
5563
|
for m in marks:
|
|
|
5564
|
ui.write(' ' + m, label='log.bookmark')
|
|
5564
|
ui.write(' ' + m, label='log.bookmark')
|
|
|
5565
|
ui.write('\n', label='log.bookmark')
|
|
5565
|
ui.write('\n', label='log.bookmark')
|
|
|
5566
|
|
|
5566
|
|
|
|
5567
|
status = repo.status(unknown=True)
|
|
5567
|
status = repo.status(unknown=True)
|
|
|
5568
|
|
|
5568
|
|
|
|
5569
|
c = repo.dirstate.copies()
|
|
5569
|
c = repo.dirstate.copies()
|
|
|
5570
|
copied, renamed = [], []
|
|
5570
|
copied, renamed = [], []
|
|
|
5571
|
for d, s in c.iteritems():
|
|
5571
|
for d, s in c.iteritems():
|
|
|
5572
|
if s in status.removed:
|
|
5572
|
if s in status.removed:
|
|
|
5573
|
status.removed.remove(s)
|
|
5573
|
status.removed.remove(s)
|
|
|
5574
|
renamed.append(d)
|
|
5574
|
renamed.append(d)
|
|
|
5575
|
else:
|
|
5575
|
else:
|
|
|
5576
|
copied.append(d)
|
|
5576
|
copied.append(d)
|
|
|
5577
|
if d in status.added:
|
|
5577
|
if d in status.added:
|
|
|
5578
|
status.added.remove(d)
|
|
5578
|
status.added.remove(d)
|
|
|
5579
|
|
|
5579
|
|
|
|
5580
|
subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
|
|
5580
|
subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
|
|
|
5581
|
|
|
5581
|
|
|
|
5582
|
labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
|
|
5582
|
labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
|
|
|
5583
|
(ui.label(_('%d added'), 'status.added'), status.added),
|
|
5583
|
(ui.label(_('%d added'), 'status.added'), status.added),
|
|
|
5584
|
(ui.label(_('%d removed'), 'status.removed'), status.removed),
|
|
5584
|
(ui.label(_('%d removed'), 'status.removed'), status.removed),
|
|
|
5585
|
(ui.label(_('%d renamed'), 'status.copied'), renamed),
|
|
5585
|
(ui.label(_('%d renamed'), 'status.copied'), renamed),
|
|
|
5586
|
(ui.label(_('%d copied'), 'status.copied'), copied),
|
|
5586
|
(ui.label(_('%d copied'), 'status.copied'), copied),
|
|
|
5587
|
(ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
|
|
5587
|
(ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
|
|
|
5588
|
(ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
|
|
5588
|
(ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
|
|
|
5589
|
(ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
|
|
5589
|
(ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
|
|
|
5590
|
(ui.label(_('%d subrepos'), 'status.modified'), subs)]
|
|
5590
|
(ui.label(_('%d subrepos'), 'status.modified'), subs)]
|
|
|
5591
|
t = []
|
|
5591
|
t = []
|
|
|
5592
|
for l, s in labels:
|
|
5592
|
for l, s in labels:
|
|
|
5593
|
if s:
|
|
5593
|
if s:
|
|
|
5594
|
t.append(l % len(s))
|
|
5594
|
t.append(l % len(s))
|
|
|
5595
|
|
|
5595
|
|
|
|
5596
|
t = ', '.join(t)
|
|
5596
|
t = ', '.join(t)
|
|
|
5597
|
cleanworkdir = False
|
|
5597
|
cleanworkdir = False
|
|
|
5598
|
|
|
5598
|
|
|
|
5599
|
if repo.vfs.exists('graftstate'):
|
|
5599
|
if repo.vfs.exists('graftstate'):
|
|
|
5600
|
t += _(' (graft in progress)')
|
|
5600
|
t += _(' (graft in progress)')
|
|
|
5601
|
if repo.vfs.exists('updatestate'):
|
|
5601
|
if repo.vfs.exists('updatestate'):
|
|
|
5602
|
t += _(' (interrupted update)')
|
|
5602
|
t += _(' (interrupted update)')
|
|
|
5603
|
elif len(parents) > 1:
|
|
5603
|
elif len(parents) > 1:
|
|
|
5604
|
t += _(' (merge)')
|
|
5604
|
t += _(' (merge)')
|
|
|
5605
|
elif branch != parents[0].branch():
|
|
5605
|
elif branch != parents[0].branch():
|
|
|
5606
|
t += _(' (new branch)')
|
|
5606
|
t += _(' (new branch)')
|
|
|
5607
|
elif (parents[0].closesbranch() and
|
|
5607
|
elif (parents[0].closesbranch() and
|
|
|
5608
|
pnode in repo.branchheads(branch, closed=True)):
|
|
5608
|
pnode in repo.branchheads(branch, closed=True)):
|
|
|
5609
|
t += _(' (head closed)')
|
|
5609
|
t += _(' (head closed)')
|
|
|
5610
|
elif not (status.modified or status.added or status.removed or renamed or
|
|
5610
|
elif not (status.modified or status.added or status.removed or renamed or
|
|
|
5611
|
copied or subs):
|
|
5611
|
copied or subs):
|
|
|
5612
|
t += _(' (clean)')
|
|
5612
|
t += _(' (clean)')
|
|
|
5613
|
cleanworkdir = True
|
|
5613
|
cleanworkdir = True
|
|
|
5614
|
elif pnode not in bheads:
|
|
5614
|
elif pnode not in bheads:
|
|
|
5615
|
t += _(' (new branch head)')
|
|
5615
|
t += _(' (new branch head)')
|
|
|
5616
|
|
|
5616
|
|
|
|
5617
|
if parents:
|
|
5617
|
if parents:
|
|
|
5618
|
pendingphase = max(p.phase() for p in parents)
|
|
5618
|
pendingphase = max(p.phase() for p in parents)
|
|
|
5619
|
else:
|
|
5619
|
else:
|
|
|
5620
|
pendingphase = phases.public
|
|
5620
|
pendingphase = phases.public
|
|
|
5621
|
|
|
5621
|
|
|
|
5622
|
if pendingphase > phases.newcommitphase(ui):
|
|
5622
|
if pendingphase > phases.newcommitphase(ui):
|
|
|
5623
|
t += ' (%s)' % phases.phasenames[pendingphase]
|
|
5623
|
t += ' (%s)' % phases.phasenames[pendingphase]
|
|
|
5624
|
|
|
5624
|
|
|
|
5625
|
if cleanworkdir:
|
|
5625
|
if cleanworkdir:
|
|
|
5626
|
# i18n: column positioning for "hg summary"
|
|
5626
|
# i18n: column positioning for "hg summary"
|
|
|
5627
|
ui.status(_('commit: %s\n') % t.strip())
|
|
5627
|
ui.status(_('commit: %s\n') % t.strip())
|
|
|
5628
|
else:
|
|
5628
|
else:
|
|
|
5629
|
# i18n: column positioning for "hg summary"
|
|
5629
|
# i18n: column positioning for "hg summary"
|
|
|
5630
|
ui.write(_('commit: %s\n') % t.strip())
|
|
5630
|
ui.write(_('commit: %s\n') % t.strip())
|
|
|
5631
|
|
|
5631
|
|
|
|
5632
|
# all ancestors of branch heads - all ancestors of parent = new csets
|
|
5632
|
# all ancestors of branch heads - all ancestors of parent = new csets
|
|
|
5633
|
new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
|
|
5633
|
new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
|
|
|
5634
|
bheads))
|
|
5634
|
bheads))
|
|
|
5635
|
|
|
5635
|
|
|
|
5636
|
if new == 0:
|
|
5636
|
if new == 0:
|
|
|
5637
|
# i18n: column positioning for "hg summary"
|
|
5637
|
# i18n: column positioning for "hg summary"
|
|
|
5638
|
ui.status(_('update: (current)\n'))
|
|
5638
|
ui.status(_('update: (current)\n'))
|
|
|
5639
|
elif pnode not in bheads:
|
|
5639
|
elif pnode not in bheads:
|
|
|
5640
|
# i18n: column positioning for "hg summary"
|
|
5640
|
# i18n: column positioning for "hg summary"
|
|
|
5641
|
ui.write(_('update: %d new changesets (update)\n') % new)
|
|
5641
|
ui.write(_('update: %d new changesets (update)\n') % new)
|
|
|
5642
|
else:
|
|
5642
|
else:
|
|
|
5643
|
# i18n: column positioning for "hg summary"
|
|
5643
|
# i18n: column positioning for "hg summary"
|
|
|
5644
|
ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
|
|
5644
|
ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
|
|
|
5645
|
(new, len(bheads)))
|
|
5645
|
(new, len(bheads)))
|
|
|
5646
|
|
|
5646
|
|
|
|
5647
|
t = []
|
|
5647
|
t = []
|
|
|
5648
|
draft = len(repo.revs('draft()'))
|
|
5648
|
draft = len(repo.revs('draft()'))
|
|
|
5649
|
if draft:
|
|
5649
|
if draft:
|
|
|
5650
|
t.append(_('%d draft') % draft)
|
|
5650
|
t.append(_('%d draft') % draft)
|
|
|
5651
|
secret = len(repo.revs('secret()'))
|
|
5651
|
secret = len(repo.revs('secret()'))
|
|
|
5652
|
if secret:
|
|
5652
|
if secret:
|
|
|
5653
|
t.append(_('%d secret') % secret)
|
|
5653
|
t.append(_('%d secret') % secret)
|
|
|
5654
|
|
|
5654
|
|
|
|
5655
|
if draft or secret:
|
|
5655
|
if draft or secret:
|
|
|
5656
|
ui.status(_('phases: %s\n') % ', '.join(t))
|
|
5656
|
ui.status(_('phases: %s\n') % ', '.join(t))
|
|
|
5657
|
|
|
5657
|
|
|
|
5658
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
5658
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
|
5659
|
for trouble in ("orphan", "contentdivergent", "phasedivergent"):
|
|
5659
|
for trouble in ("orphan", "contentdivergent", "phasedivergent"):
|
|
|
5660
|
numtrouble = len(repo.revs(trouble + "()"))
|
|
5660
|
numtrouble = len(repo.revs(trouble + "()"))
|
|
|
5661
|
# We write all the possibilities to ease translation
|
|
5661
|
# We write all the possibilities to ease translation
|
|
|
5662
|
troublemsg = {
|
|
5662
|
troublemsg = {
|
|
|
5663
|
"orphan": _("orphan: %d changesets"),
|
|
5663
|
"orphan": _("orphan: %d changesets"),
|
|
|
5664
|
"contentdivergent": _("content-divergent: %d changesets"),
|
|
5664
|
"contentdivergent": _("content-divergent: %d changesets"),
|
|
|
5665
|
"phasedivergent": _("phase-divergent: %d changesets"),
|
|
5665
|
"phasedivergent": _("phase-divergent: %d changesets"),
|
|
|
5666
|
}
|
|
5666
|
}
|
|
|
5667
|
if numtrouble > 0:
|
|
5667
|
if numtrouble > 0:
|
|
|
5668
|
ui.status(troublemsg[trouble] % numtrouble + "\n")
|
|
5668
|
ui.status(troublemsg[trouble] % numtrouble + "\n")
|
|
|
5669
|
|
|
5669
|
|
|
|
5670
|
cmdutil.summaryhooks(ui, repo)
|
|
5670
|
cmdutil.summaryhooks(ui, repo)
|
|
|
5671
|
|
|
5671
|
|
|
|
5672
|
if opts.get('remote'):
|
|
5672
|
if opts.get('remote'):
|
|
|
5673
|
needsincoming, needsoutgoing = True, True
|
|
5673
|
needsincoming, needsoutgoing = True, True
|
|
|
5674
|
else:
|
|
5674
|
else:
|
|
|
5675
|
needsincoming, needsoutgoing = False, False
|
|
5675
|
needsincoming, needsoutgoing = False, False
|
|
|
5676
|
for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
|
|
5676
|
for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
|
|
|
5677
|
if i:
|
|
5677
|
if i:
|
|
|
5678
|
needsincoming = True
|
|
5678
|
needsincoming = True
|
|
|
5679
|
if o:
|
|
5679
|
if o:
|
|
|
5680
|
needsoutgoing = True
|
|
5680
|
needsoutgoing = True
|
|
|
5681
|
if not needsincoming and not needsoutgoing:
|
|
5681
|
if not needsincoming and not needsoutgoing:
|
|
|
5682
|
return
|
|
5682
|
return
|
|
|
5683
|
|
|
5683
|
|
|
|
5684
|
def getincoming():
|
|
5684
|
def getincoming():
|
|
|
5685
|
source, branches = hg.parseurl(ui.expandpath('default'))
|
|
5685
|
source, branches = hg.parseurl(ui.expandpath('default'))
|
|
|
5686
|
sbranch = branches[0]
|
|
5686
|
sbranch = branches[0]
|
|
|
5687
|
try:
|
|
5687
|
try:
|
|
|
5688
|
other = hg.peer(repo, {}, source)
|
|
5688
|
other = hg.peer(repo, {}, source)
|
|
|
5689
|
except error.RepoError:
|
|
5689
|
except error.RepoError:
|
|
|
5690
|
if opts.get('remote'):
|
|
5690
|
if opts.get('remote'):
|
|
|
5691
|
raise
|
|
5691
|
raise
|
|
|
5692
|
return source, sbranch, None, None, None
|
|
5692
|
return source, sbranch, None, None, None
|
|
|
5693
|
revs, checkout = hg.addbranchrevs(repo, other, branches, None)
|
|
5693
|
revs, checkout = hg.addbranchrevs(repo, other, branches, None)
|
|
|
5694
|
if revs:
|
|
5694
|
if revs:
|
|
|
5695
|
revs = [other.lookup(rev) for rev in revs]
|
|
5695
|
revs = [other.lookup(rev) for rev in revs]
|
|
|
5696
|
ui.debug('comparing with %s\n' % util.hidepassword(source))
|
|
5696
|
ui.debug('comparing with %s\n' % util.hidepassword(source))
|
|
|
5697
|
repo.ui.pushbuffer()
|
|
5697
|
repo.ui.pushbuffer()
|
|
|
5698
|
commoninc = discovery.findcommonincoming(repo, other, heads=revs)
|
|
5698
|
commoninc = discovery.findcommonincoming(repo, other, heads=revs)
|
|
|
5699
|
repo.ui.popbuffer()
|
|
5699
|
repo.ui.popbuffer()
|
|
|
5700
|
return source, sbranch, other, commoninc, commoninc[1]
|
|
5700
|
return source, sbranch, other, commoninc, commoninc[1]
|
|
|
5701
|
|
|
5701
|
|
|
|
5702
|
if needsincoming:
|
|
5702
|
if needsincoming:
|
|
|
5703
|
source, sbranch, sother, commoninc, incoming = getincoming()
|
|
5703
|
source, sbranch, sother, commoninc, incoming = getincoming()
|
|
|
5704
|
else:
|
|
5704
|
else:
|
|
|
5705
|
source = sbranch = sother = commoninc = incoming = None
|
|
5705
|
source = sbranch = sother = commoninc = incoming = None
|
|
|
5706
|
|
|
5706
|
|
|
|
5707
|
def getoutgoing():
|
|
5707
|
def getoutgoing():
|
|
|
5708
|
dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
|
|
5708
|
dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
|
|
|
5709
|
dbranch = branches[0]
|
|
5709
|
dbranch = branches[0]
|
|
|
5710
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
|
|
5710
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
|
|
|
5711
|
if source != dest:
|
|
5711
|
if source != dest:
|
|
|
5712
|
try:
|
|
5712
|
try:
|
|
|
5713
|
dother = hg.peer(repo, {}, dest)
|
|
5713
|
dother = hg.peer(repo, {}, dest)
|
|
|
5714
|
except error.RepoError:
|
|
5714
|
except error.RepoError:
|
|
|
5715
|
if opts.get('remote'):
|
|
5715
|
if opts.get('remote'):
|
|
|
5716
|
raise
|
|
5716
|
raise
|
|
|
5717
|
return dest, dbranch, None, None
|
|
5717
|
return dest, dbranch, None, None
|
|
|
5718
|
ui.debug('comparing with %s\n' % util.hidepassword(dest))
|
|
5718
|
ui.debug('comparing with %s\n' % util.hidepassword(dest))
|
|
|
5719
|
elif sother is None:
|
|
5719
|
elif sother is None:
|
|
|
5720
|
# there is no explicit destination peer, but source one is invalid
|
|
5720
|
# there is no explicit destination peer, but source one is invalid
|
|
|
5721
|
return dest, dbranch, None, None
|
|
5721
|
return dest, dbranch, None, None
|
|
|
5722
|
else:
|
|
5722
|
else:
|
|
|
5723
|
dother = sother
|
|
5723
|
dother = sother
|
|
|
5724
|
if (source != dest or (sbranch is not None and sbranch != dbranch)):
|
|
5724
|
if (source != dest or (sbranch is not None and sbranch != dbranch)):
|
|
|
5725
|
common = None
|
|
5725
|
common = None
|
|
|
5726
|
else:
|
|
5726
|
else:
|
|
|
5727
|
common = commoninc
|
|
5727
|
common = commoninc
|
|
|
5728
|
if revs:
|
|
5728
|
if revs:
|
|
|
5729
|
revs = [repo.lookup(rev) for rev in revs]
|
|
5729
|
revs = [repo.lookup(rev) for rev in revs]
|
|
|
5730
|
repo.ui.pushbuffer()
|
|
5730
|
repo.ui.pushbuffer()
|
|
|
5731
|
outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
|
|
5731
|
outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
|
|
|
5732
|
commoninc=common)
|
|
5732
|
commoninc=common)
|
|
|
5733
|
repo.ui.popbuffer()
|
|
5733
|
repo.ui.popbuffer()
|
|
|
5734
|
return dest, dbranch, dother, outgoing
|
|
5734
|
return dest, dbranch, dother, outgoing
|
|
|
5735
|
|
|
5735
|
|
|
|
5736
|
if needsoutgoing:
|
|
5736
|
if needsoutgoing:
|
|
|
5737
|
dest, dbranch, dother, outgoing = getoutgoing()
|
|
5737
|
dest, dbranch, dother, outgoing = getoutgoing()
|
|
|
5738
|
else:
|
|
5738
|
else:
|
|
|
5739
|
dest = dbranch = dother = outgoing = None
|
|
5739
|
dest = dbranch = dother = outgoing = None
|
|
|
5740
|
|
|
5740
|
|
|
|
5741
|
if opts.get('remote'):
|
|
5741
|
if opts.get('remote'):
|
|
|
5742
|
t = []
|
|
5742
|
t = []
|
|
|
5743
|
if incoming:
|
|
5743
|
if incoming:
|
|
|
5744
|
t.append(_('1 or more incoming'))
|
|
5744
|
t.append(_('1 or more incoming'))
|
|
|
5745
|
o = outgoing.missing
|
|
5745
|
o = outgoing.missing
|
|
|
5746
|
if o:
|
|
5746
|
if o:
|
|
|
5747
|
t.append(_('%d outgoing') % len(o))
|
|
5747
|
t.append(_('%d outgoing') % len(o))
|
|
|
5748
|
other = dother or sother
|
|
5748
|
other = dother or sother
|
|
|
5749
|
if 'bookmarks' in other.listkeys('namespaces'):
|
|
5749
|
if 'bookmarks' in other.listkeys('namespaces'):
|
|
|
5750
|
counts = bookmarks.summary(repo, other)
|
|
5750
|
counts = bookmarks.summary(repo, other)
|
|
|
5751
|
if counts[0] > 0:
|
|
5751
|
if counts[0] > 0:
|
|
|
5752
|
t.append(_('%d incoming bookmarks') % counts[0])
|
|
5752
|
t.append(_('%d incoming bookmarks') % counts[0])
|
|
|
5753
|
if counts[1] > 0:
|
|
5753
|
if counts[1] > 0:
|
|
|
5754
|
t.append(_('%d outgoing bookmarks') % counts[1])
|
|
5754
|
t.append(_('%d outgoing bookmarks') % counts[1])
|
|
|
5755
|
|
|
5755
|
|
|
|
5756
|
if t:
|
|
5756
|
if t:
|
|
|
5757
|
# i18n: column positioning for "hg summary"
|
|
5757
|
# i18n: column positioning for "hg summary"
|
|
|
5758
|
ui.write(_('remote: %s\n') % (', '.join(t)))
|
|
5758
|
ui.write(_('remote: %s\n') % (', '.join(t)))
|
|
|
5759
|
else:
|
|
5759
|
else:
|
|
|
5760
|
# i18n: column positioning for "hg summary"
|
|
5760
|
# i18n: column positioning for "hg summary"
|
|
|
5761
|
ui.status(_('remote: (synced)\n'))
|
|
5761
|
ui.status(_('remote: (synced)\n'))
|
|
|
5762
|
|
|
5762
|
|
|
|
5763
|
cmdutil.summaryremotehooks(ui, repo, opts,
|
|
5763
|
cmdutil.summaryremotehooks(ui, repo, opts,
|
|
|
5764
|
((source, sbranch, sother, commoninc),
|
|
5764
|
((source, sbranch, sother, commoninc),
|
|
|
5765
|
(dest, dbranch, dother, outgoing)))
|
|
5765
|
(dest, dbranch, dother, outgoing)))
|
|
|
5766
|
|
|
5766
|
|
|
|
5767
|
@command('tag',
|
|
5767
|
@command('tag',
|
|
|
5768
|
[('f', 'force', None, _('force tag')),
|
|
5768
|
[('f', 'force', None, _('force tag')),
|
|
|
5769
|
('l', 'local', None, _('make the tag local')),
|
|
5769
|
('l', 'local', None, _('make the tag local')),
|
|
|
5770
|
('r', 'rev', '', _('revision to tag'), _('REV')),
|
|
5770
|
('r', 'rev', '', _('revision to tag'), _('REV')),
|
|
|
5771
|
('', 'remove', None, _('remove a tag')),
|
|
5771
|
('', 'remove', None, _('remove a tag')),
|
|
|
5772
|
# -l/--local is already there, commitopts cannot be used
|
|
5772
|
# -l/--local is already there, commitopts cannot be used
|
|
|
5773
|
('e', 'edit', None, _('invoke editor on commit messages')),
|
|
5773
|
('e', 'edit', None, _('invoke editor on commit messages')),
|
|
|
5774
|
('m', 'message', '', _('use text as commit message'), _('TEXT')),
|
|
5774
|
('m', 'message', '', _('use text as commit message'), _('TEXT')),
|
|
|
5775
|
] + commitopts2,
|
|
5775
|
] + commitopts2,
|
|
|
5776
|
_('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
|
|
5776
|
_('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
|
|
|
5777
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
5777
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
5778
|
def tag(ui, repo, name1, *names, **opts):
|
|
5778
|
def tag(ui, repo, name1, *names, **opts):
|
|
|
5779
|
"""add one or more tags for the current or given revision
|
|
5779
|
"""add one or more tags for the current or given revision
|
|
|
5780
|
|
|
5780
|
|
|
|
5781
|
Name a particular revision using <name>.
|
|
5781
|
Name a particular revision using <name>.
|
|
|
5782
|
|
|
5782
|
|
|
|
5783
|
Tags are used to name particular revisions of the repository and are
|
|
5783
|
Tags are used to name particular revisions of the repository and are
|
|
|
5784
|
very useful to compare different revisions, to go back to significant
|
|
5784
|
very useful to compare different revisions, to go back to significant
|
|
|
5785
|
earlier versions or to mark branch points as releases, etc. Changing
|
|
5785
|
earlier versions or to mark branch points as releases, etc. Changing
|
|
|
5786
|
an existing tag is normally disallowed; use -f/--force to override.
|
|
5786
|
an existing tag is normally disallowed; use -f/--force to override.
|
|
|
5787
|
|
|
5787
|
|
|
|
5788
|
If no revision is given, the parent of the working directory is
|
|
5788
|
If no revision is given, the parent of the working directory is
|
|
|
5789
|
used.
|
|
5789
|
used.
|
|
|
5790
|
|
|
5790
|
|
|
|
5791
|
To facilitate version control, distribution, and merging of tags,
|
|
5791
|
To facilitate version control, distribution, and merging of tags,
|
|
|
5792
|
they are stored as a file named ".hgtags" which is managed similarly
|
|
5792
|
they are stored as a file named ".hgtags" which is managed similarly
|
|
|
5793
|
to other project files and can be hand-edited if necessary. This
|
|
5793
|
to other project files and can be hand-edited if necessary. This
|
|
|
5794
|
also means that tagging creates a new commit. The file
|
|
5794
|
also means that tagging creates a new commit. The file
|
|
|
5795
|
".hg/localtags" is used for local tags (not shared among
|
|
5795
|
".hg/localtags" is used for local tags (not shared among
|
|
|
5796
|
repositories).
|
|
5796
|
repositories).
|
|
|
5797
|
|
|
5797
|
|
|
|
5798
|
Tag commits are usually made at the head of a branch. If the parent
|
|
5798
|
Tag commits are usually made at the head of a branch. If the parent
|
|
|
5799
|
of the working directory is not a branch head, :hg:`tag` aborts; use
|
|
5799
|
of the working directory is not a branch head, :hg:`tag` aborts; use
|
|
|
5800
|
-f/--force to force the tag commit to be based on a non-head
|
|
5800
|
-f/--force to force the tag commit to be based on a non-head
|
|
|
5801
|
changeset.
|
|
5801
|
changeset.
|
|
|
5802
|
|
|
5802
|
|
|
|
5803
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
5803
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
5804
|
|
|
5804
|
|
|
|
5805
|
Since tag names have priority over branch names during revision
|
|
5805
|
Since tag names have priority over branch names during revision
|
|
|
5806
|
lookup, using an existing branch name as a tag name is discouraged.
|
|
5806
|
lookup, using an existing branch name as a tag name is discouraged.
|
|
|
5807
|
|
|
5807
|
|
|
|
5808
|
Returns 0 on success.
|
|
5808
|
Returns 0 on success.
|
|
|
5809
|
"""
|
|
5809
|
"""
|
|
|
5810
|
opts = pycompat.byteskwargs(opts)
|
|
5810
|
opts = pycompat.byteskwargs(opts)
|
|
|
5811
|
with repo.wlock(), repo.lock():
|
|
5811
|
with repo.wlock(), repo.lock():
|
|
|
5812
|
rev_ = "."
|
|
5812
|
rev_ = "."
|
|
|
5813
|
names = [t.strip() for t in (name1,) + names]
|
|
5813
|
names = [t.strip() for t in (name1,) + names]
|
|
|
5814
|
if len(names) != len(set(names)):
|
|
5814
|
if len(names) != len(set(names)):
|
|
|
5815
|
raise error.Abort(_('tag names must be unique'))
|
|
5815
|
raise error.Abort(_('tag names must be unique'))
|
|
|
5816
|
for n in names:
|
|
5816
|
for n in names:
|
|
|
5817
|
scmutil.checknewlabel(repo, n, 'tag')
|
|
5817
|
scmutil.checknewlabel(repo, n, 'tag')
|
|
|
5818
|
if not n:
|
|
5818
|
if not n:
|
|
|
5819
|
raise error.Abort(_('tag names cannot consist entirely of '
|
|
5819
|
raise error.Abort(_('tag names cannot consist entirely of '
|
|
|
5820
|
'whitespace'))
|
|
5820
|
'whitespace'))
|
|
|
5821
|
if opts.get('rev') and opts.get('remove'):
|
|
5821
|
if opts.get('rev') and opts.get('remove'):
|
|
|
5822
|
raise error.Abort(_("--rev and --remove are incompatible"))
|
|
5822
|
raise error.Abort(_("--rev and --remove are incompatible"))
|
|
|
5823
|
if opts.get('rev'):
|
|
5823
|
if opts.get('rev'):
|
|
|
5824
|
rev_ = opts['rev']
|
|
5824
|
rev_ = opts['rev']
|
|
|
5825
|
message = opts.get('message')
|
|
5825
|
message = opts.get('message')
|
|
|
5826
|
if opts.get('remove'):
|
|
5826
|
if opts.get('remove'):
|
|
|
5827
|
if opts.get('local'):
|
|
5827
|
if opts.get('local'):
|
|
|
5828
|
expectedtype = 'local'
|
|
5828
|
expectedtype = 'local'
|
|
|
5829
|
else:
|
|
5829
|
else:
|
|
|
5830
|
expectedtype = 'global'
|
|
5830
|
expectedtype = 'global'
|
|
|
5831
|
|
|
5831
|
|
|
|
5832
|
for n in names:
|
|
5832
|
for n in names:
|
|
|
5833
|
if not repo.tagtype(n):
|
|
5833
|
if not repo.tagtype(n):
|
|
|
5834
|
raise error.Abort(_("tag '%s' does not exist") % n)
|
|
5834
|
raise error.Abort(_("tag '%s' does not exist") % n)
|
|
|
5835
|
if repo.tagtype(n) != expectedtype:
|
|
5835
|
if repo.tagtype(n) != expectedtype:
|
|
|
5836
|
if expectedtype == 'global':
|
|
5836
|
if expectedtype == 'global':
|
|
|
5837
|
raise error.Abort(_("tag '%s' is not a global tag") % n)
|
|
5837
|
raise error.Abort(_("tag '%s' is not a global tag") % n)
|
|
|
5838
|
else:
|
|
5838
|
else:
|
|
|
5839
|
raise error.Abort(_("tag '%s' is not a local tag") % n)
|
|
5839
|
raise error.Abort(_("tag '%s' is not a local tag") % n)
|
|
|
5840
|
rev_ = 'null'
|
|
5840
|
rev_ = 'null'
|
|
|
5841
|
if not message:
|
|
5841
|
if not message:
|
|
|
5842
|
# we don't translate commit messages
|
|
5842
|
# we don't translate commit messages
|
|
|
5843
|
message = 'Removed tag %s' % ', '.join(names)
|
|
5843
|
message = 'Removed tag %s' % ', '.join(names)
|
|
|
5844
|
elif not opts.get('force'):
|
|
5844
|
elif not opts.get('force'):
|
|
|
5845
|
for n in names:
|
|
5845
|
for n in names:
|
|
|
5846
|
if n in repo.tags():
|
|
5846
|
if n in repo.tags():
|
|
|
5847
|
raise error.Abort(_("tag '%s' already exists "
|
|
5847
|
raise error.Abort(_("tag '%s' already exists "
|
|
|
5848
|
"(use -f to force)") % n)
|
|
5848
|
"(use -f to force)") % n)
|
|
|
5849
|
if not opts.get('local'):
|
|
5849
|
if not opts.get('local'):
|
|
|
5850
|
p1, p2 = repo.dirstate.parents()
|
|
5850
|
p1, p2 = repo.dirstate.parents()
|
|
|
5851
|
if p2 != nullid:
|
|
5851
|
if p2 != nullid:
|
|
|
5852
|
raise error.Abort(_('uncommitted merge'))
|
|
5852
|
raise error.Abort(_('uncommitted merge'))
|
|
|
5853
|
bheads = repo.branchheads()
|
|
5853
|
bheads = repo.branchheads()
|
|
|
5854
|
if not opts.get('force') and bheads and p1 not in bheads:
|
|
5854
|
if not opts.get('force') and bheads and p1 not in bheads:
|
|
|
5855
|
raise error.Abort(_('working directory is not at a branch head '
|
|
5855
|
raise error.Abort(_('working directory is not at a branch head '
|
|
|
5856
|
'(use -f to force)'))
|
|
5856
|
'(use -f to force)'))
|
|
|
5857
|
node = scmutil.revsingle(repo, rev_).node()
|
|
5857
|
node = scmutil.revsingle(repo, rev_).node()
|
|
|
5858
|
|
|
5858
|
|
|
|
5859
|
if not message:
|
|
5859
|
if not message:
|
|
|
5860
|
# we don't translate commit messages
|
|
5860
|
# we don't translate commit messages
|
|
|
5861
|
message = ('Added tag %s for changeset %s' %
|
|
5861
|
message = ('Added tag %s for changeset %s' %
|
|
|
5862
|
(', '.join(names), short(node)))
|
|
5862
|
(', '.join(names), short(node)))
|
|
|
5863
|
|
|
5863
|
|
|
|
5864
|
date = opts.get('date')
|
|
5864
|
date = opts.get('date')
|
|
|
5865
|
if date:
|
|
5865
|
if date:
|
|
|
5866
|
date = dateutil.parsedate(date)
|
|
5866
|
date = dateutil.parsedate(date)
|
|
|
5867
|
|
|
5867
|
|
|
|
5868
|
if opts.get('remove'):
|
|
5868
|
if opts.get('remove'):
|
|
|
5869
|
editform = 'tag.remove'
|
|
5869
|
editform = 'tag.remove'
|
|
|
5870
|
else:
|
|
5870
|
else:
|
|
|
5871
|
editform = 'tag.add'
|
|
5871
|
editform = 'tag.add'
|
|
|
5872
|
editor = cmdutil.getcommiteditor(editform=editform,
|
|
5872
|
editor = cmdutil.getcommiteditor(editform=editform,
|
|
|
5873
|
**pycompat.strkwargs(opts))
|
|
5873
|
**pycompat.strkwargs(opts))
|
|
|
5874
|
|
|
5874
|
|
|
|
5875
|
# don't allow tagging the null rev
|
|
5875
|
# don't allow tagging the null rev
|
|
|
5876
|
if (not opts.get('remove') and
|
|
5876
|
if (not opts.get('remove') and
|
|
|
5877
|
scmutil.revsingle(repo, rev_).rev() == nullrev):
|
|
5877
|
scmutil.revsingle(repo, rev_).rev() == nullrev):
|
|
|
5878
|
raise error.Abort(_("cannot tag null revision"))
|
|
5878
|
raise error.Abort(_("cannot tag null revision"))
|
|
|
5879
|
|
|
5879
|
|
|
|
5880
|
tagsmod.tag(repo, names, node, message, opts.get('local'),
|
|
5880
|
tagsmod.tag(repo, names, node, message, opts.get('local'),
|
|
|
5881
|
opts.get('user'), date, editor=editor)
|
|
5881
|
opts.get('user'), date, editor=editor)
|
|
|
5882
|
|
|
5882
|
|
|
|
5883
|
@command(
|
|
5883
|
@command(
|
|
|
5884
|
'tags', formatteropts, '',
|
|
5884
|
'tags', formatteropts, '',
|
|
|
5885
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
|
|
5885
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
|
|
|
5886
|
intents={INTENT_READONLY})
|
|
5886
|
intents={INTENT_READONLY})
|
|
|
5887
|
def tags(ui, repo, **opts):
|
|
5887
|
def tags(ui, repo, **opts):
|
|
|
5888
|
"""list repository tags
|
|
5888
|
"""list repository tags
|
|
|
5889
|
|
|
5889
|
|
|
|
5890
|
This lists both regular and local tags. When the -v/--verbose
|
|
5890
|
This lists both regular and local tags. When the -v/--verbose
|
|
|
5891
|
switch is used, a third column "local" is printed for local tags.
|
|
5891
|
switch is used, a third column "local" is printed for local tags.
|
|
|
5892
|
When the -q/--quiet switch is used, only the tag name is printed.
|
|
5892
|
When the -q/--quiet switch is used, only the tag name is printed.
|
|
|
5893
|
|
|
5893
|
|
|
|
5894
|
.. container:: verbose
|
|
5894
|
.. container:: verbose
|
|
|
5895
|
|
|
5895
|
|
|
|
5896
|
Template:
|
|
5896
|
Template:
|
|
|
5897
|
|
|
5897
|
|
|
|
5898
|
The following keywords are supported in addition to the common template
|
|
5898
|
The following keywords are supported in addition to the common template
|
|
|
5899
|
keywords and functions such as ``{tag}``. See also
|
|
5899
|
keywords and functions such as ``{tag}``. See also
|
|
|
5900
|
:hg:`help templates`.
|
|
5900
|
:hg:`help templates`.
|
|
|
5901
|
|
|
5901
|
|
|
|
5902
|
:type: String. ``local`` for local tags.
|
|
5902
|
:type: String. ``local`` for local tags.
|
|
|
5903
|
|
|
5903
|
|
|
|
5904
|
Returns 0 on success.
|
|
5904
|
Returns 0 on success.
|
|
|
5905
|
"""
|
|
5905
|
"""
|
|
|
5906
|
|
|
5906
|
|
|
|
5907
|
opts = pycompat.byteskwargs(opts)
|
|
5907
|
opts = pycompat.byteskwargs(opts)
|
|
|
5908
|
ui.pager('tags')
|
|
5908
|
ui.pager('tags')
|
|
|
5909
|
fm = ui.formatter('tags', opts)
|
|
5909
|
fm = ui.formatter('tags', opts)
|
|
|
5910
|
hexfunc = fm.hexfunc
|
|
5910
|
hexfunc = fm.hexfunc
|
|
|
5911
|
tagtype = ""
|
|
5911
|
tagtype = ""
|
|
|
5912
|
|
|
5912
|
|
|
|
5913
|
for t, n in reversed(repo.tagslist()):
|
|
5913
|
for t, n in reversed(repo.tagslist()):
|
|
|
5914
|
hn = hexfunc(n)
|
|
5914
|
hn = hexfunc(n)
|
|
|
5915
|
label = 'tags.normal'
|
|
5915
|
label = 'tags.normal'
|
|
|
5916
|
tagtype = ''
|
|
5916
|
tagtype = ''
|
|
|
5917
|
if repo.tagtype(t) == 'local':
|
|
5917
|
if repo.tagtype(t) == 'local':
|
|
|
5918
|
label = 'tags.local'
|
|
5918
|
label = 'tags.local'
|
|
|
5919
|
tagtype = 'local'
|
|
5919
|
tagtype = 'local'
|
|
|
5920
|
|
|
5920
|
|
|
|
5921
|
fm.startitem()
|
|
5921
|
fm.startitem()
|
|
|
5922
|
fm.context(repo=repo)
|
|
5922
|
fm.context(repo=repo)
|
|
|
5923
|
fm.write('tag', '%s', t, label=label)
|
|
5923
|
fm.write('tag', '%s', t, label=label)
|
|
|
5924
|
fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
|
|
5924
|
fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
|
|
|
5925
|
fm.condwrite(not ui.quiet, 'rev node', fmt,
|
|
5925
|
fm.condwrite(not ui.quiet, 'rev node', fmt,
|
|
|
5926
|
repo.changelog.rev(n), hn, label=label)
|
|
5926
|
repo.changelog.rev(n), hn, label=label)
|
|
|
5927
|
fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
|
|
5927
|
fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
|
|
|
5928
|
tagtype, label=label)
|
|
5928
|
tagtype, label=label)
|
|
|
5929
|
fm.plain('\n')
|
|
5929
|
fm.plain('\n')
|
|
|
5930
|
fm.end()
|
|
5930
|
fm.end()
|
|
|
5931
|
|
|
5931
|
|
|
|
5932
|
@command('tip',
|
|
5932
|
@command('tip',
|
|
|
5933
|
[('p', 'patch', None, _('show patch')),
|
|
5933
|
[('p', 'patch', None, _('show patch')),
|
|
|
5934
|
('g', 'git', None, _('use git extended diff format')),
|
|
5934
|
('g', 'git', None, _('use git extended diff format')),
|
|
|
5935
|
] + templateopts,
|
|
5935
|
] + templateopts,
|
|
|
5936
|
_('[-p] [-g]'),
|
|
5936
|
_('[-p] [-g]'),
|
|
|
5937
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
|
|
5937
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
|
|
|
5938
|
def tip(ui, repo, **opts):
|
|
5938
|
def tip(ui, repo, **opts):
|
|
|
5939
|
"""show the tip revision (DEPRECATED)
|
|
5939
|
"""show the tip revision (DEPRECATED)
|
|
|
5940
|
|
|
5940
|
|
|
|
5941
|
The tip revision (usually just called the tip) is the changeset
|
|
5941
|
The tip revision (usually just called the tip) is the changeset
|
|
|
5942
|
most recently added to the repository (and therefore the most
|
|
5942
|
most recently added to the repository (and therefore the most
|
|
|
5943
|
recently changed head).
|
|
5943
|
recently changed head).
|
|
|
5944
|
|
|
5944
|
|
|
|
5945
|
If you have just made a commit, that commit will be the tip. If
|
|
5945
|
If you have just made a commit, that commit will be the tip. If
|
|
|
5946
|
you have just pulled changes from another repository, the tip of
|
|
5946
|
you have just pulled changes from another repository, the tip of
|
|
|
5947
|
that repository becomes the current tip. The "tip" tag is special
|
|
5947
|
that repository becomes the current tip. The "tip" tag is special
|
|
|
5948
|
and cannot be renamed or assigned to a different changeset.
|
|
5948
|
and cannot be renamed or assigned to a different changeset.
|
|
|
5949
|
|
|
5949
|
|
|
|
5950
|
This command is deprecated, please use :hg:`heads` instead.
|
|
5950
|
This command is deprecated, please use :hg:`heads` instead.
|
|
|
5951
|
|
|
5951
|
|
|
|
5952
|
Returns 0 on success.
|
|
5952
|
Returns 0 on success.
|
|
|
5953
|
"""
|
|
5953
|
"""
|
|
|
5954
|
opts = pycompat.byteskwargs(opts)
|
|
5954
|
opts = pycompat.byteskwargs(opts)
|
|
|
5955
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
5955
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
5956
|
displayer.show(repo['tip'])
|
|
5956
|
displayer.show(repo['tip'])
|
|
|
5957
|
displayer.close()
|
|
5957
|
displayer.close()
|
|
|
5958
|
|
|
5958
|
|
|
|
5959
|
@command('unbundle',
|
|
5959
|
@command('unbundle',
|
|
|
5960
|
[('u', 'update', None,
|
|
5960
|
[('u', 'update', None,
|
|
|
5961
|
_('update to new branch head if changesets were unbundled'))],
|
|
5961
|
_('update to new branch head if changesets were unbundled'))],
|
|
|
5962
|
_('[-u] FILE...'),
|
|
5962
|
_('[-u] FILE...'),
|
|
|
5963
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
5963
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
5964
|
def unbundle(ui, repo, fname1, *fnames, **opts):
|
|
5964
|
def unbundle(ui, repo, fname1, *fnames, **opts):
|
|
|
5965
|
"""apply one or more bundle files
|
|
5965
|
"""apply one or more bundle files
|
|
|
5966
|
|
|
5966
|
|
|
|
5967
|
Apply one or more bundle files generated by :hg:`bundle`.
|
|
5967
|
Apply one or more bundle files generated by :hg:`bundle`.
|
|
|
5968
|
|
|
5968
|
|
|
|
5969
|
Returns 0 on success, 1 if an update has unresolved files.
|
|
5969
|
Returns 0 on success, 1 if an update has unresolved files.
|
|
|
5970
|
"""
|
|
5970
|
"""
|
|
|
5971
|
fnames = (fname1,) + fnames
|
|
5971
|
fnames = (fname1,) + fnames
|
|
|
5972
|
|
|
5972
|
|
|
|
5973
|
with repo.lock():
|
|
5973
|
with repo.lock():
|
|
|
5974
|
for fname in fnames:
|
|
5974
|
for fname in fnames:
|
|
|
5975
|
f = hg.openpath(ui, fname)
|
|
5975
|
f = hg.openpath(ui, fname)
|
|
|
5976
|
gen = exchange.readbundle(ui, f, fname)
|
|
5976
|
gen = exchange.readbundle(ui, f, fname)
|
|
|
5977
|
if isinstance(gen, streamclone.streamcloneapplier):
|
|
5977
|
if isinstance(gen, streamclone.streamcloneapplier):
|
|
|
5978
|
raise error.Abort(
|
|
5978
|
raise error.Abort(
|
|
|
5979
|
_('packed bundles cannot be applied with '
|
|
5979
|
_('packed bundles cannot be applied with '
|
|
|
5980
|
'"hg unbundle"'),
|
|
5980
|
'"hg unbundle"'),
|
|
|
5981
|
hint=_('use "hg debugapplystreamclonebundle"'))
|
|
5981
|
hint=_('use "hg debugapplystreamclonebundle"'))
|
|
|
5982
|
url = 'bundle:' + fname
|
|
5982
|
url = 'bundle:' + fname
|
|
|
5983
|
try:
|
|
5983
|
try:
|
|
|
5984
|
txnname = 'unbundle'
|
|
5984
|
txnname = 'unbundle'
|
|
|
5985
|
if not isinstance(gen, bundle2.unbundle20):
|
|
5985
|
if not isinstance(gen, bundle2.unbundle20):
|
|
|
5986
|
txnname = 'unbundle\n%s' % util.hidepassword(url)
|
|
5986
|
txnname = 'unbundle\n%s' % util.hidepassword(url)
|
|
|
5987
|
with repo.transaction(txnname) as tr:
|
|
5987
|
with repo.transaction(txnname) as tr:
|
|
|
5988
|
op = bundle2.applybundle(repo, gen, tr, source='unbundle',
|
|
5988
|
op = bundle2.applybundle(repo, gen, tr, source='unbundle',
|
|
|
5989
|
url=url)
|
|
5989
|
url=url)
|
|
|
5990
|
except error.BundleUnknownFeatureError as exc:
|
|
5990
|
except error.BundleUnknownFeatureError as exc:
|
|
|
5991
|
raise error.Abort(
|
|
5991
|
raise error.Abort(
|
|
|
5992
|
_('%s: unknown bundle feature, %s') % (fname, exc),
|
|
5992
|
_('%s: unknown bundle feature, %s') % (fname, exc),
|
|
|
5993
|
hint=_("see https://mercurial-scm.org/"
|
|
5993
|
hint=_("see https://mercurial-scm.org/"
|
|
|
5994
|
"wiki/BundleFeature for more "
|
|
5994
|
"wiki/BundleFeature for more "
|
|
|
5995
|
"information"))
|
|
5995
|
"information"))
|
|
|
5996
|
modheads = bundle2.combinechangegroupresults(op)
|
|
5996
|
modheads = bundle2.combinechangegroupresults(op)
|
|
|
5997
|
|
|
5997
|
|
|
|
5998
|
return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
|
|
5998
|
return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
|
|
|
5999
|
|
|
5999
|
|
|
|
6000
|
@command('update|up|checkout|co',
|
|
6000
|
@command('update|up|checkout|co',
|
|
|
6001
|
[('C', 'clean', None, _('discard uncommitted changes (no backup)')),
|
|
6001
|
[('C', 'clean', None, _('discard uncommitted changes (no backup)')),
|
|
|
6002
|
('c', 'check', None, _('require clean working directory')),
|
|
6002
|
('c', 'check', None, _('require clean working directory')),
|
|
|
6003
|
('m', 'merge', None, _('merge uncommitted changes')),
|
|
6003
|
('m', 'merge', None, _('merge uncommitted changes')),
|
|
|
6004
|
('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
|
|
6004
|
('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
|
|
|
6005
|
('r', 'rev', '', _('revision'), _('REV'))
|
|
6005
|
('r', 'rev', '', _('revision'), _('REV'))
|
|
|
6006
|
] + mergetoolopts,
|
|
6006
|
] + mergetoolopts,
|
|
|
6007
|
_('[-C|-c|-m] [-d DATE] [[-r] REV]'),
|
|
6007
|
_('[-C|-c|-m] [-d DATE] [[-r] REV]'),
|
|
|
6008
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
6008
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
6009
|
helpbasic=True)
|
|
6009
|
helpbasic=True)
|
|
|
6010
|
def update(ui, repo, node=None, **opts):
|
|
6010
|
def update(ui, repo, node=None, **opts):
|
|
|
6011
|
"""update working directory (or switch revisions)
|
|
6011
|
"""update working directory (or switch revisions)
|
|
|
6012
|
|
|
6012
|
|
|
|
6013
|
Update the repository's working directory to the specified
|
|
6013
|
Update the repository's working directory to the specified
|
|
|
6014
|
changeset. If no changeset is specified, update to the tip of the
|
|
6014
|
changeset. If no changeset is specified, update to the tip of the
|
|
|
6015
|
current named branch and move the active bookmark (see :hg:`help
|
|
6015
|
current named branch and move the active bookmark (see :hg:`help
|
|
|
6016
|
bookmarks`).
|
|
6016
|
bookmarks`).
|
|
|
6017
|
|
|
6017
|
|
|
|
6018
|
Update sets the working directory's parent revision to the specified
|
|
6018
|
Update sets the working directory's parent revision to the specified
|
|
|
6019
|
changeset (see :hg:`help parents`).
|
|
6019
|
changeset (see :hg:`help parents`).
|
|
|
6020
|
|
|
6020
|
|
|
|
6021
|
If the changeset is not a descendant or ancestor of the working
|
|
6021
|
If the changeset is not a descendant or ancestor of the working
|
|
|
6022
|
directory's parent and there are uncommitted changes, the update is
|
|
6022
|
directory's parent and there are uncommitted changes, the update is
|
|
|
6023
|
aborted. With the -c/--check option, the working directory is checked
|
|
6023
|
aborted. With the -c/--check option, the working directory is checked
|
|
|
6024
|
for uncommitted changes; if none are found, the working directory is
|
|
6024
|
for uncommitted changes; if none are found, the working directory is
|
|
|
6025
|
updated to the specified changeset.
|
|
6025
|
updated to the specified changeset.
|
|
|
6026
|
|
|
6026
|
|
|
|
6027
|
.. container:: verbose
|
|
6027
|
.. container:: verbose
|
|
|
6028
|
|
|
6028
|
|
|
|
6029
|
The -C/--clean, -c/--check, and -m/--merge options control what
|
|
6029
|
The -C/--clean, -c/--check, and -m/--merge options control what
|
|
|
6030
|
happens if the working directory contains uncommitted changes.
|
|
6030
|
happens if the working directory contains uncommitted changes.
|
|
|
6031
|
At most of one of them can be specified.
|
|
6031
|
At most of one of them can be specified.
|
|
|
6032
|
|
|
6032
|
|
|
|
6033
|
1. If no option is specified, and if
|
|
6033
|
1. If no option is specified, and if
|
|
|
6034
|
the requested changeset is an ancestor or descendant of
|
|
6034
|
the requested changeset is an ancestor or descendant of
|
|
|
6035
|
the working directory's parent, the uncommitted changes
|
|
6035
|
the working directory's parent, the uncommitted changes
|
|
|
6036
|
are merged into the requested changeset and the merged
|
|
6036
|
are merged into the requested changeset and the merged
|
|
|
6037
|
result is left uncommitted. If the requested changeset is
|
|
6037
|
result is left uncommitted. If the requested changeset is
|
|
|
6038
|
not an ancestor or descendant (that is, it is on another
|
|
6038
|
not an ancestor or descendant (that is, it is on another
|
|
|
6039
|
branch), the update is aborted and the uncommitted changes
|
|
6039
|
branch), the update is aborted and the uncommitted changes
|
|
|
6040
|
are preserved.
|
|
6040
|
are preserved.
|
|
|
6041
|
|
|
6041
|
|
|
|
6042
|
2. With the -m/--merge option, the update is allowed even if the
|
|
6042
|
2. With the -m/--merge option, the update is allowed even if the
|
|
|
6043
|
requested changeset is not an ancestor or descendant of
|
|
6043
|
requested changeset is not an ancestor or descendant of
|
|
|
6044
|
the working directory's parent.
|
|
6044
|
the working directory's parent.
|
|
|
6045
|
|
|
6045
|
|
|
|
6046
|
3. With the -c/--check option, the update is aborted and the
|
|
6046
|
3. With the -c/--check option, the update is aborted and the
|
|
|
6047
|
uncommitted changes are preserved.
|
|
6047
|
uncommitted changes are preserved.
|
|
|
6048
|
|
|
6048
|
|
|
|
6049
|
4. With the -C/--clean option, uncommitted changes are discarded and
|
|
6049
|
4. With the -C/--clean option, uncommitted changes are discarded and
|
|
|
6050
|
the working directory is updated to the requested changeset.
|
|
6050
|
the working directory is updated to the requested changeset.
|
|
|
6051
|
|
|
6051
|
|
|
|
6052
|
To cancel an uncommitted merge (and lose your changes), use
|
|
6052
|
To cancel an uncommitted merge (and lose your changes), use
|
|
|
6053
|
:hg:`merge --abort`.
|
|
6053
|
:hg:`merge --abort`.
|
|
|
6054
|
|
|
6054
|
|
|
|
6055
|
Use null as the changeset to remove the working directory (like
|
|
6055
|
Use null as the changeset to remove the working directory (like
|
|
|
6056
|
:hg:`clone -U`).
|
|
6056
|
:hg:`clone -U`).
|
|
|
6057
|
|
|
6057
|
|
|
|
6058
|
If you want to revert just one file to an older revision, use
|
|
6058
|
If you want to revert just one file to an older revision, use
|
|
|
6059
|
:hg:`revert [-r REV] NAME`.
|
|
6059
|
:hg:`revert [-r REV] NAME`.
|
|
|
6060
|
|
|
6060
|
|
|
|
6061
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
6061
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
6062
|
|
|
6062
|
|
|
|
6063
|
Returns 0 on success, 1 if there are unresolved files.
|
|
6063
|
Returns 0 on success, 1 if there are unresolved files.
|
|
|
6064
|
"""
|
|
6064
|
"""
|
|
|
6065
|
rev = opts.get(r'rev')
|
|
6065
|
rev = opts.get(r'rev')
|
|
|
6066
|
date = opts.get(r'date')
|
|
6066
|
date = opts.get(r'date')
|
|
|
6067
|
clean = opts.get(r'clean')
|
|
6067
|
clean = opts.get(r'clean')
|
|
|
6068
|
check = opts.get(r'check')
|
|
6068
|
check = opts.get(r'check')
|
|
|
6069
|
merge = opts.get(r'merge')
|
|
6069
|
merge = opts.get(r'merge')
|
|
|
6070
|
if rev and node:
|
|
6070
|
if rev and node:
|
|
|
6071
|
raise error.Abort(_("please specify just one revision"))
|
|
6071
|
raise error.Abort(_("please specify just one revision"))
|
|
|
6072
|
|
|
6072
|
|
|
|
6073
|
if ui.configbool('commands', 'update.requiredest'):
|
|
6073
|
if ui.configbool('commands', 'update.requiredest'):
|
|
|
6074
|
if not node and not rev and not date:
|
|
6074
|
if not node and not rev and not date:
|
|
|
6075
|
raise error.Abort(_('you must specify a destination'),
|
|
6075
|
raise error.Abort(_('you must specify a destination'),
|
|
|
6076
|
hint=_('for example: hg update ".::"'))
|
|
6076
|
hint=_('for example: hg update ".::"'))
|
|
|
6077
|
|
|
6077
|
|
|
|
6078
|
if rev is None or rev == '':
|
|
6078
|
if rev is None or rev == '':
|
|
|
6079
|
rev = node
|
|
6079
|
rev = node
|
|
|
6080
|
|
|
6080
|
|
|
|
6081
|
if date and rev is not None:
|
|
6081
|
if date and rev is not None:
|
|
|
6082
|
raise error.Abort(_("you can't specify a revision and a date"))
|
|
6082
|
raise error.Abort(_("you can't specify a revision and a date"))
|
|
|
6083
|
|
|
6083
|
|
|
|
6084
|
if len([x for x in (clean, check, merge) if x]) > 1:
|
|
6084
|
if len([x for x in (clean, check, merge) if x]) > 1:
|
|
|
6085
|
raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
|
|
6085
|
raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
|
|
|
6086
|
"or -m/--merge"))
|
|
6086
|
"or -m/--merge"))
|
|
|
6087
|
|
|
6087
|
|
|
|
6088
|
updatecheck = None
|
|
6088
|
updatecheck = None
|
|
|
6089
|
if check:
|
|
6089
|
if check:
|
|
|
6090
|
updatecheck = 'abort'
|
|
6090
|
updatecheck = 'abort'
|
|
|
6091
|
elif merge:
|
|
6091
|
elif merge:
|
|
|
6092
|
updatecheck = 'none'
|
|
6092
|
updatecheck = 'none'
|
|
|
6093
|
|
|
6093
|
|
|
|
6094
|
with repo.wlock():
|
|
6094
|
with repo.wlock():
|
|
|
6095
|
cmdutil.clearunfinished(repo)
|
|
6095
|
cmdutil.clearunfinished(repo)
|
|
|
6096
|
|
|
6096
|
|
|
|
6097
|
if date:
|
|
6097
|
if date:
|
|
|
6098
|
rev = cmdutil.finddate(ui, repo, date)
|
|
6098
|
rev = cmdutil.finddate(ui, repo, date)
|
|
|
6099
|
|
|
6099
|
|
|
|
6100
|
# if we defined a bookmark, we have to remember the original name
|
|
6100
|
# if we defined a bookmark, we have to remember the original name
|
|
|
6101
|
brev = rev
|
|
6101
|
brev = rev
|
|
|
6102
|
if rev:
|
|
6102
|
if rev:
|
|
|
6103
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
6103
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
6104
|
ctx = scmutil.revsingle(repo, rev, default=None)
|
|
6104
|
ctx = scmutil.revsingle(repo, rev, default=None)
|
|
|
6105
|
rev = ctx.rev()
|
|
6105
|
rev = ctx.rev()
|
|
|
6106
|
hidden = ctx.hidden()
|
|
6106
|
hidden = ctx.hidden()
|
|
|
6107
|
overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
|
|
6107
|
overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
|
|
|
6108
|
with ui.configoverride(overrides, 'update'):
|
|
6108
|
with ui.configoverride(overrides, 'update'):
|
|
|
6109
|
ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
|
|
6109
|
ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
|
|
|
6110
|
updatecheck=updatecheck)
|
|
6110
|
updatecheck=updatecheck)
|
|
|
6111
|
if hidden:
|
|
6111
|
if hidden:
|
|
|
6112
|
ctxstr = ctx.hex()[:12]
|
|
6112
|
ctxstr = ctx.hex()[:12]
|
|
|
6113
|
ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
|
|
6113
|
ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
|
|
|
6114
|
|
|
6114
|
|
|
|
6115
|
if ctx.obsolete():
|
|
6115
|
if ctx.obsolete():
|
|
|
6116
|
obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
|
|
6116
|
obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
|
|
|
6117
|
ui.warn("(%s)\n" % obsfatemsg)
|
|
6117
|
ui.warn("(%s)\n" % obsfatemsg)
|
|
|
6118
|
return ret
|
|
6118
|
return ret
|
|
|
6119
|
|
|
6119
|
|
|
|
6120
|
@command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE)
|
|
6120
|
@command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE)
|
|
|
6121
|
def verify(ui, repo):
|
|
6121
|
def verify(ui, repo):
|
|
|
6122
|
"""verify the integrity of the repository
|
|
6122
|
"""verify the integrity of the repository
|
|
|
6123
|
|
|
6123
|
|
|
|
6124
|
Verify the integrity of the current repository.
|
|
6124
|
Verify the integrity of the current repository.
|
|
|
6125
|
|
|
6125
|
|
|
|
6126
|
This will perform an extensive check of the repository's
|
|
6126
|
This will perform an extensive check of the repository's
|
|
|
6127
|
integrity, validating the hashes and checksums of each entry in
|
|
6127
|
integrity, validating the hashes and checksums of each entry in
|
|
|
6128
|
the changelog, manifest, and tracked files, as well as the
|
|
6128
|
the changelog, manifest, and tracked files, as well as the
|
|
|
6129
|
integrity of their crosslinks and indices.
|
|
6129
|
integrity of their crosslinks and indices.
|
|
|
6130
|
|
|
6130
|
|
|
|
6131
|
Please see https://mercurial-scm.org/wiki/RepositoryCorruption
|
|
6131
|
Please see https://mercurial-scm.org/wiki/RepositoryCorruption
|
|
|
6132
|
for more information about recovery from corruption of the
|
|
6132
|
for more information about recovery from corruption of the
|
|
|
6133
|
repository.
|
|
6133
|
repository.
|
|
|
6134
|
|
|
6134
|
|
|
|
6135
|
Returns 0 on success, 1 if errors are encountered.
|
|
6135
|
Returns 0 on success, 1 if errors are encountered.
|
|
|
6136
|
"""
|
|
6136
|
"""
|
|
|
6137
|
return hg.verify(repo)
|
|
6137
|
return hg.verify(repo)
|
|
|
6138
|
|
|
6138
|
|
|
|
6139
|
@command(
|
|
6139
|
@command(
|
|
|
6140
|
'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
|
|
6140
|
'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
|
|
|
6141
|
norepo=True, intents={INTENT_READONLY})
|
|
6141
|
norepo=True, intents={INTENT_READONLY})
|
|
|
6142
|
def version_(ui, **opts):
|
|
6142
|
def version_(ui, **opts):
|
|
|
6143
|
"""output version and copyright information
|
|
6143
|
"""output version and copyright information
|
|
|
6144
|
|
|
6144
|
|
|
|
6145
|
.. container:: verbose
|
|
6145
|
.. container:: verbose
|
|
|
6146
|
|
|
6146
|
|
|
|
6147
|
Template:
|
|
6147
|
Template:
|
|
|
6148
|
|
|
6148
|
|
|
|
6149
|
The following keywords are supported. See also :hg:`help templates`.
|
|
6149
|
The following keywords are supported. See also :hg:`help templates`.
|
|
|
6150
|
|
|
6150
|
|
|
|
6151
|
:extensions: List of extensions.
|
|
6151
|
:extensions: List of extensions.
|
|
|
6152
|
:ver: String. Version number.
|
|
6152
|
:ver: String. Version number.
|
|
|
6153
|
|
|
6153
|
|
|
|
6154
|
And each entry of ``{extensions}`` provides the following sub-keywords
|
|
6154
|
And each entry of ``{extensions}`` provides the following sub-keywords
|
|
|
6155
|
in addition to ``{ver}``.
|
|
6155
|
in addition to ``{ver}``.
|
|
|
6156
|
|
|
6156
|
|
|
|
6157
|
:bundled: Boolean. True if included in the release.
|
|
6157
|
:bundled: Boolean. True if included in the release.
|
|
|
6158
|
:name: String. Extension name.
|
|
6158
|
:name: String. Extension name.
|
|
|
6159
|
"""
|
|
6159
|
"""
|
|
|
6160
|
opts = pycompat.byteskwargs(opts)
|
|
6160
|
opts = pycompat.byteskwargs(opts)
|
|
|
6161
|
if ui.verbose:
|
|
6161
|
if ui.verbose:
|
|
|
6162
|
ui.pager('version')
|
|
6162
|
ui.pager('version')
|
|
|
6163
|
fm = ui.formatter("version", opts)
|
|
6163
|
fm = ui.formatter("version", opts)
|
|
|
6164
|
fm.startitem()
|
|
6164
|
fm.startitem()
|
|
|
6165
|
fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
|
|
6165
|
fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
|
|
|
6166
|
util.version())
|
|
6166
|
util.version())
|
|
|
6167
|
license = _(
|
|
6167
|
license = _(
|
|
|
6168
|
"(see https://mercurial-scm.org for more information)\n"
|
|
6168
|
"(see https://mercurial-scm.org for more information)\n"
|
|
|
6169
|
"\nCopyright (C) 2005-2018 Matt Mackall and others\n"
|
|
6169
|
"\nCopyright (C) 2005-2019 Matt Mackall and others\n"
|
|
|
6170
|
"This is free software; see the source for copying conditions. "
|
|
6170
|
"This is free software; see the source for copying conditions. "
|
|
|
6171
|
"There is NO\nwarranty; "
|
|
6171
|
"There is NO\nwarranty; "
|
|
|
6172
|
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
|
|
6172
|
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
|
|
|
6173
|
)
|
|
6173
|
)
|
|
|
6174
|
if not ui.quiet:
|
|
6174
|
if not ui.quiet:
|
|
|
6175
|
fm.plain(license)
|
|
6175
|
fm.plain(license)
|
|
|
6176
|
|
|
6176
|
|
|
|
6177
|
if ui.verbose:
|
|
6177
|
if ui.verbose:
|
|
|
6178
|
fm.plain(_("\nEnabled extensions:\n\n"))
|
|
6178
|
fm.plain(_("\nEnabled extensions:\n\n"))
|
|
|
6179
|
# format names and versions into columns
|
|
6179
|
# format names and versions into columns
|
|
|
6180
|
names = []
|
|
6180
|
names = []
|
|
|
6181
|
vers = []
|
|
6181
|
vers = []
|
|
|
6182
|
isinternals = []
|
|
6182
|
isinternals = []
|
|
|
6183
|
for name, module in extensions.extensions():
|
|
6183
|
for name, module in extensions.extensions():
|
|
|
6184
|
names.append(name)
|
|
6184
|
names.append(name)
|
|
|
6185
|
vers.append(extensions.moduleversion(module) or None)
|
|
6185
|
vers.append(extensions.moduleversion(module) or None)
|
|
|
6186
|
isinternals.append(extensions.ismoduleinternal(module))
|
|
6186
|
isinternals.append(extensions.ismoduleinternal(module))
|
|
|
6187
|
fn = fm.nested("extensions", tmpl='{name}\n')
|
|
6187
|
fn = fm.nested("extensions", tmpl='{name}\n')
|
|
|
6188
|
if names:
|
|
6188
|
if names:
|
|
|
6189
|
namefmt = " %%-%ds " % max(len(n) for n in names)
|
|
6189
|
namefmt = " %%-%ds " % max(len(n) for n in names)
|
|
|
6190
|
places = [_("external"), _("internal")]
|
|
6190
|
places = [_("external"), _("internal")]
|
|
|
6191
|
for n, v, p in zip(names, vers, isinternals):
|
|
6191
|
for n, v, p in zip(names, vers, isinternals):
|
|
|
6192
|
fn.startitem()
|
|
6192
|
fn.startitem()
|
|
|
6193
|
fn.condwrite(ui.verbose, "name", namefmt, n)
|
|
6193
|
fn.condwrite(ui.verbose, "name", namefmt, n)
|
|
|
6194
|
if ui.verbose:
|
|
6194
|
if ui.verbose:
|
|
|
6195
|
fn.plain("%s " % places[p])
|
|
6195
|
fn.plain("%s " % places[p])
|
|
|
6196
|
fn.data(bundled=p)
|
|
6196
|
fn.data(bundled=p)
|
|
|
6197
|
fn.condwrite(ui.verbose and v, "ver", "%s", v)
|
|
6197
|
fn.condwrite(ui.verbose and v, "ver", "%s", v)
|
|
|
6198
|
if ui.verbose:
|
|
6198
|
if ui.verbose:
|
|
|
6199
|
fn.plain("\n")
|
|
6199
|
fn.plain("\n")
|
|
|
6200
|
fn.end()
|
|
6200
|
fn.end()
|
|
|
6201
|
fm.end()
|
|
6201
|
fm.end()
|
|
|
6202
|
|
|
6202
|
|
|
|
6203
|
def loadcmdtable(ui, name, cmdtable):
|
|
6203
|
def loadcmdtable(ui, name, cmdtable):
|
|
|
6204
|
"""Load command functions from specified cmdtable
|
|
6204
|
"""Load command functions from specified cmdtable
|
|
|
6205
|
"""
|
|
6205
|
"""
|
|
|
6206
|
cmdtable = cmdtable.copy()
|
|
6206
|
cmdtable = cmdtable.copy()
|
|
|
6207
|
for cmd in list(cmdtable):
|
|
6207
|
for cmd in list(cmdtable):
|
|
|
6208
|
if not cmd.startswith('^'):
|
|
6208
|
if not cmd.startswith('^'):
|
|
|
6209
|
continue
|
|
6209
|
continue
|
|
|
6210
|
ui.deprecwarn("old-style command registration '%s' in extension '%s'"
|
|
6210
|
ui.deprecwarn("old-style command registration '%s' in extension '%s'"
|
|
|
6211
|
% (cmd, name), '4.8')
|
|
6211
|
% (cmd, name), '4.8')
|
|
|
6212
|
entry = cmdtable.pop(cmd)
|
|
6212
|
entry = cmdtable.pop(cmd)
|
|
|
6213
|
entry[0].helpbasic = True
|
|
6213
|
entry[0].helpbasic = True
|
|
|
6214
|
cmdtable[cmd[1:]] = entry
|
|
6214
|
cmdtable[cmd[1:]] = entry
|
|
|
6215
|
|
|
6215
|
|
|
|
6216
|
overrides = [cmd for cmd in cmdtable if cmd in table]
|
|
6216
|
overrides = [cmd for cmd in cmdtable if cmd in table]
|
|
|
6217
|
if overrides:
|
|
6217
|
if overrides:
|
|
|
6218
|
ui.warn(_("extension '%s' overrides commands: %s\n")
|
|
6218
|
ui.warn(_("extension '%s' overrides commands: %s\n")
|
|
|
6219
|
% (name, " ".join(overrides)))
|
|
6219
|
% (name, " ".join(overrides)))
|
|
|
6220
|
table.update(cmdtable)
|
|
6220
|
table.update(cmdtable)
|
