Show More
@@ -1,5612 +1,5616 b'' | |||
|
1 | 1 | # commands.py - command processing for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import difflib |
|
11 | 11 | import errno |
|
12 | 12 | import os |
|
13 | 13 | import re |
|
14 | 14 | import sys |
|
15 | 15 | |
|
16 | 16 | from .i18n import _ |
|
17 | 17 | from .node import ( |
|
18 | 18 | hex, |
|
19 | 19 | nullid, |
|
20 | 20 | nullrev, |
|
21 | 21 | short, |
|
22 | 22 | ) |
|
23 | 23 | from . import ( |
|
24 | 24 | archival, |
|
25 | 25 | bookmarks, |
|
26 | 26 | bundle2, |
|
27 | 27 | changegroup, |
|
28 | 28 | cmdutil, |
|
29 | 29 | copies, |
|
30 | 30 | debugcommands as debugcommandsmod, |
|
31 | 31 | destutil, |
|
32 | 32 | dirstateguard, |
|
33 | 33 | discovery, |
|
34 | 34 | encoding, |
|
35 | 35 | error, |
|
36 | 36 | exchange, |
|
37 | 37 | extensions, |
|
38 | 38 | formatter, |
|
39 | 39 | graphmod, |
|
40 | 40 | hbisect, |
|
41 | 41 | help, |
|
42 | 42 | hg, |
|
43 | 43 | lock as lockmod, |
|
44 | 44 | merge as mergemod, |
|
45 | 45 | obsolete, |
|
46 | 46 | patch, |
|
47 | 47 | phases, |
|
48 | 48 | pycompat, |
|
49 | 49 | rcutil, |
|
50 | 50 | registrar, |
|
51 | 51 | revsetlang, |
|
52 | 52 | rewriteutil, |
|
53 | 53 | scmutil, |
|
54 | 54 | server, |
|
55 | 55 | sshserver, |
|
56 | 56 | streamclone, |
|
57 | 57 | tags as tagsmod, |
|
58 | 58 | templatekw, |
|
59 | 59 | ui as uimod, |
|
60 | 60 | util, |
|
61 | 61 | ) |
|
62 | 62 | |
|
63 | 63 | release = lockmod.release |
|
64 | 64 | |
|
65 | 65 | table = {} |
|
66 | 66 | table.update(debugcommandsmod.command._table) |
|
67 | 67 | |
|
68 | 68 | command = registrar.command(table) |
|
69 | 69 | readonly = registrar.command.readonly |
|
70 | 70 | |
|
71 | 71 | # common command options |
|
72 | 72 | |
|
73 | 73 | globalopts = [ |
|
74 | 74 | ('R', 'repository', '', |
|
75 | 75 | _('repository root directory or name of overlay bundle file'), |
|
76 | 76 | _('REPO')), |
|
77 | 77 | ('', 'cwd', '', |
|
78 | 78 | _('change working directory'), _('DIR')), |
|
79 | 79 | ('y', 'noninteractive', None, |
|
80 | 80 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
81 | 81 | ('q', 'quiet', None, _('suppress output')), |
|
82 | 82 | ('v', 'verbose', None, _('enable additional output')), |
|
83 | 83 | ('', 'color', '', |
|
84 | 84 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords |
|
85 | 85 | # and should not be translated |
|
86 | 86 | _("when to colorize (boolean, always, auto, never, or debug)"), |
|
87 | 87 | _('TYPE')), |
|
88 | 88 | ('', 'config', [], |
|
89 | 89 | _('set/override config option (use \'section.name=value\')'), |
|
90 | 90 | _('CONFIG')), |
|
91 | 91 | ('', 'debug', None, _('enable debugging output')), |
|
92 | 92 | ('', 'debugger', None, _('start debugger')), |
|
93 | 93 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
94 | 94 | _('ENCODE')), |
|
95 | 95 | ('', 'encodingmode', encoding.encodingmode, |
|
96 | 96 | _('set the charset encoding mode'), _('MODE')), |
|
97 | 97 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
98 | 98 | ('', 'time', None, _('time how long the command takes')), |
|
99 | 99 | ('', 'profile', None, _('print command execution profile')), |
|
100 | 100 | ('', 'version', None, _('output version information and exit')), |
|
101 | 101 | ('h', 'help', None, _('display help and exit')), |
|
102 | 102 | ('', 'hidden', False, _('consider hidden changesets')), |
|
103 | 103 | ('', 'pager', 'auto', |
|
104 | 104 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), |
|
105 | 105 | ] |
|
106 | 106 | |
|
107 | 107 | dryrunopts = cmdutil.dryrunopts |
|
108 | 108 | remoteopts = cmdutil.remoteopts |
|
109 | 109 | walkopts = cmdutil.walkopts |
|
110 | 110 | commitopts = cmdutil.commitopts |
|
111 | 111 | commitopts2 = cmdutil.commitopts2 |
|
112 | 112 | formatteropts = cmdutil.formatteropts |
|
113 | 113 | templateopts = cmdutil.templateopts |
|
114 | 114 | logopts = cmdutil.logopts |
|
115 | 115 | diffopts = cmdutil.diffopts |
|
116 | 116 | diffwsopts = cmdutil.diffwsopts |
|
117 | 117 | diffopts2 = cmdutil.diffopts2 |
|
118 | 118 | mergetoolopts = cmdutil.mergetoolopts |
|
119 | 119 | similarityopts = cmdutil.similarityopts |
|
120 | 120 | subrepoopts = cmdutil.subrepoopts |
|
121 | 121 | debugrevlogopts = cmdutil.debugrevlogopts |
|
122 | 122 | |
|
123 | 123 | # Commands start here, listed alphabetically |
|
124 | 124 | |
|
125 | 125 | @command('^add', |
|
126 | 126 | walkopts + subrepoopts + dryrunopts, |
|
127 | 127 | _('[OPTION]... [FILE]...'), |
|
128 | 128 | inferrepo=True) |
|
129 | 129 | def add(ui, repo, *pats, **opts): |
|
130 | 130 | """add the specified files on the next commit |
|
131 | 131 | |
|
132 | 132 | Schedule files to be version controlled and added to the |
|
133 | 133 | repository. |
|
134 | 134 | |
|
135 | 135 | The files will be added to the repository at the next commit. To |
|
136 | 136 | undo an add before that, see :hg:`forget`. |
|
137 | 137 | |
|
138 | 138 | If no names are given, add all files to the repository (except |
|
139 | 139 | files matching ``.hgignore``). |
|
140 | 140 | |
|
141 | 141 | .. container:: verbose |
|
142 | 142 | |
|
143 | 143 | Examples: |
|
144 | 144 | |
|
145 | 145 | - New (unknown) files are added |
|
146 | 146 | automatically by :hg:`add`:: |
|
147 | 147 | |
|
148 | 148 | $ ls |
|
149 | 149 | foo.c |
|
150 | 150 | $ hg status |
|
151 | 151 | ? foo.c |
|
152 | 152 | $ hg add |
|
153 | 153 | adding foo.c |
|
154 | 154 | $ hg status |
|
155 | 155 | A foo.c |
|
156 | 156 | |
|
157 | 157 | - Specific files to be added can be specified:: |
|
158 | 158 | |
|
159 | 159 | $ ls |
|
160 | 160 | bar.c foo.c |
|
161 | 161 | $ hg status |
|
162 | 162 | ? bar.c |
|
163 | 163 | ? foo.c |
|
164 | 164 | $ hg add bar.c |
|
165 | 165 | $ hg status |
|
166 | 166 | A bar.c |
|
167 | 167 | ? foo.c |
|
168 | 168 | |
|
169 | 169 | Returns 0 if all files are successfully added. |
|
170 | 170 | """ |
|
171 | 171 | |
|
172 | 172 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) |
|
173 | 173 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) |
|
174 | 174 | return rejected and 1 or 0 |
|
175 | 175 | |
|
176 | 176 | @command('addremove', |
|
177 | 177 | similarityopts + subrepoopts + walkopts + dryrunopts, |
|
178 | 178 | _('[OPTION]... [FILE]...'), |
|
179 | 179 | inferrepo=True) |
|
180 | 180 | def addremove(ui, repo, *pats, **opts): |
|
181 | 181 | """add all new files, delete all missing files |
|
182 | 182 | |
|
183 | 183 | Add all new files and remove all missing files from the |
|
184 | 184 | repository. |
|
185 | 185 | |
|
186 | 186 | Unless names are given, new files are ignored if they match any of |
|
187 | 187 | the patterns in ``.hgignore``. As with add, these changes take |
|
188 | 188 | effect at the next commit. |
|
189 | 189 | |
|
190 | 190 | Use the -s/--similarity option to detect renamed files. This |
|
191 | 191 | option takes a percentage between 0 (disabled) and 100 (files must |
|
192 | 192 | be identical) as its parameter. With a parameter greater than 0, |
|
193 | 193 | this compares every removed file with every added file and records |
|
194 | 194 | those similar enough as renames. Detecting renamed files this way |
|
195 | 195 | can be expensive. After using this option, :hg:`status -C` can be |
|
196 | 196 | used to check which files were identified as moved or renamed. If |
|
197 | 197 | not specified, -s/--similarity defaults to 100 and only renames of |
|
198 | 198 | identical files are detected. |
|
199 | 199 | |
|
200 | 200 | .. container:: verbose |
|
201 | 201 | |
|
202 | 202 | Examples: |
|
203 | 203 | |
|
204 | 204 | - A number of files (bar.c and foo.c) are new, |
|
205 | 205 | while foobar.c has been removed (without using :hg:`remove`) |
|
206 | 206 | from the repository:: |
|
207 | 207 | |
|
208 | 208 | $ ls |
|
209 | 209 | bar.c foo.c |
|
210 | 210 | $ hg status |
|
211 | 211 | ! foobar.c |
|
212 | 212 | ? bar.c |
|
213 | 213 | ? foo.c |
|
214 | 214 | $ hg addremove |
|
215 | 215 | adding bar.c |
|
216 | 216 | adding foo.c |
|
217 | 217 | removing foobar.c |
|
218 | 218 | $ hg status |
|
219 | 219 | A bar.c |
|
220 | 220 | A foo.c |
|
221 | 221 | R foobar.c |
|
222 | 222 | |
|
223 | 223 | - A file foobar.c was moved to foo.c without using :hg:`rename`. |
|
224 | 224 | Afterwards, it was edited slightly:: |
|
225 | 225 | |
|
226 | 226 | $ ls |
|
227 | 227 | foo.c |
|
228 | 228 | $ hg status |
|
229 | 229 | ! foobar.c |
|
230 | 230 | ? foo.c |
|
231 | 231 | $ hg addremove --similarity 90 |
|
232 | 232 | removing foobar.c |
|
233 | 233 | adding foo.c |
|
234 | 234 | recording removal of foobar.c as rename to foo.c (94% similar) |
|
235 | 235 | $ hg status -C |
|
236 | 236 | A foo.c |
|
237 | 237 | foobar.c |
|
238 | 238 | R foobar.c |
|
239 | 239 | |
|
240 | 240 | Returns 0 if all files are successfully added. |
|
241 | 241 | """ |
|
242 | 242 | opts = pycompat.byteskwargs(opts) |
|
243 | 243 | try: |
|
244 | 244 | sim = float(opts.get('similarity') or 100) |
|
245 | 245 | except ValueError: |
|
246 | 246 | raise error.Abort(_('similarity must be a number')) |
|
247 | 247 | if sim < 0 or sim > 100: |
|
248 | 248 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
249 | 249 | matcher = scmutil.match(repo[None], pats, opts) |
|
250 | 250 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) |
|
251 | 251 | |
|
252 | 252 | @command('^annotate|blame', |
|
253 | 253 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
254 | 254 | ('', 'follow', None, |
|
255 | 255 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
256 | 256 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
257 | 257 | ('a', 'text', None, _('treat all files as text')), |
|
258 | 258 | ('u', 'user', None, _('list the author (long with -v)')), |
|
259 | 259 | ('f', 'file', None, _('list the filename')), |
|
260 | 260 | ('d', 'date', None, _('list the date (short with -q)')), |
|
261 | 261 | ('n', 'number', None, _('list the revision number (default)')), |
|
262 | 262 | ('c', 'changeset', None, _('list the changeset')), |
|
263 | 263 | ('l', 'line-number', None, _('show line number at the first appearance')), |
|
264 | 264 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), |
|
265 | 265 | ] + diffwsopts + walkopts + formatteropts, |
|
266 | 266 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), |
|
267 | 267 | inferrepo=True) |
|
268 | 268 | def annotate(ui, repo, *pats, **opts): |
|
269 | 269 | """show changeset information by line for each file |
|
270 | 270 | |
|
271 | 271 | List changes in files, showing the revision id responsible for |
|
272 | 272 | each line. |
|
273 | 273 | |
|
274 | 274 | This command is useful for discovering when a change was made and |
|
275 | 275 | by whom. |
|
276 | 276 | |
|
277 | 277 | If you include --file, --user, or --date, the revision number is |
|
278 | 278 | suppressed unless you also include --number. |
|
279 | 279 | |
|
280 | 280 | Without the -a/--text option, annotate will avoid processing files |
|
281 | 281 | it detects as binary. With -a, annotate will annotate the file |
|
282 | 282 | anyway, although the results will probably be neither useful |
|
283 | 283 | nor desirable. |
|
284 | 284 | |
|
285 | 285 | Returns 0 on success. |
|
286 | 286 | """ |
|
287 | 287 | opts = pycompat.byteskwargs(opts) |
|
288 | 288 | if not pats: |
|
289 | 289 | raise error.Abort(_('at least one filename or pattern is required')) |
|
290 | 290 | |
|
291 | 291 | if opts.get('follow'): |
|
292 | 292 | # --follow is deprecated and now just an alias for -f/--file |
|
293 | 293 | # to mimic the behavior of Mercurial before version 1.5 |
|
294 | 294 | opts['file'] = True |
|
295 | 295 | |
|
296 | 296 | rev = opts.get('rev') |
|
297 | 297 | if rev: |
|
298 | 298 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
299 | 299 | ctx = scmutil.revsingle(repo, rev) |
|
300 | 300 | |
|
301 | 301 | rootfm = ui.formatter('annotate', opts) |
|
302 | 302 | if ui.quiet: |
|
303 | 303 | datefunc = util.shortdate |
|
304 | 304 | else: |
|
305 | 305 | datefunc = util.datestr |
|
306 | 306 | if ctx.rev() is None: |
|
307 | 307 | def hexfn(node): |
|
308 | 308 | if node is None: |
|
309 | 309 | return None |
|
310 | 310 | else: |
|
311 | 311 | return rootfm.hexfunc(node) |
|
312 | 312 | if opts.get('changeset'): |
|
313 | 313 | # omit "+" suffix which is appended to node hex |
|
314 | 314 | def formatrev(rev): |
|
315 | 315 | if rev is None: |
|
316 | 316 | return '%d' % ctx.p1().rev() |
|
317 | 317 | else: |
|
318 | 318 | return '%d' % rev |
|
319 | 319 | else: |
|
320 | 320 | def formatrev(rev): |
|
321 | 321 | if rev is None: |
|
322 | 322 | return '%d+' % ctx.p1().rev() |
|
323 | 323 | else: |
|
324 | 324 | return '%d ' % rev |
|
325 | 325 | def formathex(hex): |
|
326 | 326 | if hex is None: |
|
327 | 327 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) |
|
328 | 328 | else: |
|
329 | 329 | return '%s ' % hex |
|
330 | 330 | else: |
|
331 | 331 | hexfn = rootfm.hexfunc |
|
332 | 332 | formatrev = formathex = pycompat.bytestr |
|
333 | 333 | |
|
334 | 334 | opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser), |
|
335 | 335 | ('number', ' ', lambda x: x.fctx.rev(), formatrev), |
|
336 | 336 | ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex), |
|
337 | 337 | ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), |
|
338 | 338 | ('file', ' ', lambda x: x.fctx.path(), str), |
|
339 | 339 | ('line_number', ':', lambda x: x.lineno, str), |
|
340 | 340 | ] |
|
341 | 341 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} |
|
342 | 342 | |
|
343 | 343 | if (not opts.get('user') and not opts.get('changeset') |
|
344 | 344 | and not opts.get('date') and not opts.get('file')): |
|
345 | 345 | opts['number'] = True |
|
346 | 346 | |
|
347 | 347 | linenumber = opts.get('line_number') is not None |
|
348 | 348 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
349 | 349 | raise error.Abort(_('at least one of -n/-c is required for -l')) |
|
350 | 350 | |
|
351 | 351 | ui.pager('annotate') |
|
352 | 352 | |
|
353 | 353 | if rootfm.isplain(): |
|
354 | 354 | def makefunc(get, fmt): |
|
355 | 355 | return lambda x: fmt(get(x)) |
|
356 | 356 | else: |
|
357 | 357 | def makefunc(get, fmt): |
|
358 | 358 | return get |
|
359 | 359 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap |
|
360 | 360 | if opts.get(op)] |
|
361 | 361 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
362 | 362 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap |
|
363 | 363 | if opts.get(op)) |
|
364 | 364 | |
|
365 | 365 | def bad(x, y): |
|
366 | 366 | raise error.Abort("%s: %s" % (x, y)) |
|
367 | 367 | |
|
368 | 368 | m = scmutil.match(ctx, pats, opts, badfn=bad) |
|
369 | 369 | |
|
370 | 370 | follow = not opts.get('no_follow') |
|
371 | 371 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
|
372 | 372 | whitespace=True) |
|
373 | 373 | skiprevs = opts.get('skip') |
|
374 | 374 | if skiprevs: |
|
375 | 375 | skiprevs = scmutil.revrange(repo, skiprevs) |
|
376 | 376 | |
|
377 | 377 | for abs in ctx.walk(m): |
|
378 | 378 | fctx = ctx[abs] |
|
379 | 379 | rootfm.startitem() |
|
380 | 380 | rootfm.data(abspath=abs, path=m.rel(abs)) |
|
381 | 381 | if not opts.get('text') and fctx.isbinary(): |
|
382 | 382 | rootfm.plain(_("%s: binary file\n") |
|
383 | 383 | % ((pats and m.rel(abs)) or abs)) |
|
384 | 384 | continue |
|
385 | 385 | |
|
386 | 386 | fm = rootfm.nested('lines') |
|
387 | 387 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
388 | 388 | skiprevs=skiprevs, diffopts=diffopts) |
|
389 | 389 | if not lines: |
|
390 | 390 | fm.end() |
|
391 | 391 | continue |
|
392 | 392 | formats = [] |
|
393 | 393 | pieces = [] |
|
394 | 394 | |
|
395 | 395 | for f, sep in funcmap: |
|
396 | 396 | l = [f(n) for n, dummy in lines] |
|
397 | 397 | if fm.isplain(): |
|
398 | 398 | sizes = [encoding.colwidth(x) for x in l] |
|
399 | 399 | ml = max(sizes) |
|
400 | 400 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) |
|
401 | 401 | else: |
|
402 | 402 | formats.append(['%s' for x in l]) |
|
403 | 403 | pieces.append(l) |
|
404 | 404 | |
|
405 | 405 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): |
|
406 | 406 | fm.startitem() |
|
407 | 407 | fm.write(fields, "".join(f), *p) |
|
408 | 408 | if l[0].skip: |
|
409 | 409 | fmt = "* %s" |
|
410 | 410 | else: |
|
411 | 411 | fmt = ": %s" |
|
412 | 412 | fm.write('line', fmt, l[1]) |
|
413 | 413 | |
|
414 | 414 | if not lines[-1][1].endswith('\n'): |
|
415 | 415 | fm.plain('\n') |
|
416 | 416 | fm.end() |
|
417 | 417 | |
|
418 | 418 | rootfm.end() |
|
419 | 419 | |
|
420 | 420 | @command('archive', |
|
421 | 421 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
422 | 422 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
423 | 423 | _('PREFIX')), |
|
424 | 424 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
425 | 425 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
426 | 426 | ] + subrepoopts + walkopts, |
|
427 | 427 | _('[OPTION]... DEST')) |
|
428 | 428 | def archive(ui, repo, dest, **opts): |
|
429 | 429 | '''create an unversioned archive of a repository revision |
|
430 | 430 | |
|
431 | 431 | By default, the revision used is the parent of the working |
|
432 | 432 | directory; use -r/--rev to specify a different revision. |
|
433 | 433 | |
|
434 | 434 | The archive type is automatically detected based on file |
|
435 | 435 | extension (to override, use -t/--type). |
|
436 | 436 | |
|
437 | 437 | .. container:: verbose |
|
438 | 438 | |
|
439 | 439 | Examples: |
|
440 | 440 | |
|
441 | 441 | - create a zip file containing the 1.0 release:: |
|
442 | 442 | |
|
443 | 443 | hg archive -r 1.0 project-1.0.zip |
|
444 | 444 | |
|
445 | 445 | - create a tarball excluding .hg files:: |
|
446 | 446 | |
|
447 | 447 | hg archive project.tar.gz -X ".hg*" |
|
448 | 448 | |
|
449 | 449 | Valid types are: |
|
450 | 450 | |
|
451 | 451 | :``files``: a directory full of files (default) |
|
452 | 452 | :``tar``: tar archive, uncompressed |
|
453 | 453 | :``tbz2``: tar archive, compressed using bzip2 |
|
454 | 454 | :``tgz``: tar archive, compressed using gzip |
|
455 | 455 | :``uzip``: zip archive, uncompressed |
|
456 | 456 | :``zip``: zip archive, compressed using deflate |
|
457 | 457 | |
|
458 | 458 | The exact name of the destination archive or directory is given |
|
459 | 459 | using a format string; see :hg:`help export` for details. |
|
460 | 460 | |
|
461 | 461 | Each member added to an archive file has a directory prefix |
|
462 | 462 | prepended. Use -p/--prefix to specify a format string for the |
|
463 | 463 | prefix. The default is the basename of the archive, with suffixes |
|
464 | 464 | removed. |
|
465 | 465 | |
|
466 | 466 | Returns 0 on success. |
|
467 | 467 | ''' |
|
468 | 468 | |
|
469 | 469 | opts = pycompat.byteskwargs(opts) |
|
470 | 470 | rev = opts.get('rev') |
|
471 | 471 | if rev: |
|
472 | 472 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
473 | 473 | ctx = scmutil.revsingle(repo, rev) |
|
474 | 474 | if not ctx: |
|
475 | 475 | raise error.Abort(_('no working directory: please specify a revision')) |
|
476 | 476 | node = ctx.node() |
|
477 | 477 | dest = cmdutil.makefilename(repo, dest, node) |
|
478 | 478 | if os.path.realpath(dest) == repo.root: |
|
479 | 479 | raise error.Abort(_('repository root cannot be destination')) |
|
480 | 480 | |
|
481 | 481 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
482 | 482 | prefix = opts.get('prefix') |
|
483 | 483 | |
|
484 | 484 | if dest == '-': |
|
485 | 485 | if kind == 'files': |
|
486 | 486 | raise error.Abort(_('cannot archive plain files to stdout')) |
|
487 | 487 | dest = cmdutil.makefileobj(repo, dest) |
|
488 | 488 | if not prefix: |
|
489 | 489 | prefix = os.path.basename(repo.root) + '-%h' |
|
490 | 490 | |
|
491 | 491 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
492 | 492 | match = scmutil.match(ctx, [], opts) |
|
493 | 493 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
494 | 494 | match, prefix, subrepos=opts.get('subrepos')) |
|
495 | 495 | |
|
496 | 496 | @command('backout', |
|
497 | 497 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
498 | 498 | ('', 'commit', None, |
|
499 | 499 | _('commit if no conflicts were encountered (DEPRECATED)')), |
|
500 | 500 | ('', 'no-commit', None, _('do not commit')), |
|
501 | 501 | ('', 'parent', '', |
|
502 | 502 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
503 | 503 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
504 | 504 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
505 | 505 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
506 | 506 | _('[OPTION]... [-r] REV')) |
|
507 | 507 | def backout(ui, repo, node=None, rev=None, **opts): |
|
508 | 508 | '''reverse effect of earlier changeset |
|
509 | 509 | |
|
510 | 510 | Prepare a new changeset with the effect of REV undone in the |
|
511 | 511 | current working directory. If no conflicts were encountered, |
|
512 | 512 | it will be committed immediately. |
|
513 | 513 | |
|
514 | 514 | If REV is the parent of the working directory, then this new changeset |
|
515 | 515 | is committed automatically (unless --no-commit is specified). |
|
516 | 516 | |
|
517 | 517 | .. note:: |
|
518 | 518 | |
|
519 | 519 | :hg:`backout` cannot be used to fix either an unwanted or |
|
520 | 520 | incorrect merge. |
|
521 | 521 | |
|
522 | 522 | .. container:: verbose |
|
523 | 523 | |
|
524 | 524 | Examples: |
|
525 | 525 | |
|
526 | 526 | - Reverse the effect of the parent of the working directory. |
|
527 | 527 | This backout will be committed immediately:: |
|
528 | 528 | |
|
529 | 529 | hg backout -r . |
|
530 | 530 | |
|
531 | 531 | - Reverse the effect of previous bad revision 23:: |
|
532 | 532 | |
|
533 | 533 | hg backout -r 23 |
|
534 | 534 | |
|
535 | 535 | - Reverse the effect of previous bad revision 23 and |
|
536 | 536 | leave changes uncommitted:: |
|
537 | 537 | |
|
538 | 538 | hg backout -r 23 --no-commit |
|
539 | 539 | hg commit -m "Backout revision 23" |
|
540 | 540 | |
|
541 | 541 | By default, the pending changeset will have one parent, |
|
542 | 542 | maintaining a linear history. With --merge, the pending |
|
543 | 543 | changeset will instead have two parents: the old parent of the |
|
544 | 544 | working directory and a new child of REV that simply undoes REV. |
|
545 | 545 | |
|
546 | 546 | Before version 1.7, the behavior without --merge was equivalent |
|
547 | 547 | to specifying --merge followed by :hg:`update --clean .` to |
|
548 | 548 | cancel the merge and leave the child of REV as a head to be |
|
549 | 549 | merged separately. |
|
550 | 550 | |
|
551 | 551 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
552 | 552 | |
|
553 | 553 | See :hg:`help revert` for a way to restore files to the state |
|
554 | 554 | of another revision. |
|
555 | 555 | |
|
556 | 556 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
557 | 557 | files. |
|
558 | 558 | ''' |
|
559 | 559 | wlock = lock = None |
|
560 | 560 | try: |
|
561 | 561 | wlock = repo.wlock() |
|
562 | 562 | lock = repo.lock() |
|
563 | 563 | return _dobackout(ui, repo, node, rev, **opts) |
|
564 | 564 | finally: |
|
565 | 565 | release(lock, wlock) |
|
566 | 566 | |
|
567 | 567 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
568 | 568 | opts = pycompat.byteskwargs(opts) |
|
569 | 569 | if opts.get('commit') and opts.get('no_commit'): |
|
570 | 570 | raise error.Abort(_("cannot use --commit with --no-commit")) |
|
571 | 571 | if opts.get('merge') and opts.get('no_commit'): |
|
572 | 572 | raise error.Abort(_("cannot use --merge with --no-commit")) |
|
573 | 573 | |
|
574 | 574 | if rev and node: |
|
575 | 575 | raise error.Abort(_("please specify just one revision")) |
|
576 | 576 | |
|
577 | 577 | if not rev: |
|
578 | 578 | rev = node |
|
579 | 579 | |
|
580 | 580 | if not rev: |
|
581 | 581 | raise error.Abort(_("please specify a revision to backout")) |
|
582 | 582 | |
|
583 | 583 | date = opts.get('date') |
|
584 | 584 | if date: |
|
585 | 585 | opts['date'] = util.parsedate(date) |
|
586 | 586 | |
|
587 | 587 | cmdutil.checkunfinished(repo) |
|
588 | 588 | cmdutil.bailifchanged(repo) |
|
589 | 589 | node = scmutil.revsingle(repo, rev).node() |
|
590 | 590 | |
|
591 | 591 | op1, op2 = repo.dirstate.parents() |
|
592 | 592 | if not repo.changelog.isancestor(node, op1): |
|
593 | 593 | raise error.Abort(_('cannot backout change that is not an ancestor')) |
|
594 | 594 | |
|
595 | 595 | p1, p2 = repo.changelog.parents(node) |
|
596 | 596 | if p1 == nullid: |
|
597 | 597 | raise error.Abort(_('cannot backout a change with no parents')) |
|
598 | 598 | if p2 != nullid: |
|
599 | 599 | if not opts.get('parent'): |
|
600 | 600 | raise error.Abort(_('cannot backout a merge changeset')) |
|
601 | 601 | p = repo.lookup(opts['parent']) |
|
602 | 602 | if p not in (p1, p2): |
|
603 | 603 | raise error.Abort(_('%s is not a parent of %s') % |
|
604 | 604 | (short(p), short(node))) |
|
605 | 605 | parent = p |
|
606 | 606 | else: |
|
607 | 607 | if opts.get('parent'): |
|
608 | 608 | raise error.Abort(_('cannot use --parent on non-merge changeset')) |
|
609 | 609 | parent = p1 |
|
610 | 610 | |
|
611 | 611 | # the backout should appear on the same branch |
|
612 | 612 | branch = repo.dirstate.branch() |
|
613 | 613 | bheads = repo.branchheads(branch) |
|
614 | 614 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
615 | 615 | if not opts.get('merge') and op1 != node: |
|
616 | 616 | dsguard = dirstateguard.dirstateguard(repo, 'backout') |
|
617 | 617 | try: |
|
618 | 618 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
619 | 619 | 'backout') |
|
620 | 620 | stats = mergemod.update(repo, parent, True, True, node, False) |
|
621 | 621 | repo.setparents(op1, op2) |
|
622 | 622 | dsguard.close() |
|
623 | 623 | hg._showstats(repo, stats) |
|
624 | 624 | if stats[3]: |
|
625 | 625 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
626 | 626 | "file merges\n")) |
|
627 | 627 | return 1 |
|
628 | 628 | finally: |
|
629 | 629 | ui.setconfig('ui', 'forcemerge', '', '') |
|
630 | 630 | lockmod.release(dsguard) |
|
631 | 631 | else: |
|
632 | 632 | hg.clean(repo, node, show_stats=False) |
|
633 | 633 | repo.dirstate.setbranch(branch) |
|
634 | 634 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
635 | 635 | |
|
636 | 636 | if opts.get('no_commit'): |
|
637 | 637 | msg = _("changeset %s backed out, " |
|
638 | 638 | "don't forget to commit.\n") |
|
639 | 639 | ui.status(msg % short(node)) |
|
640 | 640 | return 0 |
|
641 | 641 | |
|
642 | 642 | def commitfunc(ui, repo, message, match, opts): |
|
643 | 643 | editform = 'backout' |
|
644 | 644 | e = cmdutil.getcommiteditor(editform=editform, |
|
645 | 645 | **pycompat.strkwargs(opts)) |
|
646 | 646 | if not message: |
|
647 | 647 | # we don't translate commit messages |
|
648 | 648 | message = "Backed out changeset %s" % short(node) |
|
649 | 649 | e = cmdutil.getcommiteditor(edit=True, editform=editform) |
|
650 | 650 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
651 | 651 | match, editor=e) |
|
652 | 652 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
653 | 653 | if not newnode: |
|
654 | 654 | ui.status(_("nothing changed\n")) |
|
655 | 655 | return 1 |
|
656 | 656 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
657 | 657 | |
|
658 | 658 | def nice(node): |
|
659 | 659 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
660 | 660 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
661 | 661 | (nice(repo.changelog.tip()), nice(node))) |
|
662 | 662 | if opts.get('merge') and op1 != node: |
|
663 | 663 | hg.clean(repo, op1, show_stats=False) |
|
664 | 664 | ui.status(_('merging with changeset %s\n') |
|
665 | 665 | % nice(repo.changelog.tip())) |
|
666 | 666 | try: |
|
667 | 667 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
668 | 668 | 'backout') |
|
669 | 669 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
670 | 670 | finally: |
|
671 | 671 | ui.setconfig('ui', 'forcemerge', '', '') |
|
672 | 672 | return 0 |
|
673 | 673 | |
|
674 | 674 | @command('bisect', |
|
675 | 675 | [('r', 'reset', False, _('reset bisect state')), |
|
676 | 676 | ('g', 'good', False, _('mark changeset good')), |
|
677 | 677 | ('b', 'bad', False, _('mark changeset bad')), |
|
678 | 678 | ('s', 'skip', False, _('skip testing changeset')), |
|
679 | 679 | ('e', 'extend', False, _('extend the bisect range')), |
|
680 | 680 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
681 | 681 | ('U', 'noupdate', False, _('do not update to target'))], |
|
682 | 682 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
683 | 683 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
684 | 684 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
685 | 685 | noupdate=None): |
|
686 | 686 | """subdivision search of changesets |
|
687 | 687 | |
|
688 | 688 | This command helps to find changesets which introduce problems. To |
|
689 | 689 | use, mark the earliest changeset you know exhibits the problem as |
|
690 | 690 | bad, then mark the latest changeset which is free from the problem |
|
691 | 691 | as good. Bisect will update your working directory to a revision |
|
692 | 692 | for testing (unless the -U/--noupdate option is specified). Once |
|
693 | 693 | you have performed tests, mark the working directory as good or |
|
694 | 694 | bad, and bisect will either update to another candidate changeset |
|
695 | 695 | or announce that it has found the bad revision. |
|
696 | 696 | |
|
697 | 697 | As a shortcut, you can also use the revision argument to mark a |
|
698 | 698 | revision as good or bad without checking it out first. |
|
699 | 699 | |
|
700 | 700 | If you supply a command, it will be used for automatic bisection. |
|
701 | 701 | The environment variable HG_NODE will contain the ID of the |
|
702 | 702 | changeset being tested. The exit status of the command will be |
|
703 | 703 | used to mark revisions as good or bad: status 0 means good, 125 |
|
704 | 704 | means to skip the revision, 127 (command not found) will abort the |
|
705 | 705 | bisection, and any other non-zero exit status means the revision |
|
706 | 706 | is bad. |
|
707 | 707 | |
|
708 | 708 | .. container:: verbose |
|
709 | 709 | |
|
710 | 710 | Some examples: |
|
711 | 711 | |
|
712 | 712 | - start a bisection with known bad revision 34, and good revision 12:: |
|
713 | 713 | |
|
714 | 714 | hg bisect --bad 34 |
|
715 | 715 | hg bisect --good 12 |
|
716 | 716 | |
|
717 | 717 | - advance the current bisection by marking current revision as good or |
|
718 | 718 | bad:: |
|
719 | 719 | |
|
720 | 720 | hg bisect --good |
|
721 | 721 | hg bisect --bad |
|
722 | 722 | |
|
723 | 723 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
724 | 724 | that revision is not usable because of another issue):: |
|
725 | 725 | |
|
726 | 726 | hg bisect --skip |
|
727 | 727 | hg bisect --skip 23 |
|
728 | 728 | |
|
729 | 729 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
730 | 730 | |
|
731 | 731 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
732 | 732 | |
|
733 | 733 | - forget the current bisection:: |
|
734 | 734 | |
|
735 | 735 | hg bisect --reset |
|
736 | 736 | |
|
737 | 737 | - use 'make && make tests' to automatically find the first broken |
|
738 | 738 | revision:: |
|
739 | 739 | |
|
740 | 740 | hg bisect --reset |
|
741 | 741 | hg bisect --bad 34 |
|
742 | 742 | hg bisect --good 12 |
|
743 | 743 | hg bisect --command "make && make tests" |
|
744 | 744 | |
|
745 | 745 | - see all changesets whose states are already known in the current |
|
746 | 746 | bisection:: |
|
747 | 747 | |
|
748 | 748 | hg log -r "bisect(pruned)" |
|
749 | 749 | |
|
750 | 750 | - see the changeset currently being bisected (especially useful |
|
751 | 751 | if running with -U/--noupdate):: |
|
752 | 752 | |
|
753 | 753 | hg log -r "bisect(current)" |
|
754 | 754 | |
|
755 | 755 | - see all changesets that took part in the current bisection:: |
|
756 | 756 | |
|
757 | 757 | hg log -r "bisect(range)" |
|
758 | 758 | |
|
759 | 759 | - you can even get a nice graph:: |
|
760 | 760 | |
|
761 | 761 | hg log --graph -r "bisect(range)" |
|
762 | 762 | |
|
763 | 763 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. |
|
764 | 764 | |
|
765 | 765 | Returns 0 on success. |
|
766 | 766 | """ |
|
767 | 767 | # backward compatibility |
|
768 | 768 | if rev in "good bad reset init".split(): |
|
769 | 769 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
770 | 770 | cmd, rev, extra = rev, extra, None |
|
771 | 771 | if cmd == "good": |
|
772 | 772 | good = True |
|
773 | 773 | elif cmd == "bad": |
|
774 | 774 | bad = True |
|
775 | 775 | else: |
|
776 | 776 | reset = True |
|
777 | 777 | elif extra: |
|
778 | 778 | raise error.Abort(_('incompatible arguments')) |
|
779 | 779 | |
|
780 | 780 | incompatibles = { |
|
781 | 781 | '--bad': bad, |
|
782 | 782 | '--command': bool(command), |
|
783 | 783 | '--extend': extend, |
|
784 | 784 | '--good': good, |
|
785 | 785 | '--reset': reset, |
|
786 | 786 | '--skip': skip, |
|
787 | 787 | } |
|
788 | 788 | |
|
789 | 789 | enabled = [x for x in incompatibles if incompatibles[x]] |
|
790 | 790 | |
|
791 | 791 | if len(enabled) > 1: |
|
792 | 792 | raise error.Abort(_('%s and %s are incompatible') % |
|
793 | 793 | tuple(sorted(enabled)[0:2])) |
|
794 | 794 | |
|
795 | 795 | if reset: |
|
796 | 796 | hbisect.resetstate(repo) |
|
797 | 797 | return |
|
798 | 798 | |
|
799 | 799 | state = hbisect.load_state(repo) |
|
800 | 800 | |
|
801 | 801 | # update state |
|
802 | 802 | if good or bad or skip: |
|
803 | 803 | if rev: |
|
804 | 804 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
805 | 805 | else: |
|
806 | 806 | nodes = [repo.lookup('.')] |
|
807 | 807 | if good: |
|
808 | 808 | state['good'] += nodes |
|
809 | 809 | elif bad: |
|
810 | 810 | state['bad'] += nodes |
|
811 | 811 | elif skip: |
|
812 | 812 | state['skip'] += nodes |
|
813 | 813 | hbisect.save_state(repo, state) |
|
814 | 814 | if not (state['good'] and state['bad']): |
|
815 | 815 | return |
|
816 | 816 | |
|
817 | 817 | def mayupdate(repo, node, show_stats=True): |
|
818 | 818 | """common used update sequence""" |
|
819 | 819 | if noupdate: |
|
820 | 820 | return |
|
821 | 821 | cmdutil.checkunfinished(repo) |
|
822 | 822 | cmdutil.bailifchanged(repo) |
|
823 | 823 | return hg.clean(repo, node, show_stats=show_stats) |
|
824 | 824 | |
|
825 | 825 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
826 | 826 | |
|
827 | 827 | if command: |
|
828 | 828 | changesets = 1 |
|
829 | 829 | if noupdate: |
|
830 | 830 | try: |
|
831 | 831 | node = state['current'][0] |
|
832 | 832 | except LookupError: |
|
833 | 833 | raise error.Abort(_('current bisect revision is unknown - ' |
|
834 | 834 | 'start a new bisect to fix')) |
|
835 | 835 | else: |
|
836 | 836 | node, p2 = repo.dirstate.parents() |
|
837 | 837 | if p2 != nullid: |
|
838 | 838 | raise error.Abort(_('current bisect revision is a merge')) |
|
839 | 839 | if rev: |
|
840 | 840 | node = repo[scmutil.revsingle(repo, rev, node)].node() |
|
841 | 841 | try: |
|
842 | 842 | while changesets: |
|
843 | 843 | # update state |
|
844 | 844 | state['current'] = [node] |
|
845 | 845 | hbisect.save_state(repo, state) |
|
846 | 846 | status = ui.system(command, environ={'HG_NODE': hex(node)}, |
|
847 | 847 | blockedtag='bisect_check') |
|
848 | 848 | if status == 125: |
|
849 | 849 | transition = "skip" |
|
850 | 850 | elif status == 0: |
|
851 | 851 | transition = "good" |
|
852 | 852 | # status < 0 means process was killed |
|
853 | 853 | elif status == 127: |
|
854 | 854 | raise error.Abort(_("failed to execute %s") % command) |
|
855 | 855 | elif status < 0: |
|
856 | 856 | raise error.Abort(_("%s killed") % command) |
|
857 | 857 | else: |
|
858 | 858 | transition = "bad" |
|
859 | 859 | state[transition].append(node) |
|
860 | 860 | ctx = repo[node] |
|
861 | 861 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
862 | 862 | hbisect.checkstate(state) |
|
863 | 863 | # bisect |
|
864 | 864 | nodes, changesets, bgood = hbisect.bisect(repo, state) |
|
865 | 865 | # update to next check |
|
866 | 866 | node = nodes[0] |
|
867 | 867 | mayupdate(repo, node, show_stats=False) |
|
868 | 868 | finally: |
|
869 | 869 | state['current'] = [node] |
|
870 | 870 | hbisect.save_state(repo, state) |
|
871 | 871 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) |
|
872 | 872 | return |
|
873 | 873 | |
|
874 | 874 | hbisect.checkstate(state) |
|
875 | 875 | |
|
876 | 876 | # actually bisect |
|
877 | 877 | nodes, changesets, good = hbisect.bisect(repo, state) |
|
878 | 878 | if extend: |
|
879 | 879 | if not changesets: |
|
880 | 880 | extendnode = hbisect.extendrange(repo, state, nodes, good) |
|
881 | 881 | if extendnode is not None: |
|
882 | 882 | ui.write(_("Extending search to changeset %d:%s\n") |
|
883 | 883 | % (extendnode.rev(), extendnode)) |
|
884 | 884 | state['current'] = [extendnode.node()] |
|
885 | 885 | hbisect.save_state(repo, state) |
|
886 | 886 | return mayupdate(repo, extendnode.node()) |
|
887 | 887 | raise error.Abort(_("nothing to extend")) |
|
888 | 888 | |
|
889 | 889 | if changesets == 0: |
|
890 | 890 | hbisect.printresult(ui, repo, state, displayer, nodes, good) |
|
891 | 891 | else: |
|
892 | 892 | assert len(nodes) == 1 # only a single node can be tested next |
|
893 | 893 | node = nodes[0] |
|
894 | 894 | # compute the approximate number of remaining tests |
|
895 | 895 | tests, size = 0, 2 |
|
896 | 896 | while size <= changesets: |
|
897 | 897 | tests, size = tests + 1, size * 2 |
|
898 | 898 | rev = repo.changelog.rev(node) |
|
899 | 899 | ui.write(_("Testing changeset %d:%s " |
|
900 | 900 | "(%d changesets remaining, ~%d tests)\n") |
|
901 | 901 | % (rev, short(node), changesets, tests)) |
|
902 | 902 | state['current'] = [node] |
|
903 | 903 | hbisect.save_state(repo, state) |
|
904 | 904 | return mayupdate(repo, node) |
|
905 | 905 | |
|
906 | 906 | @command('bookmarks|bookmark', |
|
907 | 907 | [('f', 'force', False, _('force')), |
|
908 | 908 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), |
|
909 | 909 | ('d', 'delete', False, _('delete a given bookmark')), |
|
910 | 910 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), |
|
911 | 911 | ('i', 'inactive', False, _('mark a bookmark inactive')), |
|
912 | 912 | ] + formatteropts, |
|
913 | 913 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
914 | 914 | def bookmark(ui, repo, *names, **opts): |
|
915 | 915 | '''create a new bookmark or list existing bookmarks |
|
916 | 916 | |
|
917 | 917 | Bookmarks are labels on changesets to help track lines of development. |
|
918 | 918 | Bookmarks are unversioned and can be moved, renamed and deleted. |
|
919 | 919 | Deleting or moving a bookmark has no effect on the associated changesets. |
|
920 | 920 | |
|
921 | 921 | Creating or updating to a bookmark causes it to be marked as 'active'. |
|
922 | 922 | The active bookmark is indicated with a '*'. |
|
923 | 923 | When a commit is made, the active bookmark will advance to the new commit. |
|
924 | 924 | A plain :hg:`update` will also advance an active bookmark, if possible. |
|
925 | 925 | Updating away from a bookmark will cause it to be deactivated. |
|
926 | 926 | |
|
927 | 927 | Bookmarks can be pushed and pulled between repositories (see |
|
928 | 928 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
|
929 | 929 | diverged, a new 'divergent bookmark' of the form 'name@path' will |
|
930 | 930 | be created. Using :hg:`merge` will resolve the divergence. |
|
931 | 931 | |
|
932 | 932 | Specifying bookmark as '.' to -m or -d options is equivalent to specifying |
|
933 | 933 | the active bookmark's name. |
|
934 | 934 | |
|
935 | 935 | A bookmark named '@' has the special property that :hg:`clone` will |
|
936 | 936 | check it out by default if it exists. |
|
937 | 937 | |
|
938 | 938 | .. container:: verbose |
|
939 | 939 | |
|
940 | 940 | Examples: |
|
941 | 941 | |
|
942 | 942 | - create an active bookmark for a new line of development:: |
|
943 | 943 | |
|
944 | 944 | hg book new-feature |
|
945 | 945 | |
|
946 | 946 | - create an inactive bookmark as a place marker:: |
|
947 | 947 | |
|
948 | 948 | hg book -i reviewed |
|
949 | 949 | |
|
950 | 950 | - create an inactive bookmark on another changeset:: |
|
951 | 951 | |
|
952 | 952 | hg book -r .^ tested |
|
953 | 953 | |
|
954 | 954 | - rename bookmark turkey to dinner:: |
|
955 | 955 | |
|
956 | 956 | hg book -m turkey dinner |
|
957 | 957 | |
|
958 | 958 | - move the '@' bookmark from another branch:: |
|
959 | 959 | |
|
960 | 960 | hg book -f @ |
|
961 | 961 | ''' |
|
962 | 962 | force = opts.get(r'force') |
|
963 | 963 | rev = opts.get(r'rev') |
|
964 | 964 | delete = opts.get(r'delete') |
|
965 | 965 | rename = opts.get(r'rename') |
|
966 | 966 | inactive = opts.get(r'inactive') |
|
967 | 967 | |
|
968 | 968 | if delete and rename: |
|
969 | 969 | raise error.Abort(_("--delete and --rename are incompatible")) |
|
970 | 970 | if delete and rev: |
|
971 | 971 | raise error.Abort(_("--rev is incompatible with --delete")) |
|
972 | 972 | if rename and rev: |
|
973 | 973 | raise error.Abort(_("--rev is incompatible with --rename")) |
|
974 | 974 | if not names and (delete or rev): |
|
975 | 975 | raise error.Abort(_("bookmark name required")) |
|
976 | 976 | |
|
977 | 977 | if delete or rename or names or inactive: |
|
978 | 978 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: |
|
979 | 979 | if delete: |
|
980 | 980 | names = pycompat.maplist(repo._bookmarks.expandname, names) |
|
981 | 981 | bookmarks.delete(repo, tr, names) |
|
982 | 982 | elif rename: |
|
983 | 983 | if not names: |
|
984 | 984 | raise error.Abort(_("new bookmark name required")) |
|
985 | 985 | elif len(names) > 1: |
|
986 | 986 | raise error.Abort(_("only one new bookmark name allowed")) |
|
987 | 987 | rename = repo._bookmarks.expandname(rename) |
|
988 | 988 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) |
|
989 | 989 | elif names: |
|
990 | 990 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
|
991 | 991 | elif inactive: |
|
992 | 992 | if len(repo._bookmarks) == 0: |
|
993 | 993 | ui.status(_("no bookmarks set\n")) |
|
994 | 994 | elif not repo._activebookmark: |
|
995 | 995 | ui.status(_("no active bookmark\n")) |
|
996 | 996 | else: |
|
997 | 997 | bookmarks.deactivate(repo) |
|
998 | 998 | else: # show bookmarks |
|
999 | 999 | bookmarks.printbookmarks(ui, repo, **opts) |
|
1000 | 1000 | |
|
1001 | 1001 | @command('branch', |
|
1002 | 1002 | [('f', 'force', None, |
|
1003 | 1003 | _('set branch name even if it shadows an existing branch')), |
|
1004 | 1004 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
1005 | 1005 | _('[-fC] [NAME]')) |
|
1006 | 1006 | def branch(ui, repo, label=None, **opts): |
|
1007 | 1007 | """set or show the current branch name |
|
1008 | 1008 | |
|
1009 | 1009 | .. note:: |
|
1010 | 1010 | |
|
1011 | 1011 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
1012 | 1012 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
1013 | 1013 | information about named branches and bookmarks. |
|
1014 | 1014 | |
|
1015 | 1015 | With no argument, show the current branch name. With one argument, |
|
1016 | 1016 | set the working directory branch name (the branch will not exist |
|
1017 | 1017 | in the repository until the next commit). Standard practice |
|
1018 | 1018 | recommends that primary development take place on the 'default' |
|
1019 | 1019 | branch. |
|
1020 | 1020 | |
|
1021 | 1021 | Unless -f/--force is specified, branch will not let you set a |
|
1022 | 1022 | branch name that already exists. |
|
1023 | 1023 | |
|
1024 | 1024 | Use -C/--clean to reset the working directory branch to that of |
|
1025 | 1025 | the parent of the working directory, negating a previous branch |
|
1026 | 1026 | change. |
|
1027 | 1027 | |
|
1028 | 1028 | Use the command :hg:`update` to switch to an existing branch. Use |
|
1029 | 1029 | :hg:`commit --close-branch` to mark this branch head as closed. |
|
1030 | 1030 | When all heads of a branch are closed, the branch will be |
|
1031 | 1031 | considered closed. |
|
1032 | 1032 | |
|
1033 | 1033 | Returns 0 on success. |
|
1034 | 1034 | """ |
|
1035 | 1035 | opts = pycompat.byteskwargs(opts) |
|
1036 | 1036 | if label: |
|
1037 | 1037 | label = label.strip() |
|
1038 | 1038 | |
|
1039 | 1039 | if not opts.get('clean') and not label: |
|
1040 | 1040 | ui.write("%s\n" % repo.dirstate.branch()) |
|
1041 | 1041 | return |
|
1042 | 1042 | |
|
1043 | 1043 | with repo.wlock(): |
|
1044 | 1044 | if opts.get('clean'): |
|
1045 | 1045 | label = repo[None].p1().branch() |
|
1046 | 1046 | repo.dirstate.setbranch(label) |
|
1047 | 1047 | ui.status(_('reset working directory to branch %s\n') % label) |
|
1048 | 1048 | elif label: |
|
1049 | 1049 | if not opts.get('force') and label in repo.branchmap(): |
|
1050 | 1050 | if label not in [p.branch() for p in repo[None].parents()]: |
|
1051 | 1051 | raise error.Abort(_('a branch of the same name already' |
|
1052 | 1052 | ' exists'), |
|
1053 | 1053 | # i18n: "it" refers to an existing branch |
|
1054 | 1054 | hint=_("use 'hg update' to switch to it")) |
|
1055 | 1055 | scmutil.checknewlabel(repo, label, 'branch') |
|
1056 | 1056 | repo.dirstate.setbranch(label) |
|
1057 | 1057 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1058 | 1058 | |
|
1059 | 1059 | # find any open named branches aside from default |
|
1060 | 1060 | others = [n for n, h, t, c in repo.branchmap().iterbranches() |
|
1061 | 1061 | if n != "default" and not c] |
|
1062 | 1062 | if not others: |
|
1063 | 1063 | ui.status(_('(branches are permanent and global, ' |
|
1064 | 1064 | 'did you want a bookmark?)\n')) |
|
1065 | 1065 | |
|
1066 | 1066 | @command('branches', |
|
1067 | 1067 | [('a', 'active', False, |
|
1068 | 1068 | _('show only branches that have unmerged heads (DEPRECATED)')), |
|
1069 | 1069 | ('c', 'closed', False, _('show normal and closed branches')), |
|
1070 | 1070 | ] + formatteropts, |
|
1071 | 1071 | _('[-c]'), cmdtype=readonly) |
|
1072 | 1072 | def branches(ui, repo, active=False, closed=False, **opts): |
|
1073 | 1073 | """list repository named branches |
|
1074 | 1074 | |
|
1075 | 1075 | List the repository's named branches, indicating which ones are |
|
1076 | 1076 | inactive. If -c/--closed is specified, also list branches which have |
|
1077 | 1077 | been marked closed (see :hg:`commit --close-branch`). |
|
1078 | 1078 | |
|
1079 | 1079 | Use the command :hg:`update` to switch to an existing branch. |
|
1080 | 1080 | |
|
1081 | 1081 | Returns 0. |
|
1082 | 1082 | """ |
|
1083 | 1083 | |
|
1084 | 1084 | opts = pycompat.byteskwargs(opts) |
|
1085 | 1085 | ui.pager('branches') |
|
1086 | 1086 | fm = ui.formatter('branches', opts) |
|
1087 | 1087 | hexfunc = fm.hexfunc |
|
1088 | 1088 | |
|
1089 | 1089 | allheads = set(repo.heads()) |
|
1090 | 1090 | branches = [] |
|
1091 | 1091 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1092 | 1092 | isactive = False |
|
1093 | 1093 | if not isclosed: |
|
1094 | 1094 | openheads = set(repo.branchmap().iteropen(heads)) |
|
1095 | 1095 | isactive = bool(openheads & allheads) |
|
1096 | 1096 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1097 | 1097 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1098 | 1098 | reverse=True) |
|
1099 | 1099 | |
|
1100 | 1100 | for tag, ctx, isactive, isopen in branches: |
|
1101 | 1101 | if active and not isactive: |
|
1102 | 1102 | continue |
|
1103 | 1103 | if isactive: |
|
1104 | 1104 | label = 'branches.active' |
|
1105 | 1105 | notice = '' |
|
1106 | 1106 | elif not isopen: |
|
1107 | 1107 | if not closed: |
|
1108 | 1108 | continue |
|
1109 | 1109 | label = 'branches.closed' |
|
1110 | 1110 | notice = _(' (closed)') |
|
1111 | 1111 | else: |
|
1112 | 1112 | label = 'branches.inactive' |
|
1113 | 1113 | notice = _(' (inactive)') |
|
1114 | 1114 | current = (tag == repo.dirstate.branch()) |
|
1115 | 1115 | if current: |
|
1116 | 1116 | label = 'branches.current' |
|
1117 | 1117 | |
|
1118 | 1118 | fm.startitem() |
|
1119 | 1119 | fm.write('branch', '%s', tag, label=label) |
|
1120 | 1120 | rev = ctx.rev() |
|
1121 | 1121 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) |
|
1122 | 1122 | fmt = ' ' * padsize + ' %d:%s' |
|
1123 | 1123 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), |
|
1124 | 1124 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
1125 | 1125 | fm.context(ctx=ctx) |
|
1126 | 1126 | fm.data(active=isactive, closed=not isopen, current=current) |
|
1127 | 1127 | if not ui.quiet: |
|
1128 | 1128 | fm.plain(notice) |
|
1129 | 1129 | fm.plain('\n') |
|
1130 | 1130 | fm.end() |
|
1131 | 1131 | |
|
1132 | 1132 | @command('bundle', |
|
1133 | 1133 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1134 | 1134 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1135 | 1135 | _('REV')), |
|
1136 | 1136 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1137 | 1137 | _('BRANCH')), |
|
1138 | 1138 | ('', 'base', [], |
|
1139 | 1139 | _('a base changeset assumed to be available at the destination'), |
|
1140 | 1140 | _('REV')), |
|
1141 | 1141 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1142 | 1142 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1143 | 1143 | ] + remoteopts, |
|
1144 | 1144 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1145 | 1145 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1146 | 1146 | """create a bundle file |
|
1147 | 1147 | |
|
1148 | 1148 | Generate a bundle file containing data to be added to a repository. |
|
1149 | 1149 | |
|
1150 | 1150 | To create a bundle containing all changesets, use -a/--all |
|
1151 | 1151 | (or --base null). Otherwise, hg assumes the destination will have |
|
1152 | 1152 | all the nodes you specify with --base parameters. Otherwise, hg |
|
1153 | 1153 | will assume the repository has all the nodes in destination, or |
|
1154 | 1154 | default-push/default if no destination is specified. |
|
1155 | 1155 | |
|
1156 | 1156 | You can change bundle format with the -t/--type option. See |
|
1157 | 1157 | :hg:`help bundlespec` for documentation on this format. By default, |
|
1158 | 1158 | the most appropriate format is used and compression defaults to |
|
1159 | 1159 | bzip2. |
|
1160 | 1160 | |
|
1161 | 1161 | The bundle file can then be transferred using conventional means |
|
1162 | 1162 | and applied to another repository with the unbundle or pull |
|
1163 | 1163 | command. This is useful when direct push and pull are not |
|
1164 | 1164 | available or when exporting an entire repository is undesirable. |
|
1165 | 1165 | |
|
1166 | 1166 | Applying bundles preserves all changeset contents including |
|
1167 | 1167 | permissions, copy/rename information, and revision history. |
|
1168 | 1168 | |
|
1169 | 1169 | Returns 0 on success, 1 if no changes found. |
|
1170 | 1170 | """ |
|
1171 | 1171 | opts = pycompat.byteskwargs(opts) |
|
1172 | 1172 | revs = None |
|
1173 | 1173 | if 'rev' in opts: |
|
1174 | 1174 | revstrings = opts['rev'] |
|
1175 | 1175 | revs = scmutil.revrange(repo, revstrings) |
|
1176 | 1176 | if revstrings and not revs: |
|
1177 | 1177 | raise error.Abort(_('no commits to bundle')) |
|
1178 | 1178 | |
|
1179 | 1179 | bundletype = opts.get('type', 'bzip2').lower() |
|
1180 | 1180 | try: |
|
1181 | 1181 | bcompression, cgversion, params = exchange.parsebundlespec( |
|
1182 | 1182 | repo, bundletype, strict=False) |
|
1183 | 1183 | except error.UnsupportedBundleSpecification as e: |
|
1184 | 1184 | raise error.Abort(str(e), |
|
1185 | 1185 | hint=_("see 'hg help bundlespec' for supported " |
|
1186 | 1186 | "values for --type")) |
|
1187 | 1187 | |
|
1188 | 1188 | # Packed bundles are a pseudo bundle format for now. |
|
1189 | 1189 | if cgversion == 's1': |
|
1190 | 1190 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), |
|
1191 | 1191 | hint=_("use 'hg debugcreatestreamclonebundle'")) |
|
1192 | 1192 | |
|
1193 | 1193 | if opts.get('all'): |
|
1194 | 1194 | if dest: |
|
1195 | 1195 | raise error.Abort(_("--all is incompatible with specifying " |
|
1196 | 1196 | "a destination")) |
|
1197 | 1197 | if opts.get('base'): |
|
1198 | 1198 | ui.warn(_("ignoring --base because --all was specified\n")) |
|
1199 | 1199 | base = ['null'] |
|
1200 | 1200 | else: |
|
1201 | 1201 | base = scmutil.revrange(repo, opts.get('base')) |
|
1202 | 1202 | if cgversion not in changegroup.supportedoutgoingversions(repo): |
|
1203 | 1203 | raise error.Abort(_("repository does not support bundle version %s") % |
|
1204 | 1204 | cgversion) |
|
1205 | 1205 | |
|
1206 | 1206 | if base: |
|
1207 | 1207 | if dest: |
|
1208 | 1208 | raise error.Abort(_("--base is incompatible with specifying " |
|
1209 | 1209 | "a destination")) |
|
1210 | 1210 | common = [repo.lookup(rev) for rev in base] |
|
1211 | 1211 | heads = revs and map(repo.lookup, revs) or None |
|
1212 | 1212 | outgoing = discovery.outgoing(repo, common, heads) |
|
1213 | 1213 | else: |
|
1214 | 1214 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1215 | 1215 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1216 | 1216 | other = hg.peer(repo, opts, dest) |
|
1217 | 1217 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1218 | 1218 | heads = revs and map(repo.lookup, revs) or revs |
|
1219 | 1219 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1220 | 1220 | onlyheads=heads, |
|
1221 | 1221 | force=opts.get('force'), |
|
1222 | 1222 | portable=True) |
|
1223 | 1223 | |
|
1224 | 1224 | if not outgoing.missing: |
|
1225 | 1225 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) |
|
1226 | 1226 | return 1 |
|
1227 | 1227 | |
|
1228 | 1228 | if cgversion == '01': #bundle1 |
|
1229 | 1229 | if bcompression is None: |
|
1230 | 1230 | bcompression = 'UN' |
|
1231 | 1231 | bversion = 'HG10' + bcompression |
|
1232 | 1232 | bcompression = None |
|
1233 | 1233 | elif cgversion in ('02', '03'): |
|
1234 | 1234 | bversion = 'HG20' |
|
1235 | 1235 | else: |
|
1236 | 1236 | raise error.ProgrammingError( |
|
1237 | 1237 | 'bundle: unexpected changegroup version %s' % cgversion) |
|
1238 | 1238 | |
|
1239 | 1239 | # TODO compression options should be derived from bundlespec parsing. |
|
1240 | 1240 | # This is a temporary hack to allow adjusting bundle compression |
|
1241 | 1241 | # level without a) formalizing the bundlespec changes to declare it |
|
1242 | 1242 | # b) introducing a command flag. |
|
1243 | 1243 | compopts = {} |
|
1244 | 1244 | complevel = ui.configint('experimental', 'bundlecomplevel') |
|
1245 | 1245 | if complevel is not None: |
|
1246 | 1246 | compopts['level'] = complevel |
|
1247 | 1247 | |
|
1248 | 1248 | |
|
1249 | 1249 | contentopts = {'cg.version': cgversion} |
|
1250 | 1250 | if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): |
|
1251 | 1251 | contentopts['obsolescence'] = True |
|
1252 | 1252 | if repo.ui.configbool('experimental', 'bundle-phases'): |
|
1253 | 1253 | contentopts['phases'] = True |
|
1254 | 1254 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, |
|
1255 | 1255 | contentopts, compression=bcompression, |
|
1256 | 1256 | compopts=compopts) |
|
1257 | 1257 | |
|
1258 | 1258 | @command('cat', |
|
1259 | 1259 | [('o', 'output', '', |
|
1260 | 1260 | _('print output to file with formatted name'), _('FORMAT')), |
|
1261 | 1261 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1262 | 1262 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1263 | 1263 | ] + walkopts + formatteropts, |
|
1264 | 1264 | _('[OPTION]... FILE...'), |
|
1265 | 1265 | inferrepo=True, cmdtype=readonly) |
|
1266 | 1266 | def cat(ui, repo, file1, *pats, **opts): |
|
1267 | 1267 | """output the current or given revision of files |
|
1268 | 1268 | |
|
1269 | 1269 | Print the specified files as they were at the given revision. If |
|
1270 | 1270 | no revision is given, the parent of the working directory is used. |
|
1271 | 1271 | |
|
1272 | 1272 | Output may be to a file, in which case the name of the file is |
|
1273 | 1273 | given using a format string. The formatting rules as follows: |
|
1274 | 1274 | |
|
1275 | 1275 | :``%%``: literal "%" character |
|
1276 | 1276 | :``%s``: basename of file being printed |
|
1277 | 1277 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1278 | 1278 | :``%p``: root-relative path name of file being printed |
|
1279 | 1279 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1280 | 1280 | :``%R``: changeset revision number |
|
1281 | 1281 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1282 | 1282 | :``%r``: zero-padded changeset revision number |
|
1283 | 1283 | :``%b``: basename of the exporting repository |
|
1284 | 1284 | |
|
1285 | 1285 | Returns 0 on success. |
|
1286 | 1286 | """ |
|
1287 | 1287 | opts = pycompat.byteskwargs(opts) |
|
1288 | 1288 | rev = opts.get('rev') |
|
1289 | 1289 | if rev: |
|
1290 | 1290 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
1291 | 1291 | ctx = scmutil.revsingle(repo, rev) |
|
1292 | 1292 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1293 | 1293 | fntemplate = opts.pop('output', '') |
|
1294 | 1294 | if cmdutil.isstdiofilename(fntemplate): |
|
1295 | 1295 | fntemplate = '' |
|
1296 | 1296 | |
|
1297 | 1297 | if fntemplate: |
|
1298 | 1298 | fm = formatter.nullformatter(ui, 'cat') |
|
1299 | 1299 | else: |
|
1300 | 1300 | ui.pager('cat') |
|
1301 | 1301 | fm = ui.formatter('cat', opts) |
|
1302 | 1302 | with fm: |
|
1303 | 1303 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', |
|
1304 | 1304 | **pycompat.strkwargs(opts)) |
|
1305 | 1305 | |
|
1306 | 1306 | @command('^clone', |
|
1307 | 1307 | [('U', 'noupdate', None, _('the clone will include an empty working ' |
|
1308 | 1308 | 'directory (only a repository)')), |
|
1309 | 1309 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), |
|
1310 | 1310 | _('REV')), |
|
1311 | 1311 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1312 | 1312 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1313 | 1313 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1314 | 1314 | ('', 'uncompressed', None, |
|
1315 | 1315 | _('an alias to --stream (DEPRECATED)')), |
|
1316 | 1316 | ('', 'stream', None, |
|
1317 | 1317 | _('clone with minimal data processing')), |
|
1318 | 1318 | ] + remoteopts, |
|
1319 | 1319 | _('[OPTION]... SOURCE [DEST]'), |
|
1320 | 1320 | norepo=True) |
|
1321 | 1321 | def clone(ui, source, dest=None, **opts): |
|
1322 | 1322 | """make a copy of an existing repository |
|
1323 | 1323 | |
|
1324 | 1324 | Create a copy of an existing repository in a new directory. |
|
1325 | 1325 | |
|
1326 | 1326 | If no destination directory name is specified, it defaults to the |
|
1327 | 1327 | basename of the source. |
|
1328 | 1328 | |
|
1329 | 1329 | The location of the source is added to the new repository's |
|
1330 | 1330 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1331 | 1331 | |
|
1332 | 1332 | Only local paths and ``ssh://`` URLs are supported as |
|
1333 | 1333 | destinations. For ``ssh://`` destinations, no working directory or |
|
1334 | 1334 | ``.hg/hgrc`` will be created on the remote side. |
|
1335 | 1335 | |
|
1336 | 1336 | If the source repository has a bookmark called '@' set, that |
|
1337 | 1337 | revision will be checked out in the new repository by default. |
|
1338 | 1338 | |
|
1339 | 1339 | To check out a particular version, use -u/--update, or |
|
1340 | 1340 | -U/--noupdate to create a clone with no working directory. |
|
1341 | 1341 | |
|
1342 | 1342 | To pull only a subset of changesets, specify one or more revisions |
|
1343 | 1343 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1344 | 1344 | resulting clone will contain only the specified changesets and |
|
1345 | 1345 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1346 | 1346 | --pull, even for local source repositories. |
|
1347 | 1347 | |
|
1348 | 1348 | In normal clone mode, the remote normalizes repository data into a common |
|
1349 | 1349 | exchange format and the receiving end translates this data into its local |
|
1350 | 1350 | storage format. --stream activates a different clone mode that essentially |
|
1351 | 1351 | copies repository files from the remote with minimal data processing. This |
|
1352 | 1352 | significantly reduces the CPU cost of a clone both remotely and locally. |
|
1353 | 1353 | However, it often increases the transferred data size by 30-40%. This can |
|
1354 | 1354 | result in substantially faster clones where I/O throughput is plentiful, |
|
1355 | 1355 | especially for larger repositories. A side-effect of --stream clones is |
|
1356 | 1356 | that storage settings and requirements on the remote are applied locally: |
|
1357 | 1357 | a modern client may inherit legacy or inefficient storage used by the |
|
1358 | 1358 | remote or a legacy Mercurial client may not be able to clone from a |
|
1359 | 1359 | modern Mercurial remote. |
|
1360 | 1360 | |
|
1361 | 1361 | .. note:: |
|
1362 | 1362 | |
|
1363 | 1363 | Specifying a tag will include the tagged changeset but not the |
|
1364 | 1364 | changeset containing the tag. |
|
1365 | 1365 | |
|
1366 | 1366 | .. container:: verbose |
|
1367 | 1367 | |
|
1368 | 1368 | For efficiency, hardlinks are used for cloning whenever the |
|
1369 | 1369 | source and destination are on the same filesystem (note this |
|
1370 | 1370 | applies only to the repository data, not to the working |
|
1371 | 1371 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1372 | 1372 | incorrectly, but do not report errors. In these cases, use the |
|
1373 | 1373 | --pull option to avoid hardlinking. |
|
1374 | 1374 | |
|
1375 | 1375 | Mercurial will update the working directory to the first applicable |
|
1376 | 1376 | revision from this list: |
|
1377 | 1377 | |
|
1378 | 1378 | a) null if -U or the source repository has no changesets |
|
1379 | 1379 | b) if -u . and the source repository is local, the first parent of |
|
1380 | 1380 | the source repository's working directory |
|
1381 | 1381 | c) the changeset specified with -u (if a branch name, this means the |
|
1382 | 1382 | latest head of that branch) |
|
1383 | 1383 | d) the changeset specified with -r |
|
1384 | 1384 | e) the tipmost head specified with -b |
|
1385 | 1385 | f) the tipmost head specified with the url#branch source syntax |
|
1386 | 1386 | g) the revision marked with the '@' bookmark, if present |
|
1387 | 1387 | h) the tipmost head of the default branch |
|
1388 | 1388 | i) tip |
|
1389 | 1389 | |
|
1390 | 1390 | When cloning from servers that support it, Mercurial may fetch |
|
1391 | 1391 | pre-generated data from a server-advertised URL. When this is done, |
|
1392 | 1392 | hooks operating on incoming changesets and changegroups may fire twice, |
|
1393 | 1393 | once for the bundle fetched from the URL and another for any additional |
|
1394 | 1394 | data not fetched from this URL. In addition, if an error occurs, the |
|
1395 | 1395 | repository may be rolled back to a partial clone. This behavior may |
|
1396 | 1396 | change in future releases. See :hg:`help -e clonebundles` for more. |
|
1397 | 1397 | |
|
1398 | 1398 | Examples: |
|
1399 | 1399 | |
|
1400 | 1400 | - clone a remote repository to a new directory named hg/:: |
|
1401 | 1401 | |
|
1402 | 1402 | hg clone https://www.mercurial-scm.org/repo/hg/ |
|
1403 | 1403 | |
|
1404 | 1404 | - create a lightweight local clone:: |
|
1405 | 1405 | |
|
1406 | 1406 | hg clone project/ project-feature/ |
|
1407 | 1407 | |
|
1408 | 1408 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1409 | 1409 | |
|
1410 | 1410 | hg clone ssh://user@server//home/projects/alpha/ |
|
1411 | 1411 | |
|
1412 | 1412 | - do a streaming clone while checking out a specified version:: |
|
1413 | 1413 | |
|
1414 | 1414 | hg clone --stream http://server/repo -u 1.5 |
|
1415 | 1415 | |
|
1416 | 1416 | - create a repository without changesets after a particular revision:: |
|
1417 | 1417 | |
|
1418 | 1418 | hg clone -r 04e544 experimental/ good/ |
|
1419 | 1419 | |
|
1420 | 1420 | - clone (and track) a particular named branch:: |
|
1421 | 1421 | |
|
1422 | 1422 | hg clone https://www.mercurial-scm.org/repo/hg/#stable |
|
1423 | 1423 | |
|
1424 | 1424 | See :hg:`help urls` for details on specifying URLs. |
|
1425 | 1425 | |
|
1426 | 1426 | Returns 0 on success. |
|
1427 | 1427 | """ |
|
1428 | 1428 | opts = pycompat.byteskwargs(opts) |
|
1429 | 1429 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1430 | 1430 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1431 | 1431 | |
|
1432 | 1432 | r = hg.clone(ui, opts, source, dest, |
|
1433 | 1433 | pull=opts.get('pull'), |
|
1434 | 1434 | stream=opts.get('stream') or opts.get('uncompressed'), |
|
1435 | 1435 | rev=opts.get('rev'), |
|
1436 | 1436 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1437 | 1437 | branch=opts.get('branch'), |
|
1438 | 1438 | shareopts=opts.get('shareopts')) |
|
1439 | 1439 | |
|
1440 | 1440 | return r is None |
|
1441 | 1441 | |
|
1442 | 1442 | @command('^commit|ci', |
|
1443 | 1443 | [('A', 'addremove', None, |
|
1444 | 1444 | _('mark new/missing files as added/removed before committing')), |
|
1445 | 1445 | ('', 'close-branch', None, |
|
1446 | 1446 | _('mark a branch head as closed')), |
|
1447 | 1447 | ('', 'amend', None, _('amend the parent of the working directory')), |
|
1448 | 1448 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1449 | 1449 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
1450 | 1450 | ('i', 'interactive', None, _('use interactive mode')), |
|
1451 | 1451 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1452 | 1452 | _('[OPTION]... [FILE]...'), |
|
1453 | 1453 | inferrepo=True) |
|
1454 | 1454 | def commit(ui, repo, *pats, **opts): |
|
1455 | 1455 | """commit the specified files or all outstanding changes |
|
1456 | 1456 | |
|
1457 | 1457 | Commit changes to the given files into the repository. Unlike a |
|
1458 | 1458 | centralized SCM, this operation is a local operation. See |
|
1459 | 1459 | :hg:`push` for a way to actively distribute your changes. |
|
1460 | 1460 | |
|
1461 | 1461 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1462 | 1462 | will be committed. |
|
1463 | 1463 | |
|
1464 | 1464 | If you are committing the result of a merge, do not provide any |
|
1465 | 1465 | filenames or -I/-X filters. |
|
1466 | 1466 | |
|
1467 | 1467 | If no commit message is specified, Mercurial starts your |
|
1468 | 1468 | configured editor where you can enter a message. In case your |
|
1469 | 1469 | commit fails, you will find a backup of your message in |
|
1470 | 1470 | ``.hg/last-message.txt``. |
|
1471 | 1471 | |
|
1472 | 1472 | The --close-branch flag can be used to mark the current branch |
|
1473 | 1473 | head closed. When all heads of a branch are closed, the branch |
|
1474 | 1474 | will be considered closed and no longer listed. |
|
1475 | 1475 | |
|
1476 | 1476 | The --amend flag can be used to amend the parent of the |
|
1477 | 1477 | working directory with a new commit that contains the changes |
|
1478 | 1478 | in the parent in addition to those currently reported by :hg:`status`, |
|
1479 | 1479 | if there are any. The old commit is stored in a backup bundle in |
|
1480 | 1480 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1481 | 1481 | on how to restore it). |
|
1482 | 1482 | |
|
1483 | 1483 | Message, user and date are taken from the amended commit unless |
|
1484 | 1484 | specified. When a message isn't specified on the command line, |
|
1485 | 1485 | the editor will open with the message of the amended commit. |
|
1486 | 1486 | |
|
1487 | 1487 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1488 | 1488 | or changesets that have children. |
|
1489 | 1489 | |
|
1490 | 1490 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1491 | 1491 | |
|
1492 | 1492 | Returns 0 on success, 1 if nothing changed. |
|
1493 | 1493 | |
|
1494 | 1494 | .. container:: verbose |
|
1495 | 1495 | |
|
1496 | 1496 | Examples: |
|
1497 | 1497 | |
|
1498 | 1498 | - commit all files ending in .py:: |
|
1499 | 1499 | |
|
1500 | 1500 | hg commit --include "set:**.py" |
|
1501 | 1501 | |
|
1502 | 1502 | - commit all non-binary files:: |
|
1503 | 1503 | |
|
1504 | 1504 | hg commit --exclude "set:binary()" |
|
1505 | 1505 | |
|
1506 | 1506 | - amend the current commit and set the date to now:: |
|
1507 | 1507 | |
|
1508 | 1508 | hg commit --amend --date now |
|
1509 | 1509 | """ |
|
1510 | 1510 | wlock = lock = None |
|
1511 | 1511 | try: |
|
1512 | 1512 | wlock = repo.wlock() |
|
1513 | 1513 | lock = repo.lock() |
|
1514 | 1514 | return _docommit(ui, repo, *pats, **opts) |
|
1515 | 1515 | finally: |
|
1516 | 1516 | release(lock, wlock) |
|
1517 | 1517 | |
|
1518 | 1518 | def _docommit(ui, repo, *pats, **opts): |
|
1519 | 1519 | if opts.get(r'interactive'): |
|
1520 | 1520 | opts.pop(r'interactive') |
|
1521 | 1521 | ret = cmdutil.dorecord(ui, repo, commit, None, False, |
|
1522 | 1522 | cmdutil.recordfilter, *pats, |
|
1523 | 1523 | **opts) |
|
1524 | 1524 | # ret can be 0 (no changes to record) or the value returned by |
|
1525 | 1525 | # commit(), 1 if nothing changed or None on success. |
|
1526 | 1526 | return 1 if ret == 0 else ret |
|
1527 | 1527 | |
|
1528 | 1528 | opts = pycompat.byteskwargs(opts) |
|
1529 | 1529 | if opts.get('subrepos'): |
|
1530 | 1530 | if opts.get('amend'): |
|
1531 | 1531 | raise error.Abort(_('cannot amend with --subrepos')) |
|
1532 | 1532 | # Let --subrepos on the command line override config setting. |
|
1533 | 1533 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') |
|
1534 | 1534 | |
|
1535 | 1535 | cmdutil.checkunfinished(repo, commit=True) |
|
1536 | 1536 | |
|
1537 | 1537 | branch = repo[None].branch() |
|
1538 | 1538 | bheads = repo.branchheads(branch) |
|
1539 | 1539 | |
|
1540 | 1540 | extra = {} |
|
1541 | 1541 | if opts.get('close_branch'): |
|
1542 | 1542 | extra['close'] = 1 |
|
1543 | 1543 | |
|
1544 | 1544 | if not bheads: |
|
1545 | 1545 | raise error.Abort(_('can only close branch heads')) |
|
1546 | 1546 | elif opts.get('amend'): |
|
1547 | 1547 | if repo[None].parents()[0].p1().branch() != branch and \ |
|
1548 | 1548 | repo[None].parents()[0].p2().branch() != branch: |
|
1549 | 1549 | raise error.Abort(_('can only close branch heads')) |
|
1550 | 1550 | |
|
1551 | 1551 | if opts.get('amend'): |
|
1552 | 1552 | if ui.configbool('ui', 'commitsubrepos'): |
|
1553 | 1553 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1554 | 1554 | |
|
1555 | 1555 | old = repo['.'] |
|
1556 | 1556 | rewriteutil.precheck(repo, [old.rev()], 'amend') |
|
1557 | 1557 | |
|
1558 | 1558 | # Currently histedit gets confused if an amend happens while histedit |
|
1559 | 1559 | # is in progress. Since we have a checkunfinished command, we are |
|
1560 | 1560 | # temporarily honoring it. |
|
1561 | 1561 | # |
|
1562 | 1562 | # Note: eventually this guard will be removed. Please do not expect |
|
1563 | 1563 | # this behavior to remain. |
|
1564 | 1564 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
1565 | 1565 | cmdutil.checkunfinished(repo) |
|
1566 | 1566 | |
|
1567 | 1567 | node = cmdutil.amend(ui, repo, old, extra, pats, opts) |
|
1568 | 1568 | if node == old.node(): |
|
1569 | 1569 | ui.status(_("nothing changed\n")) |
|
1570 | 1570 | return 1 |
|
1571 | 1571 | else: |
|
1572 | 1572 | def commitfunc(ui, repo, message, match, opts): |
|
1573 | 1573 | overrides = {} |
|
1574 | 1574 | if opts.get('secret'): |
|
1575 | 1575 | overrides[('phases', 'new-commit')] = 'secret' |
|
1576 | 1576 | |
|
1577 | 1577 | baseui = repo.baseui |
|
1578 | 1578 | with baseui.configoverride(overrides, 'commit'): |
|
1579 | 1579 | with ui.configoverride(overrides, 'commit'): |
|
1580 | 1580 | editform = cmdutil.mergeeditform(repo[None], |
|
1581 | 1581 | 'commit.normal') |
|
1582 | 1582 | editor = cmdutil.getcommiteditor( |
|
1583 | 1583 | editform=editform, **pycompat.strkwargs(opts)) |
|
1584 | 1584 | return repo.commit(message, |
|
1585 | 1585 | opts.get('user'), |
|
1586 | 1586 | opts.get('date'), |
|
1587 | 1587 | match, |
|
1588 | 1588 | editor=editor, |
|
1589 | 1589 | extra=extra) |
|
1590 | 1590 | |
|
1591 | 1591 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1592 | 1592 | |
|
1593 | 1593 | if not node: |
|
1594 | 1594 | stat = cmdutil.postcommitstatus(repo, pats, opts) |
|
1595 | 1595 | if stat[3]: |
|
1596 | 1596 | ui.status(_("nothing changed (%d missing files, see " |
|
1597 | 1597 | "'hg status')\n") % len(stat[3])) |
|
1598 | 1598 | else: |
|
1599 | 1599 | ui.status(_("nothing changed\n")) |
|
1600 | 1600 | return 1 |
|
1601 | 1601 | |
|
1602 | 1602 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1603 | 1603 | |
|
1604 | 1604 | @command('config|showconfig|debugconfig', |
|
1605 | 1605 | [('u', 'untrusted', None, _('show untrusted configuration options')), |
|
1606 | 1606 | ('e', 'edit', None, _('edit user config')), |
|
1607 | 1607 | ('l', 'local', None, _('edit repository config')), |
|
1608 | 1608 | ('g', 'global', None, _('edit global config'))] + formatteropts, |
|
1609 | 1609 | _('[-u] [NAME]...'), |
|
1610 | 1610 | optionalrepo=True, cmdtype=readonly) |
|
1611 | 1611 | def config(ui, repo, *values, **opts): |
|
1612 | 1612 | """show combined config settings from all hgrc files |
|
1613 | 1613 | |
|
1614 | 1614 | With no arguments, print names and values of all config items. |
|
1615 | 1615 | |
|
1616 | 1616 | With one argument of the form section.name, print just the value |
|
1617 | 1617 | of that config item. |
|
1618 | 1618 | |
|
1619 | 1619 | With multiple arguments, print names and values of all config |
|
1620 | 1620 | items with matching section names. |
|
1621 | 1621 | |
|
1622 | 1622 | With --edit, start an editor on the user-level config file. With |
|
1623 | 1623 | --global, edit the system-wide config file. With --local, edit the |
|
1624 | 1624 | repository-level config file. |
|
1625 | 1625 | |
|
1626 | 1626 | With --debug, the source (filename and line number) is printed |
|
1627 | 1627 | for each config item. |
|
1628 | 1628 | |
|
1629 | 1629 | See :hg:`help config` for more information about config files. |
|
1630 | 1630 | |
|
1631 | 1631 | Returns 0 on success, 1 if NAME does not exist. |
|
1632 | 1632 | |
|
1633 | 1633 | """ |
|
1634 | 1634 | |
|
1635 | 1635 | opts = pycompat.byteskwargs(opts) |
|
1636 | 1636 | if opts.get('edit') or opts.get('local') or opts.get('global'): |
|
1637 | 1637 | if opts.get('local') and opts.get('global'): |
|
1638 | 1638 | raise error.Abort(_("can't use --local and --global together")) |
|
1639 | 1639 | |
|
1640 | 1640 | if opts.get('local'): |
|
1641 | 1641 | if not repo: |
|
1642 | 1642 | raise error.Abort(_("can't use --local outside a repository")) |
|
1643 | 1643 | paths = [repo.vfs.join('hgrc')] |
|
1644 | 1644 | elif opts.get('global'): |
|
1645 | 1645 | paths = rcutil.systemrcpath() |
|
1646 | 1646 | else: |
|
1647 | 1647 | paths = rcutil.userrcpath() |
|
1648 | 1648 | |
|
1649 | 1649 | for f in paths: |
|
1650 | 1650 | if os.path.exists(f): |
|
1651 | 1651 | break |
|
1652 | 1652 | else: |
|
1653 | 1653 | if opts.get('global'): |
|
1654 | 1654 | samplehgrc = uimod.samplehgrcs['global'] |
|
1655 | 1655 | elif opts.get('local'): |
|
1656 | 1656 | samplehgrc = uimod.samplehgrcs['local'] |
|
1657 | 1657 | else: |
|
1658 | 1658 | samplehgrc = uimod.samplehgrcs['user'] |
|
1659 | 1659 | |
|
1660 | 1660 | f = paths[0] |
|
1661 | 1661 | fp = open(f, "wb") |
|
1662 | 1662 | fp.write(util.tonativeeol(samplehgrc)) |
|
1663 | 1663 | fp.close() |
|
1664 | 1664 | |
|
1665 | 1665 | editor = ui.geteditor() |
|
1666 | 1666 | ui.system("%s \"%s\"" % (editor, f), |
|
1667 | 1667 | onerr=error.Abort, errprefix=_("edit failed"), |
|
1668 | 1668 | blockedtag='config_edit') |
|
1669 | 1669 | return |
|
1670 | 1670 | ui.pager('config') |
|
1671 | 1671 | fm = ui.formatter('config', opts) |
|
1672 | 1672 | for t, f in rcutil.rccomponents(): |
|
1673 | 1673 | if t == 'path': |
|
1674 | 1674 | ui.debug('read config from: %s\n' % f) |
|
1675 | 1675 | elif t == 'items': |
|
1676 | 1676 | for section, name, value, source in f: |
|
1677 | 1677 | ui.debug('set config by: %s\n' % source) |
|
1678 | 1678 | else: |
|
1679 | 1679 | raise error.ProgrammingError('unknown rctype: %s' % t) |
|
1680 | 1680 | untrusted = bool(opts.get('untrusted')) |
|
1681 | 1681 | if values: |
|
1682 | 1682 | sections = [v for v in values if '.' not in v] |
|
1683 | 1683 | items = [v for v in values if '.' in v] |
|
1684 | 1684 | if len(items) > 1 or items and sections: |
|
1685 | 1685 | raise error.Abort(_('only one config item permitted')) |
|
1686 | 1686 | matched = False |
|
1687 | 1687 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1688 | 1688 | source = ui.configsource(section, name, untrusted) |
|
1689 | 1689 | value = pycompat.bytestr(value) |
|
1690 | 1690 | if fm.isplain(): |
|
1691 | 1691 | source = source or 'none' |
|
1692 | 1692 | value = value.replace('\n', '\\n') |
|
1693 | 1693 | entryname = section + '.' + name |
|
1694 | 1694 | if values: |
|
1695 | 1695 | for v in values: |
|
1696 | 1696 | if v == section: |
|
1697 | 1697 | fm.startitem() |
|
1698 | 1698 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1699 | 1699 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1700 | 1700 | matched = True |
|
1701 | 1701 | elif v == entryname: |
|
1702 | 1702 | fm.startitem() |
|
1703 | 1703 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1704 | 1704 | fm.write('value', '%s\n', value) |
|
1705 | 1705 | fm.data(name=entryname) |
|
1706 | 1706 | matched = True |
|
1707 | 1707 | else: |
|
1708 | 1708 | fm.startitem() |
|
1709 | 1709 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1710 | 1710 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1711 | 1711 | matched = True |
|
1712 | 1712 | fm.end() |
|
1713 | 1713 | if matched: |
|
1714 | 1714 | return 0 |
|
1715 | 1715 | return 1 |
|
1716 | 1716 | |
|
1717 | 1717 | @command('copy|cp', |
|
1718 | 1718 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1719 | 1719 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1720 | 1720 | ] + walkopts + dryrunopts, |
|
1721 | 1721 | _('[OPTION]... [SOURCE]... DEST')) |
|
1722 | 1722 | def copy(ui, repo, *pats, **opts): |
|
1723 | 1723 | """mark files as copied for the next commit |
|
1724 | 1724 | |
|
1725 | 1725 | Mark dest as having copies of source files. If dest is a |
|
1726 | 1726 | directory, copies are put in that directory. If dest is a file, |
|
1727 | 1727 | the source must be a single file. |
|
1728 | 1728 | |
|
1729 | 1729 | By default, this command copies the contents of files as they |
|
1730 | 1730 | exist in the working directory. If invoked with -A/--after, the |
|
1731 | 1731 | operation is recorded, but no copying is performed. |
|
1732 | 1732 | |
|
1733 | 1733 | This command takes effect with the next commit. To undo a copy |
|
1734 | 1734 | before that, see :hg:`revert`. |
|
1735 | 1735 | |
|
1736 | 1736 | Returns 0 on success, 1 if errors are encountered. |
|
1737 | 1737 | """ |
|
1738 | 1738 | opts = pycompat.byteskwargs(opts) |
|
1739 | 1739 | with repo.wlock(False): |
|
1740 | 1740 | return cmdutil.copy(ui, repo, pats, opts) |
|
1741 | 1741 | |
|
1742 | 1742 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) |
|
1743 | 1743 | def debugcommands(ui, cmd='', *args): |
|
1744 | 1744 | """list all available commands and options""" |
|
1745 | 1745 | for cmd, vals in sorted(table.iteritems()): |
|
1746 | 1746 | cmd = cmd.split('|')[0].strip('^') |
|
1747 | 1747 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1748 | 1748 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1749 | 1749 | |
|
1750 | 1750 | @command('debugcomplete', |
|
1751 | 1751 | [('o', 'options', None, _('show the command options'))], |
|
1752 | 1752 | _('[-o] CMD'), |
|
1753 | 1753 | norepo=True) |
|
1754 | 1754 | def debugcomplete(ui, cmd='', **opts): |
|
1755 | 1755 | """returns the completion list associated with the given command""" |
|
1756 | 1756 | |
|
1757 | 1757 | if opts.get(r'options'): |
|
1758 | 1758 | options = [] |
|
1759 | 1759 | otables = [globalopts] |
|
1760 | 1760 | if cmd: |
|
1761 | 1761 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1762 | 1762 | otables.append(entry[1]) |
|
1763 | 1763 | for t in otables: |
|
1764 | 1764 | for o in t: |
|
1765 | 1765 | if "(DEPRECATED)" in o[3]: |
|
1766 | 1766 | continue |
|
1767 | 1767 | if o[0]: |
|
1768 | 1768 | options.append('-%s' % o[0]) |
|
1769 | 1769 | options.append('--%s' % o[1]) |
|
1770 | 1770 | ui.write("%s\n" % "\n".join(options)) |
|
1771 | 1771 | return |
|
1772 | 1772 | |
|
1773 | 1773 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) |
|
1774 | 1774 | if ui.verbose: |
|
1775 | 1775 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1776 | 1776 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1777 | 1777 | |
|
1778 | 1778 | @command('^diff', |
|
1779 | 1779 | [('r', 'rev', [], _('revision'), _('REV')), |
|
1780 | 1780 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
1781 | 1781 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
1782 | 1782 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), |
|
1783 | 1783 | inferrepo=True, cmdtype=readonly) |
|
1784 | 1784 | def diff(ui, repo, *pats, **opts): |
|
1785 | 1785 | """diff repository (or selected files) |
|
1786 | 1786 | |
|
1787 | 1787 | Show differences between revisions for the specified files. |
|
1788 | 1788 | |
|
1789 | 1789 | Differences between files are shown using the unified diff format. |
|
1790 | 1790 | |
|
1791 | 1791 | .. note:: |
|
1792 | 1792 | |
|
1793 | 1793 | :hg:`diff` may generate unexpected results for merges, as it will |
|
1794 | 1794 | default to comparing against the working directory's first |
|
1795 | 1795 | parent changeset if no revisions are specified. |
|
1796 | 1796 | |
|
1797 | 1797 | When two revision arguments are given, then changes are shown |
|
1798 | 1798 | between those revisions. If only one revision is specified then |
|
1799 | 1799 | that revision is compared to the working directory, and, when no |
|
1800 | 1800 | revisions are specified, the working directory files are compared |
|
1801 | 1801 | to its first parent. |
|
1802 | 1802 | |
|
1803 | 1803 | Alternatively you can specify -c/--change with a revision to see |
|
1804 | 1804 | the changes in that changeset relative to its first parent. |
|
1805 | 1805 | |
|
1806 | 1806 | Without the -a/--text option, diff will avoid generating diffs of |
|
1807 | 1807 | files it detects as binary. With -a, diff will generate a diff |
|
1808 | 1808 | anyway, probably with undesirable results. |
|
1809 | 1809 | |
|
1810 | 1810 | Use the -g/--git option to generate diffs in the git extended diff |
|
1811 | 1811 | format. For more information, read :hg:`help diffs`. |
|
1812 | 1812 | |
|
1813 | 1813 | .. container:: verbose |
|
1814 | 1814 | |
|
1815 | 1815 | Examples: |
|
1816 | 1816 | |
|
1817 | 1817 | - compare a file in the current working directory to its parent:: |
|
1818 | 1818 | |
|
1819 | 1819 | hg diff foo.c |
|
1820 | 1820 | |
|
1821 | 1821 | - compare two historical versions of a directory, with rename info:: |
|
1822 | 1822 | |
|
1823 | 1823 | hg diff --git -r 1.0:1.2 lib/ |
|
1824 | 1824 | |
|
1825 | 1825 | - get change stats relative to the last change on some date:: |
|
1826 | 1826 | |
|
1827 | 1827 | hg diff --stat -r "date('may 2')" |
|
1828 | 1828 | |
|
1829 | 1829 | - diff all newly-added files that contain a keyword:: |
|
1830 | 1830 | |
|
1831 | 1831 | hg diff "set:added() and grep(GNU)" |
|
1832 | 1832 | |
|
1833 | 1833 | - compare a revision and its parents:: |
|
1834 | 1834 | |
|
1835 | 1835 | hg diff -c 9353 # compare against first parent |
|
1836 | 1836 | hg diff -r 9353^:9353 # same using revset syntax |
|
1837 | 1837 | hg diff -r 9353^2:9353 # compare against the second parent |
|
1838 | 1838 | |
|
1839 | 1839 | Returns 0 on success. |
|
1840 | 1840 | """ |
|
1841 | 1841 | |
|
1842 | 1842 | opts = pycompat.byteskwargs(opts) |
|
1843 | 1843 | revs = opts.get('rev') |
|
1844 | 1844 | change = opts.get('change') |
|
1845 | 1845 | stat = opts.get('stat') |
|
1846 | 1846 | reverse = opts.get('reverse') |
|
1847 | 1847 | |
|
1848 | 1848 | if revs and change: |
|
1849 | 1849 | msg = _('cannot specify --rev and --change at the same time') |
|
1850 | 1850 | raise error.Abort(msg) |
|
1851 | 1851 | elif change: |
|
1852 | 1852 | repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
|
1853 | 1853 | node2 = scmutil.revsingle(repo, change, None).node() |
|
1854 | 1854 | node1 = repo[node2].p1().node() |
|
1855 | 1855 | else: |
|
1856 | 1856 | repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
|
1857 | 1857 | node1, node2 = scmutil.revpair(repo, revs) |
|
1858 | 1858 | |
|
1859 | 1859 | if reverse: |
|
1860 | 1860 | node1, node2 = node2, node1 |
|
1861 | 1861 | |
|
1862 | 1862 | diffopts = patch.diffallopts(ui, opts) |
|
1863 | 1863 | m = scmutil.match(repo[node2], pats, opts) |
|
1864 | 1864 | ui.pager('diff') |
|
1865 | 1865 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
1866 | 1866 | listsubrepos=opts.get('subrepos'), |
|
1867 | 1867 | root=opts.get('root')) |
|
1868 | 1868 | |
|
1869 | 1869 | @command('^export', |
|
1870 | 1870 | [('o', 'output', '', |
|
1871 | 1871 | _('print output to file with formatted name'), _('FORMAT')), |
|
1872 | 1872 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
1873 | 1873 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
1874 | 1874 | ] + diffopts, |
|
1875 | 1875 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly) |
|
1876 | 1876 | def export(ui, repo, *changesets, **opts): |
|
1877 | 1877 | """dump the header and diffs for one or more changesets |
|
1878 | 1878 | |
|
1879 | 1879 | Print the changeset header and diffs for one or more revisions. |
|
1880 | 1880 | If no revision is given, the parent of the working directory is used. |
|
1881 | 1881 | |
|
1882 | 1882 | The information shown in the changeset header is: author, date, |
|
1883 | 1883 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1884 | 1884 | comment. |
|
1885 | 1885 | |
|
1886 | 1886 | .. note:: |
|
1887 | 1887 | |
|
1888 | 1888 | :hg:`export` may generate unexpected diff output for merge |
|
1889 | 1889 | changesets, as it will compare the merge changeset against its |
|
1890 | 1890 | first parent only. |
|
1891 | 1891 | |
|
1892 | 1892 | Output may be to a file, in which case the name of the file is |
|
1893 | 1893 | given using a format string. The formatting rules are as follows: |
|
1894 | 1894 | |
|
1895 | 1895 | :``%%``: literal "%" character |
|
1896 | 1896 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1897 | 1897 | :``%N``: number of patches being generated |
|
1898 | 1898 | :``%R``: changeset revision number |
|
1899 | 1899 | :``%b``: basename of the exporting repository |
|
1900 | 1900 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1901 | 1901 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
1902 | 1902 | :``%n``: zero-padded sequence number, starting at 1 |
|
1903 | 1903 | :``%r``: zero-padded changeset revision number |
|
1904 | 1904 | |
|
1905 | 1905 | Without the -a/--text option, export will avoid generating diffs |
|
1906 | 1906 | of files it detects as binary. With -a, export will generate a |
|
1907 | 1907 | diff anyway, probably with undesirable results. |
|
1908 | 1908 | |
|
1909 | 1909 | Use the -g/--git option to generate diffs in the git extended diff |
|
1910 | 1910 | format. See :hg:`help diffs` for more information. |
|
1911 | 1911 | |
|
1912 | 1912 | With the --switch-parent option, the diff will be against the |
|
1913 | 1913 | second parent. It can be useful to review a merge. |
|
1914 | 1914 | |
|
1915 | 1915 | .. container:: verbose |
|
1916 | 1916 | |
|
1917 | 1917 | Examples: |
|
1918 | 1918 | |
|
1919 | 1919 | - use export and import to transplant a bugfix to the current |
|
1920 | 1920 | branch:: |
|
1921 | 1921 | |
|
1922 | 1922 | hg export -r 9353 | hg import - |
|
1923 | 1923 | |
|
1924 | 1924 | - export all the changesets between two revisions to a file with |
|
1925 | 1925 | rename information:: |
|
1926 | 1926 | |
|
1927 | 1927 | hg export --git -r 123:150 > changes.txt |
|
1928 | 1928 | |
|
1929 | 1929 | - split outgoing changes into a series of patches with |
|
1930 | 1930 | descriptive names:: |
|
1931 | 1931 | |
|
1932 | 1932 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
1933 | 1933 | |
|
1934 | 1934 | Returns 0 on success. |
|
1935 | 1935 | """ |
|
1936 | 1936 | opts = pycompat.byteskwargs(opts) |
|
1937 | 1937 | changesets += tuple(opts.get('rev', [])) |
|
1938 | 1938 | if not changesets: |
|
1939 | 1939 | changesets = ['.'] |
|
1940 | 1940 | repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn') |
|
1941 | 1941 | revs = scmutil.revrange(repo, changesets) |
|
1942 | 1942 | if not revs: |
|
1943 | 1943 | raise error.Abort(_("export requires at least one changeset")) |
|
1944 | 1944 | if len(revs) > 1: |
|
1945 | 1945 | ui.note(_('exporting patches:\n')) |
|
1946 | 1946 | else: |
|
1947 | 1947 | ui.note(_('exporting patch:\n')) |
|
1948 | 1948 | ui.pager('export') |
|
1949 | 1949 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), |
|
1950 | 1950 | switch_parent=opts.get('switch_parent'), |
|
1951 | 1951 | opts=patch.diffallopts(ui, opts)) |
|
1952 | 1952 | |
|
1953 | 1953 | @command('files', |
|
1954 | 1954 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
1955 | 1955 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
1956 | 1956 | ] + walkopts + formatteropts + subrepoopts, |
|
1957 | 1957 | _('[OPTION]... [FILE]...'), cmdtype=readonly) |
|
1958 | 1958 | def files(ui, repo, *pats, **opts): |
|
1959 | 1959 | """list tracked files |
|
1960 | 1960 | |
|
1961 | 1961 | Print files under Mercurial control in the working directory or |
|
1962 | 1962 | specified revision for given files (excluding removed files). |
|
1963 | 1963 | Files can be specified as filenames or filesets. |
|
1964 | 1964 | |
|
1965 | 1965 | If no files are given to match, this command prints the names |
|
1966 | 1966 | of all files under Mercurial control. |
|
1967 | 1967 | |
|
1968 | 1968 | .. container:: verbose |
|
1969 | 1969 | |
|
1970 | 1970 | Examples: |
|
1971 | 1971 | |
|
1972 | 1972 | - list all files under the current directory:: |
|
1973 | 1973 | |
|
1974 | 1974 | hg files . |
|
1975 | 1975 | |
|
1976 | 1976 | - shows sizes and flags for current revision:: |
|
1977 | 1977 | |
|
1978 | 1978 | hg files -vr . |
|
1979 | 1979 | |
|
1980 | 1980 | - list all files named README:: |
|
1981 | 1981 | |
|
1982 | 1982 | hg files -I "**/README" |
|
1983 | 1983 | |
|
1984 | 1984 | - list all binary files:: |
|
1985 | 1985 | |
|
1986 | 1986 | hg files "set:binary()" |
|
1987 | 1987 | |
|
1988 | 1988 | - find files containing a regular expression:: |
|
1989 | 1989 | |
|
1990 | 1990 | hg files "set:grep('bob')" |
|
1991 | 1991 | |
|
1992 | 1992 | - search tracked file contents with xargs and grep:: |
|
1993 | 1993 | |
|
1994 | 1994 | hg files -0 | xargs -0 grep foo |
|
1995 | 1995 | |
|
1996 | 1996 | See :hg:`help patterns` and :hg:`help filesets` for more information |
|
1997 | 1997 | on specifying file patterns. |
|
1998 | 1998 | |
|
1999 | 1999 | Returns 0 if a match is found, 1 otherwise. |
|
2000 | 2000 | |
|
2001 | 2001 | """ |
|
2002 | 2002 | |
|
2003 | 2003 | opts = pycompat.byteskwargs(opts) |
|
2004 | 2004 | rev = opts.get('rev') |
|
2005 | 2005 | if rev: |
|
2006 | 2006 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
2007 | 2007 | ctx = scmutil.revsingle(repo, rev, None) |
|
2008 | 2008 | |
|
2009 | 2009 | end = '\n' |
|
2010 | 2010 | if opts.get('print0'): |
|
2011 | 2011 | end = '\0' |
|
2012 | 2012 | fmt = '%s' + end |
|
2013 | 2013 | |
|
2014 | 2014 | m = scmutil.match(ctx, pats, opts) |
|
2015 | 2015 | ui.pager('files') |
|
2016 | 2016 | with ui.formatter('files', opts) as fm: |
|
2017 | 2017 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) |
|
2018 | 2018 | |
|
2019 | 2019 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) |
|
2020 | 2020 | def forget(ui, repo, *pats, **opts): |
|
2021 | 2021 | """forget the specified files on the next commit |
|
2022 | 2022 | |
|
2023 | 2023 | Mark the specified files so they will no longer be tracked |
|
2024 | 2024 | after the next commit. |
|
2025 | 2025 | |
|
2026 | 2026 | This only removes files from the current branch, not from the |
|
2027 | 2027 | entire project history, and it does not delete them from the |
|
2028 | 2028 | working directory. |
|
2029 | 2029 | |
|
2030 | 2030 | To delete the file from the working directory, see :hg:`remove`. |
|
2031 | 2031 | |
|
2032 | 2032 | To undo a forget before the next commit, see :hg:`add`. |
|
2033 | 2033 | |
|
2034 | 2034 | .. container:: verbose |
|
2035 | 2035 | |
|
2036 | 2036 | Examples: |
|
2037 | 2037 | |
|
2038 | 2038 | - forget newly-added binary files:: |
|
2039 | 2039 | |
|
2040 | 2040 | hg forget "set:added() and binary()" |
|
2041 | 2041 | |
|
2042 | 2042 | - forget files that would be excluded by .hgignore:: |
|
2043 | 2043 | |
|
2044 | 2044 | hg forget "set:hgignore()" |
|
2045 | 2045 | |
|
2046 | 2046 | Returns 0 on success. |
|
2047 | 2047 | """ |
|
2048 | 2048 | |
|
2049 | 2049 | opts = pycompat.byteskwargs(opts) |
|
2050 | 2050 | if not pats: |
|
2051 | 2051 | raise error.Abort(_('no files specified')) |
|
2052 | 2052 | |
|
2053 | 2053 | m = scmutil.match(repo[None], pats, opts) |
|
2054 | 2054 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
2055 | 2055 | return rejected and 1 or 0 |
|
2056 | 2056 | |
|
2057 | 2057 | @command( |
|
2058 | 2058 | 'graft', |
|
2059 | 2059 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
2060 | 2060 | ('c', 'continue', False, _('resume interrupted graft')), |
|
2061 | 2061 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2062 | 2062 | ('', 'log', None, _('append graft info to log message')), |
|
2063 | 2063 | ('f', 'force', False, _('force graft')), |
|
2064 | 2064 | ('D', 'currentdate', False, |
|
2065 | 2065 | _('record the current date as commit date')), |
|
2066 | 2066 | ('U', 'currentuser', False, |
|
2067 | 2067 | _('record the current user as committer'), _('DATE'))] |
|
2068 | 2068 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2069 | 2069 | _('[OPTION]... [-r REV]... REV...')) |
|
2070 | 2070 | def graft(ui, repo, *revs, **opts): |
|
2071 | 2071 | '''copy changes from other branches onto the current branch |
|
2072 | 2072 | |
|
2073 | 2073 | This command uses Mercurial's merge logic to copy individual |
|
2074 | 2074 | changes from other branches without merging branches in the |
|
2075 | 2075 | history graph. This is sometimes known as 'backporting' or |
|
2076 | 2076 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2077 | 2077 | description from the source changesets. |
|
2078 | 2078 | |
|
2079 | 2079 | Changesets that are ancestors of the current revision, that have |
|
2080 | 2080 | already been grafted, or that are merges will be skipped. |
|
2081 | 2081 | |
|
2082 | 2082 | If --log is specified, log messages will have a comment appended |
|
2083 | 2083 | of the form:: |
|
2084 | 2084 | |
|
2085 | 2085 | (grafted from CHANGESETHASH) |
|
2086 | 2086 | |
|
2087 | 2087 | If --force is specified, revisions will be grafted even if they |
|
2088 | 2088 | are already ancestors of, or have been grafted to, the destination. |
|
2089 | 2089 | This is useful when the revisions have since been backed out. |
|
2090 | 2090 | |
|
2091 | 2091 | If a graft merge results in conflicts, the graft process is |
|
2092 | 2092 | interrupted so that the current merge can be manually resolved. |
|
2093 | 2093 | Once all conflicts are addressed, the graft process can be |
|
2094 | 2094 | continued with the -c/--continue option. |
|
2095 | 2095 | |
|
2096 | 2096 | .. note:: |
|
2097 | 2097 | |
|
2098 | 2098 | The -c/--continue option does not reapply earlier options, except |
|
2099 | 2099 | for --force. |
|
2100 | 2100 | |
|
2101 | 2101 | .. container:: verbose |
|
2102 | 2102 | |
|
2103 | 2103 | Examples: |
|
2104 | 2104 | |
|
2105 | 2105 | - copy a single change to the stable branch and edit its description:: |
|
2106 | 2106 | |
|
2107 | 2107 | hg update stable |
|
2108 | 2108 | hg graft --edit 9393 |
|
2109 | 2109 | |
|
2110 | 2110 | - graft a range of changesets with one exception, updating dates:: |
|
2111 | 2111 | |
|
2112 | 2112 | hg graft -D "2085::2093 and not 2091" |
|
2113 | 2113 | |
|
2114 | 2114 | - continue a graft after resolving conflicts:: |
|
2115 | 2115 | |
|
2116 | 2116 | hg graft -c |
|
2117 | 2117 | |
|
2118 | 2118 | - show the source of a grafted changeset:: |
|
2119 | 2119 | |
|
2120 | 2120 | hg log --debug -r . |
|
2121 | 2121 | |
|
2122 | 2122 | - show revisions sorted by date:: |
|
2123 | 2123 | |
|
2124 | 2124 | hg log -r "sort(all(), date)" |
|
2125 | 2125 | |
|
2126 | 2126 | See :hg:`help revisions` for more about specifying revisions. |
|
2127 | 2127 | |
|
2128 | 2128 | Returns 0 on successful completion. |
|
2129 | 2129 | ''' |
|
2130 | 2130 | with repo.wlock(): |
|
2131 | 2131 | return _dograft(ui, repo, *revs, **opts) |
|
2132 | 2132 | |
|
2133 | 2133 | def _dograft(ui, repo, *revs, **opts): |
|
2134 | 2134 | opts = pycompat.byteskwargs(opts) |
|
2135 | 2135 | if revs and opts.get('rev'): |
|
2136 | 2136 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' |
|
2137 | 2137 | 'revision ordering!\n')) |
|
2138 | 2138 | |
|
2139 | 2139 | revs = list(revs) |
|
2140 | 2140 | revs.extend(opts.get('rev')) |
|
2141 | 2141 | |
|
2142 | 2142 | if not opts.get('user') and opts.get('currentuser'): |
|
2143 | 2143 | opts['user'] = ui.username() |
|
2144 | 2144 | if not opts.get('date') and opts.get('currentdate'): |
|
2145 | 2145 | opts['date'] = "%d %d" % util.makedate() |
|
2146 | 2146 | |
|
2147 | 2147 | editor = cmdutil.getcommiteditor(editform='graft', |
|
2148 | 2148 | **pycompat.strkwargs(opts)) |
|
2149 | 2149 | |
|
2150 | 2150 | cont = False |
|
2151 | 2151 | if opts.get('continue'): |
|
2152 | 2152 | cont = True |
|
2153 | 2153 | if revs: |
|
2154 | 2154 | raise error.Abort(_("can't specify --continue and revisions")) |
|
2155 | 2155 | # read in unfinished revisions |
|
2156 | 2156 | try: |
|
2157 | 2157 | nodes = repo.vfs.read('graftstate').splitlines() |
|
2158 | 2158 | revs = [repo[node].rev() for node in nodes] |
|
2159 | 2159 | except IOError as inst: |
|
2160 | 2160 | if inst.errno != errno.ENOENT: |
|
2161 | 2161 | raise |
|
2162 | 2162 | cmdutil.wrongtooltocontinue(repo, _('graft')) |
|
2163 | 2163 | else: |
|
2164 | 2164 | cmdutil.checkunfinished(repo) |
|
2165 | 2165 | cmdutil.bailifchanged(repo) |
|
2166 | 2166 | if not revs: |
|
2167 | 2167 | raise error.Abort(_('no revisions specified')) |
|
2168 | 2168 | revs = scmutil.revrange(repo, revs) |
|
2169 | 2169 | |
|
2170 | 2170 | skipped = set() |
|
2171 | 2171 | # check for merges |
|
2172 | 2172 | for rev in repo.revs('%ld and merge()', revs): |
|
2173 | 2173 | ui.warn(_('skipping ungraftable merge revision %d\n') % rev) |
|
2174 | 2174 | skipped.add(rev) |
|
2175 | 2175 | revs = [r for r in revs if r not in skipped] |
|
2176 | 2176 | if not revs: |
|
2177 | 2177 | return -1 |
|
2178 | 2178 | |
|
2179 | 2179 | # Don't check in the --continue case, in effect retaining --force across |
|
2180 | 2180 | # --continues. That's because without --force, any revisions we decided to |
|
2181 | 2181 | # skip would have been filtered out here, so they wouldn't have made their |
|
2182 | 2182 | # way to the graftstate. With --force, any revisions we would have otherwise |
|
2183 | 2183 | # skipped would not have been filtered out, and if they hadn't been applied |
|
2184 | 2184 | # already, they'd have been in the graftstate. |
|
2185 | 2185 | if not (cont or opts.get('force')): |
|
2186 | 2186 | # check for ancestors of dest branch |
|
2187 | 2187 | crev = repo['.'].rev() |
|
2188 | 2188 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
2189 | 2189 | # XXX make this lazy in the future |
|
2190 | 2190 | # don't mutate while iterating, create a copy |
|
2191 | 2191 | for rev in list(revs): |
|
2192 | 2192 | if rev in ancestors: |
|
2193 | 2193 | ui.warn(_('skipping ancestor revision %d:%s\n') % |
|
2194 | 2194 | (rev, repo[rev])) |
|
2195 | 2195 | # XXX remove on list is slow |
|
2196 | 2196 | revs.remove(rev) |
|
2197 | 2197 | if not revs: |
|
2198 | 2198 | return -1 |
|
2199 | 2199 | |
|
2200 | 2200 | # analyze revs for earlier grafts |
|
2201 | 2201 | ids = {} |
|
2202 | 2202 | for ctx in repo.set("%ld", revs): |
|
2203 | 2203 | ids[ctx.hex()] = ctx.rev() |
|
2204 | 2204 | n = ctx.extra().get('source') |
|
2205 | 2205 | if n: |
|
2206 | 2206 | ids[n] = ctx.rev() |
|
2207 | 2207 | |
|
2208 | 2208 | # check ancestors for earlier grafts |
|
2209 | 2209 | ui.debug('scanning for duplicate grafts\n') |
|
2210 | 2210 | |
|
2211 | 2211 | # The only changesets we can be sure doesn't contain grafts of any |
|
2212 | 2212 | # revs, are the ones that are common ancestors of *all* revs: |
|
2213 | 2213 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): |
|
2214 | 2214 | ctx = repo[rev] |
|
2215 | 2215 | n = ctx.extra().get('source') |
|
2216 | 2216 | if n in ids: |
|
2217 | 2217 | try: |
|
2218 | 2218 | r = repo[n].rev() |
|
2219 | 2219 | except error.RepoLookupError: |
|
2220 | 2220 | r = None |
|
2221 | 2221 | if r in revs: |
|
2222 | 2222 | ui.warn(_('skipping revision %d:%s ' |
|
2223 | 2223 | '(already grafted to %d:%s)\n') |
|
2224 | 2224 | % (r, repo[r], rev, ctx)) |
|
2225 | 2225 | revs.remove(r) |
|
2226 | 2226 | elif ids[n] in revs: |
|
2227 | 2227 | if r is None: |
|
2228 | 2228 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2229 | 2229 | '(%d:%s also has unknown origin %s)\n') |
|
2230 | 2230 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) |
|
2231 | 2231 | else: |
|
2232 | 2232 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2233 | 2233 | '(%d:%s also has origin %d:%s)\n') |
|
2234 | 2234 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
|
2235 | 2235 | revs.remove(ids[n]) |
|
2236 | 2236 | elif ctx.hex() in ids: |
|
2237 | 2237 | r = ids[ctx.hex()] |
|
2238 | 2238 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2239 | 2239 | '(was grafted from %d:%s)\n') % |
|
2240 | 2240 | (r, repo[r], rev, ctx)) |
|
2241 | 2241 | revs.remove(r) |
|
2242 | 2242 | if not revs: |
|
2243 | 2243 | return -1 |
|
2244 | 2244 | |
|
2245 | 2245 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
2246 | 2246 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
2247 | 2247 | ctx.description().split('\n', 1)[0]) |
|
2248 | 2248 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
2249 | 2249 | if names: |
|
2250 | 2250 | desc += ' (%s)' % ' '.join(names) |
|
2251 | 2251 | ui.status(_('grafting %s\n') % desc) |
|
2252 | 2252 | if opts.get('dry_run'): |
|
2253 | 2253 | continue |
|
2254 | 2254 | |
|
2255 | 2255 | source = ctx.extra().get('source') |
|
2256 | 2256 | extra = {} |
|
2257 | 2257 | if source: |
|
2258 | 2258 | extra['source'] = source |
|
2259 | 2259 | extra['intermediate-source'] = ctx.hex() |
|
2260 | 2260 | else: |
|
2261 | 2261 | extra['source'] = ctx.hex() |
|
2262 | 2262 | user = ctx.user() |
|
2263 | 2263 | if opts.get('user'): |
|
2264 | 2264 | user = opts['user'] |
|
2265 | 2265 | date = ctx.date() |
|
2266 | 2266 | if opts.get('date'): |
|
2267 | 2267 | date = opts['date'] |
|
2268 | 2268 | message = ctx.description() |
|
2269 | 2269 | if opts.get('log'): |
|
2270 | 2270 | message += '\n(grafted from %s)' % ctx.hex() |
|
2271 | 2271 | |
|
2272 | 2272 | # we don't merge the first commit when continuing |
|
2273 | 2273 | if not cont: |
|
2274 | 2274 | # perform the graft merge with p1(rev) as 'ancestor' |
|
2275 | 2275 | try: |
|
2276 | 2276 | # ui.forcemerge is an internal variable, do not document |
|
2277 | 2277 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
2278 | 2278 | 'graft') |
|
2279 | 2279 | stats = mergemod.graft(repo, ctx, ctx.p1(), |
|
2280 | 2280 | ['local', 'graft']) |
|
2281 | 2281 | finally: |
|
2282 | 2282 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
2283 | 2283 | # report any conflicts |
|
2284 | 2284 | if stats and stats[3] > 0: |
|
2285 | 2285 | # write out state for --continue |
|
2286 | 2286 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
2287 | 2287 | repo.vfs.write('graftstate', ''.join(nodelines)) |
|
2288 | 2288 | extra = '' |
|
2289 | 2289 | if opts.get('user'): |
|
2290 | 2290 | extra += ' --user %s' % util.shellquote(opts['user']) |
|
2291 | 2291 | if opts.get('date'): |
|
2292 | 2292 | extra += ' --date %s' % util.shellquote(opts['date']) |
|
2293 | 2293 | if opts.get('log'): |
|
2294 | 2294 | extra += ' --log' |
|
2295 | 2295 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
|
2296 | 2296 | raise error.Abort( |
|
2297 | 2297 | _("unresolved conflicts, can't continue"), |
|
2298 | 2298 | hint=hint) |
|
2299 | 2299 | else: |
|
2300 | 2300 | cont = False |
|
2301 | 2301 | |
|
2302 | 2302 | # commit |
|
2303 | 2303 | node = repo.commit(text=message, user=user, |
|
2304 | 2304 | date=date, extra=extra, editor=editor) |
|
2305 | 2305 | if node is None: |
|
2306 | 2306 | ui.warn( |
|
2307 | 2307 | _('note: graft of %d:%s created no changes to commit\n') % |
|
2308 | 2308 | (ctx.rev(), ctx)) |
|
2309 | 2309 | |
|
2310 | 2310 | # remove state when we complete successfully |
|
2311 | 2311 | if not opts.get('dry_run'): |
|
2312 | 2312 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) |
|
2313 | 2313 | |
|
2314 | 2314 | return 0 |
|
2315 | 2315 | |
|
2316 | 2316 | @command('grep', |
|
2317 | 2317 | [('0', 'print0', None, _('end fields with NUL')), |
|
2318 | 2318 | ('', 'all', None, _('print all revisions that match')), |
|
2319 | 2319 | ('a', 'text', None, _('treat all files as text')), |
|
2320 | 2320 | ('f', 'follow', None, |
|
2321 | 2321 | _('follow changeset history,' |
|
2322 | 2322 | ' or file history across copies and renames')), |
|
2323 | 2323 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
2324 | 2324 | ('l', 'files-with-matches', None, |
|
2325 | 2325 | _('print only filenames and revisions that match')), |
|
2326 | 2326 | ('n', 'line-number', None, _('print matching line numbers')), |
|
2327 | 2327 | ('r', 'rev', [], |
|
2328 | 2328 | _('only search files changed within revision range'), _('REV')), |
|
2329 | 2329 | ('u', 'user', None, _('list the author (long with -v)')), |
|
2330 | 2330 | ('d', 'date', None, _('list the date (short with -q)')), |
|
2331 | 2331 | ] + formatteropts + walkopts, |
|
2332 | 2332 | _('[OPTION]... PATTERN [FILE]...'), |
|
2333 | 2333 | inferrepo=True, cmdtype=readonly) |
|
2334 | 2334 | def grep(ui, repo, pattern, *pats, **opts): |
|
2335 | 2335 | """search revision history for a pattern in specified files |
|
2336 | 2336 | |
|
2337 | 2337 | Search revision history for a regular expression in the specified |
|
2338 | 2338 | files or the entire project. |
|
2339 | 2339 | |
|
2340 | 2340 | By default, grep prints the most recent revision number for each |
|
2341 | 2341 | file in which it finds a match. To get it to print every revision |
|
2342 | 2342 | that contains a change in match status ("-" for a match that becomes |
|
2343 | 2343 | a non-match, or "+" for a non-match that becomes a match), use the |
|
2344 | 2344 | --all flag. |
|
2345 | 2345 | |
|
2346 | 2346 | PATTERN can be any Python (roughly Perl-compatible) regular |
|
2347 | 2347 | expression. |
|
2348 | 2348 | |
|
2349 | 2349 | If no FILEs are specified (and -f/--follow isn't set), all files in |
|
2350 | 2350 | the repository are searched, including those that don't exist in the |
|
2351 | 2351 | current branch or have been deleted in a prior changeset. |
|
2352 | 2352 | |
|
2353 | 2353 | Returns 0 if a match is found, 1 otherwise. |
|
2354 | 2354 | """ |
|
2355 | 2355 | opts = pycompat.byteskwargs(opts) |
|
2356 | 2356 | reflags = re.M |
|
2357 | 2357 | if opts.get('ignore_case'): |
|
2358 | 2358 | reflags |= re.I |
|
2359 | 2359 | try: |
|
2360 | 2360 | regexp = util.re.compile(pattern, reflags) |
|
2361 | 2361 | except re.error as inst: |
|
2362 | 2362 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
2363 | 2363 | return 1 |
|
2364 | 2364 | sep, eol = ':', '\n' |
|
2365 | 2365 | if opts.get('print0'): |
|
2366 | 2366 | sep = eol = '\0' |
|
2367 | 2367 | |
|
2368 | 2368 | getfile = util.lrucachefunc(repo.file) |
|
2369 | 2369 | |
|
2370 | 2370 | def matchlines(body): |
|
2371 | 2371 | begin = 0 |
|
2372 | 2372 | linenum = 0 |
|
2373 | 2373 | while begin < len(body): |
|
2374 | 2374 | match = regexp.search(body, begin) |
|
2375 | 2375 | if not match: |
|
2376 | 2376 | break |
|
2377 | 2377 | mstart, mend = match.span() |
|
2378 | 2378 | linenum += body.count('\n', begin, mstart) + 1 |
|
2379 | 2379 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
2380 | 2380 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
2381 | 2381 | lend = begin - 1 |
|
2382 | 2382 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
2383 | 2383 | |
|
2384 | 2384 | class linestate(object): |
|
2385 | 2385 | def __init__(self, line, linenum, colstart, colend): |
|
2386 | 2386 | self.line = line |
|
2387 | 2387 | self.linenum = linenum |
|
2388 | 2388 | self.colstart = colstart |
|
2389 | 2389 | self.colend = colend |
|
2390 | 2390 | |
|
2391 | 2391 | def __hash__(self): |
|
2392 | 2392 | return hash((self.linenum, self.line)) |
|
2393 | 2393 | |
|
2394 | 2394 | def __eq__(self, other): |
|
2395 | 2395 | return self.line == other.line |
|
2396 | 2396 | |
|
2397 | 2397 | def findpos(self): |
|
2398 | 2398 | """Iterate all (start, end) indices of matches""" |
|
2399 | 2399 | yield self.colstart, self.colend |
|
2400 | 2400 | p = self.colend |
|
2401 | 2401 | while p < len(self.line): |
|
2402 | 2402 | m = regexp.search(self.line, p) |
|
2403 | 2403 | if not m: |
|
2404 | 2404 | break |
|
2405 | 2405 | yield m.span() |
|
2406 | 2406 | p = m.end() |
|
2407 | 2407 | |
|
2408 | 2408 | matches = {} |
|
2409 | 2409 | copies = {} |
|
2410 | 2410 | def grepbody(fn, rev, body): |
|
2411 | 2411 | matches[rev].setdefault(fn, []) |
|
2412 | 2412 | m = matches[rev][fn] |
|
2413 | 2413 | for lnum, cstart, cend, line in matchlines(body): |
|
2414 | 2414 | s = linestate(line, lnum, cstart, cend) |
|
2415 | 2415 | m.append(s) |
|
2416 | 2416 | |
|
2417 | 2417 | def difflinestates(a, b): |
|
2418 | 2418 | sm = difflib.SequenceMatcher(None, a, b) |
|
2419 | 2419 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
2420 | 2420 | if tag == 'insert': |
|
2421 | 2421 | for i in xrange(blo, bhi): |
|
2422 | 2422 | yield ('+', b[i]) |
|
2423 | 2423 | elif tag == 'delete': |
|
2424 | 2424 | for i in xrange(alo, ahi): |
|
2425 | 2425 | yield ('-', a[i]) |
|
2426 | 2426 | elif tag == 'replace': |
|
2427 | 2427 | for i in xrange(alo, ahi): |
|
2428 | 2428 | yield ('-', a[i]) |
|
2429 | 2429 | for i in xrange(blo, bhi): |
|
2430 | 2430 | yield ('+', b[i]) |
|
2431 | 2431 | |
|
2432 | 2432 | def display(fm, fn, ctx, pstates, states): |
|
2433 | 2433 | rev = ctx.rev() |
|
2434 | 2434 | if fm.isplain(): |
|
2435 | 2435 | formatuser = ui.shortuser |
|
2436 | 2436 | else: |
|
2437 | 2437 | formatuser = str |
|
2438 | 2438 | if ui.quiet: |
|
2439 | 2439 | datefmt = '%Y-%m-%d' |
|
2440 | 2440 | else: |
|
2441 | 2441 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' |
|
2442 | 2442 | found = False |
|
2443 | 2443 | @util.cachefunc |
|
2444 | 2444 | def binary(): |
|
2445 | 2445 | flog = getfile(fn) |
|
2446 | 2446 | return util.binary(flog.read(ctx.filenode(fn))) |
|
2447 | 2447 | |
|
2448 | 2448 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} |
|
2449 | 2449 | if opts.get('all'): |
|
2450 | 2450 | iter = difflinestates(pstates, states) |
|
2451 | 2451 | else: |
|
2452 | 2452 | iter = [('', l) for l in states] |
|
2453 | 2453 | for change, l in iter: |
|
2454 | 2454 | fm.startitem() |
|
2455 | 2455 | fm.data(node=fm.hexfunc(ctx.node())) |
|
2456 | 2456 | cols = [ |
|
2457 | 2457 | ('filename', fn, True), |
|
2458 | 2458 | ('rev', rev, True), |
|
2459 | 2459 | ('linenumber', l.linenum, opts.get('line_number')), |
|
2460 | 2460 | ] |
|
2461 | 2461 | if opts.get('all'): |
|
2462 | 2462 | cols.append(('change', change, True)) |
|
2463 | 2463 | cols.extend([ |
|
2464 | 2464 | ('user', formatuser(ctx.user()), opts.get('user')), |
|
2465 | 2465 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), |
|
2466 | 2466 | ]) |
|
2467 | 2467 | lastcol = next(name for name, data, cond in reversed(cols) if cond) |
|
2468 | 2468 | for name, data, cond in cols: |
|
2469 | 2469 | field = fieldnamemap.get(name, name) |
|
2470 | 2470 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) |
|
2471 | 2471 | if cond and name != lastcol: |
|
2472 | 2472 | fm.plain(sep, label='grep.sep') |
|
2473 | 2473 | if not opts.get('files_with_matches'): |
|
2474 | 2474 | fm.plain(sep, label='grep.sep') |
|
2475 | 2475 | if not opts.get('text') and binary(): |
|
2476 | 2476 | fm.plain(_(" Binary file matches")) |
|
2477 | 2477 | else: |
|
2478 | 2478 | displaymatches(fm.nested('texts'), l) |
|
2479 | 2479 | fm.plain(eol) |
|
2480 | 2480 | found = True |
|
2481 | 2481 | if opts.get('files_with_matches'): |
|
2482 | 2482 | break |
|
2483 | 2483 | return found |
|
2484 | 2484 | |
|
2485 | 2485 | def displaymatches(fm, l): |
|
2486 | 2486 | p = 0 |
|
2487 | 2487 | for s, e in l.findpos(): |
|
2488 | 2488 | if p < s: |
|
2489 | 2489 | fm.startitem() |
|
2490 | 2490 | fm.write('text', '%s', l.line[p:s]) |
|
2491 | 2491 | fm.data(matched=False) |
|
2492 | 2492 | fm.startitem() |
|
2493 | 2493 | fm.write('text', '%s', l.line[s:e], label='grep.match') |
|
2494 | 2494 | fm.data(matched=True) |
|
2495 | 2495 | p = e |
|
2496 | 2496 | if p < len(l.line): |
|
2497 | 2497 | fm.startitem() |
|
2498 | 2498 | fm.write('text', '%s', l.line[p:]) |
|
2499 | 2499 | fm.data(matched=False) |
|
2500 | 2500 | fm.end() |
|
2501 | 2501 | |
|
2502 | 2502 | skip = {} |
|
2503 | 2503 | revfiles = {} |
|
2504 | 2504 | match = scmutil.match(repo[None], pats, opts) |
|
2505 | 2505 | found = False |
|
2506 | 2506 | follow = opts.get('follow') |
|
2507 | 2507 | |
|
2508 | 2508 | def prep(ctx, fns): |
|
2509 | 2509 | rev = ctx.rev() |
|
2510 | 2510 | pctx = ctx.p1() |
|
2511 | 2511 | parent = pctx.rev() |
|
2512 | 2512 | matches.setdefault(rev, {}) |
|
2513 | 2513 | matches.setdefault(parent, {}) |
|
2514 | 2514 | files = revfiles.setdefault(rev, []) |
|
2515 | 2515 | for fn in fns: |
|
2516 | 2516 | flog = getfile(fn) |
|
2517 | 2517 | try: |
|
2518 | 2518 | fnode = ctx.filenode(fn) |
|
2519 | 2519 | except error.LookupError: |
|
2520 | 2520 | continue |
|
2521 | 2521 | |
|
2522 | 2522 | copied = flog.renamed(fnode) |
|
2523 | 2523 | copy = follow and copied and copied[0] |
|
2524 | 2524 | if copy: |
|
2525 | 2525 | copies.setdefault(rev, {})[fn] = copy |
|
2526 | 2526 | if fn in skip: |
|
2527 | 2527 | if copy: |
|
2528 | 2528 | skip[copy] = True |
|
2529 | 2529 | continue |
|
2530 | 2530 | files.append(fn) |
|
2531 | 2531 | |
|
2532 | 2532 | if fn not in matches[rev]: |
|
2533 | 2533 | grepbody(fn, rev, flog.read(fnode)) |
|
2534 | 2534 | |
|
2535 | 2535 | pfn = copy or fn |
|
2536 | 2536 | if pfn not in matches[parent]: |
|
2537 | 2537 | try: |
|
2538 | 2538 | fnode = pctx.filenode(pfn) |
|
2539 | 2539 | grepbody(pfn, parent, flog.read(fnode)) |
|
2540 | 2540 | except error.LookupError: |
|
2541 | 2541 | pass |
|
2542 | 2542 | |
|
2543 | 2543 | ui.pager('grep') |
|
2544 | 2544 | fm = ui.formatter('grep', opts) |
|
2545 | 2545 | for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): |
|
2546 | 2546 | rev = ctx.rev() |
|
2547 | 2547 | parent = ctx.p1().rev() |
|
2548 | 2548 | for fn in sorted(revfiles.get(rev, [])): |
|
2549 | 2549 | states = matches[rev][fn] |
|
2550 | 2550 | copy = copies.get(rev, {}).get(fn) |
|
2551 | 2551 | if fn in skip: |
|
2552 | 2552 | if copy: |
|
2553 | 2553 | skip[copy] = True |
|
2554 | 2554 | continue |
|
2555 | 2555 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
2556 | 2556 | if pstates or states: |
|
2557 | 2557 | r = display(fm, fn, ctx, pstates, states) |
|
2558 | 2558 | found = found or r |
|
2559 | 2559 | if r and not opts.get('all'): |
|
2560 | 2560 | skip[fn] = True |
|
2561 | 2561 | if copy: |
|
2562 | 2562 | skip[copy] = True |
|
2563 | 2563 | del matches[rev] |
|
2564 | 2564 | del revfiles[rev] |
|
2565 | 2565 | fm.end() |
|
2566 | 2566 | |
|
2567 | 2567 | return not found |
|
2568 | 2568 | |
|
2569 | 2569 | @command('heads', |
|
2570 | 2570 | [('r', 'rev', '', |
|
2571 | 2571 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
2572 | 2572 | ('t', 'topo', False, _('show topological heads only')), |
|
2573 | 2573 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
2574 | 2574 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
2575 | 2575 | ] + templateopts, |
|
2576 | 2576 | _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly) |
|
2577 | 2577 | def heads(ui, repo, *branchrevs, **opts): |
|
2578 | 2578 | """show branch heads |
|
2579 | 2579 | |
|
2580 | 2580 | With no arguments, show all open branch heads in the repository. |
|
2581 | 2581 | Branch heads are changesets that have no descendants on the |
|
2582 | 2582 | same branch. They are where development generally takes place and |
|
2583 | 2583 | are the usual targets for update and merge operations. |
|
2584 | 2584 | |
|
2585 | 2585 | If one or more REVs are given, only open branch heads on the |
|
2586 | 2586 | branches associated with the specified changesets are shown. This |
|
2587 | 2587 | means that you can use :hg:`heads .` to see the heads on the |
|
2588 | 2588 | currently checked-out branch. |
|
2589 | 2589 | |
|
2590 | 2590 | If -c/--closed is specified, also show branch heads marked closed |
|
2591 | 2591 | (see :hg:`commit --close-branch`). |
|
2592 | 2592 | |
|
2593 | 2593 | If STARTREV is specified, only those heads that are descendants of |
|
2594 | 2594 | STARTREV will be displayed. |
|
2595 | 2595 | |
|
2596 | 2596 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
2597 | 2597 | topological heads (changesets with no children) will be shown. |
|
2598 | 2598 | |
|
2599 | 2599 | Returns 0 if matching heads are found, 1 if not. |
|
2600 | 2600 | """ |
|
2601 | 2601 | |
|
2602 | 2602 | opts = pycompat.byteskwargs(opts) |
|
2603 | 2603 | start = None |
|
2604 | 2604 | rev = opts.get('rev') |
|
2605 | 2605 | if rev: |
|
2606 | 2606 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
2607 | 2607 | start = scmutil.revsingle(repo, rev, None).node() |
|
2608 | 2608 | |
|
2609 | 2609 | if opts.get('topo'): |
|
2610 | 2610 | heads = [repo[h] for h in repo.heads(start)] |
|
2611 | 2611 | else: |
|
2612 | 2612 | heads = [] |
|
2613 | 2613 | for branch in repo.branchmap(): |
|
2614 | 2614 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
2615 | 2615 | heads = [repo[h] for h in heads] |
|
2616 | 2616 | |
|
2617 | 2617 | if branchrevs: |
|
2618 | 2618 | branches = set(repo[br].branch() for br in branchrevs) |
|
2619 | 2619 | heads = [h for h in heads if h.branch() in branches] |
|
2620 | 2620 | |
|
2621 | 2621 | if opts.get('active') and branchrevs: |
|
2622 | 2622 | dagheads = repo.heads(start) |
|
2623 | 2623 | heads = [h for h in heads if h.node() in dagheads] |
|
2624 | 2624 | |
|
2625 | 2625 | if branchrevs: |
|
2626 | 2626 | haveheads = set(h.branch() for h in heads) |
|
2627 | 2627 | if branches - haveheads: |
|
2628 | 2628 | headless = ', '.join(b for b in branches - haveheads) |
|
2629 | 2629 | msg = _('no open branch heads found on branches %s') |
|
2630 | 2630 | if opts.get('rev'): |
|
2631 | 2631 | msg += _(' (started at %s)') % opts['rev'] |
|
2632 | 2632 | ui.warn((msg + '\n') % headless) |
|
2633 | 2633 | |
|
2634 | 2634 | if not heads: |
|
2635 | 2635 | return 1 |
|
2636 | 2636 | |
|
2637 | 2637 | ui.pager('heads') |
|
2638 | 2638 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
2639 | 2639 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2640 | 2640 | for ctx in heads: |
|
2641 | 2641 | displayer.show(ctx) |
|
2642 | 2642 | displayer.close() |
|
2643 | 2643 | |
|
2644 | 2644 | @command('help', |
|
2645 | 2645 | [('e', 'extension', None, _('show only help for extensions')), |
|
2646 | 2646 | ('c', 'command', None, _('show only help for commands')), |
|
2647 | 2647 | ('k', 'keyword', None, _('show topics matching keyword')), |
|
2648 | 2648 | ('s', 'system', [], _('show help for specific platform(s)')), |
|
2649 | 2649 | ], |
|
2650 | 2650 | _('[-ecks] [TOPIC]'), |
|
2651 | 2651 | norepo=True, cmdtype=readonly) |
|
2652 | 2652 | def help_(ui, name=None, **opts): |
|
2653 | 2653 | """show help for a given topic or a help overview |
|
2654 | 2654 | |
|
2655 | 2655 | With no arguments, print a list of commands with short help messages. |
|
2656 | 2656 | |
|
2657 | 2657 | Given a topic, extension, or command name, print help for that |
|
2658 | 2658 | topic. |
|
2659 | 2659 | |
|
2660 | 2660 | Returns 0 if successful. |
|
2661 | 2661 | """ |
|
2662 | 2662 | |
|
2663 | 2663 | keep = opts.get(r'system') or [] |
|
2664 | 2664 | if len(keep) == 0: |
|
2665 | 2665 | if pycompat.sysplatform.startswith('win'): |
|
2666 | 2666 | keep.append('windows') |
|
2667 | 2667 | elif pycompat.sysplatform == 'OpenVMS': |
|
2668 | 2668 | keep.append('vms') |
|
2669 | 2669 | elif pycompat.sysplatform == 'plan9': |
|
2670 | 2670 | keep.append('plan9') |
|
2671 | 2671 | else: |
|
2672 | 2672 | keep.append('unix') |
|
2673 | 2673 | keep.append(pycompat.sysplatform.lower()) |
|
2674 | 2674 | if ui.verbose: |
|
2675 | 2675 | keep.append('verbose') |
|
2676 | 2676 | |
|
2677 | 2677 | commands = sys.modules[__name__] |
|
2678 | 2678 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) |
|
2679 | 2679 | ui.pager('help') |
|
2680 | 2680 | ui.write(formatted) |
|
2681 | 2681 | |
|
2682 | 2682 | |
|
2683 | 2683 | @command('identify|id', |
|
2684 | 2684 | [('r', 'rev', '', |
|
2685 | 2685 | _('identify the specified revision'), _('REV')), |
|
2686 | 2686 | ('n', 'num', None, _('show local revision number')), |
|
2687 | 2687 | ('i', 'id', None, _('show global revision id')), |
|
2688 | 2688 | ('b', 'branch', None, _('show branch')), |
|
2689 | 2689 | ('t', 'tags', None, _('show tags')), |
|
2690 | 2690 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
2691 | 2691 | ] + remoteopts + formatteropts, |
|
2692 | 2692 | _('[-nibtB] [-r REV] [SOURCE]'), |
|
2693 | 2693 | optionalrepo=True, cmdtype=readonly) |
|
2694 | 2694 | def identify(ui, repo, source=None, rev=None, |
|
2695 | 2695 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
2696 | 2696 | """identify the working directory or specified revision |
|
2697 | 2697 | |
|
2698 | 2698 | Print a summary identifying the repository state at REV using one or |
|
2699 | 2699 | two parent hash identifiers, followed by a "+" if the working |
|
2700 | 2700 | directory has uncommitted changes, the branch name (if not default), |
|
2701 | 2701 | a list of tags, and a list of bookmarks. |
|
2702 | 2702 | |
|
2703 | 2703 | When REV is not given, print a summary of the current state of the |
|
2704 | 2704 | repository. |
|
2705 | 2705 | |
|
2706 | 2706 | Specifying a path to a repository root or Mercurial bundle will |
|
2707 | 2707 | cause lookup to operate on that repository/bundle. |
|
2708 | 2708 | |
|
2709 | 2709 | .. container:: verbose |
|
2710 | 2710 | |
|
2711 | 2711 | Examples: |
|
2712 | 2712 | |
|
2713 | 2713 | - generate a build identifier for the working directory:: |
|
2714 | 2714 | |
|
2715 | 2715 | hg id --id > build-id.dat |
|
2716 | 2716 | |
|
2717 | 2717 | - find the revision corresponding to a tag:: |
|
2718 | 2718 | |
|
2719 | 2719 | hg id -n -r 1.3 |
|
2720 | 2720 | |
|
2721 | 2721 | - check the most recent revision of a remote repository:: |
|
2722 | 2722 | |
|
2723 | 2723 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ |
|
2724 | 2724 | |
|
2725 | 2725 | See :hg:`log` for generating more information about specific revisions, |
|
2726 | 2726 | including full hash identifiers. |
|
2727 | 2727 | |
|
2728 | 2728 | Returns 0 if successful. |
|
2729 | 2729 | """ |
|
2730 | 2730 | |
|
2731 | 2731 | opts = pycompat.byteskwargs(opts) |
|
2732 | 2732 | if not repo and not source: |
|
2733 | 2733 | raise error.Abort(_("there is no Mercurial repository here " |
|
2734 | 2734 | "(.hg not found)")) |
|
2735 | 2735 | |
|
2736 | 2736 | if ui.debugflag: |
|
2737 | 2737 | hexfunc = hex |
|
2738 | 2738 | else: |
|
2739 | 2739 | hexfunc = short |
|
2740 | 2740 | default = not (num or id or branch or tags or bookmarks) |
|
2741 | 2741 | output = [] |
|
2742 | 2742 | revs = [] |
|
2743 | 2743 | |
|
2744 | 2744 | if source: |
|
2745 | 2745 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
2746 | 2746 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
2747 | 2747 | repo = peer.local() |
|
2748 | 2748 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
2749 | 2749 | |
|
2750 | 2750 | fm = ui.formatter('identify', opts) |
|
2751 | 2751 | fm.startitem() |
|
2752 | 2752 | |
|
2753 | 2753 | if not repo: |
|
2754 | 2754 | if num or branch or tags: |
|
2755 | 2755 | raise error.Abort( |
|
2756 | 2756 | _("can't query remote revision number, branch, or tags")) |
|
2757 | 2757 | if not rev and revs: |
|
2758 | 2758 | rev = revs[0] |
|
2759 | 2759 | if not rev: |
|
2760 | 2760 | rev = "tip" |
|
2761 | 2761 | |
|
2762 | 2762 | remoterev = peer.lookup(rev) |
|
2763 | 2763 | hexrev = hexfunc(remoterev) |
|
2764 | 2764 | if default or id: |
|
2765 | 2765 | output = [hexrev] |
|
2766 | 2766 | fm.data(id=hexrev) |
|
2767 | 2767 | |
|
2768 | 2768 | def getbms(): |
|
2769 | 2769 | bms = [] |
|
2770 | 2770 | |
|
2771 | 2771 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
2772 | 2772 | hexremoterev = hex(remoterev) |
|
2773 | 2773 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
2774 | 2774 | if bmr == hexremoterev] |
|
2775 | 2775 | |
|
2776 | 2776 | return sorted(bms) |
|
2777 | 2777 | |
|
2778 | 2778 | bms = getbms() |
|
2779 | 2779 | if bookmarks: |
|
2780 | 2780 | output.extend(bms) |
|
2781 | 2781 | elif default and not ui.quiet: |
|
2782 | 2782 | # multiple bookmarks for a single parent separated by '/' |
|
2783 | 2783 | bm = '/'.join(bms) |
|
2784 | 2784 | if bm: |
|
2785 | 2785 | output.append(bm) |
|
2786 | 2786 | |
|
2787 | 2787 | fm.data(node=hex(remoterev)) |
|
2788 | 2788 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) |
|
2789 | 2789 | else: |
|
2790 | 2790 | if rev: |
|
2791 | 2791 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
2792 | 2792 | ctx = scmutil.revsingle(repo, rev, None) |
|
2793 | 2793 | |
|
2794 | 2794 | if ctx.rev() is None: |
|
2795 | 2795 | ctx = repo[None] |
|
2796 | 2796 | parents = ctx.parents() |
|
2797 | 2797 | taglist = [] |
|
2798 | 2798 | for p in parents: |
|
2799 | 2799 | taglist.extend(p.tags()) |
|
2800 | 2800 | |
|
2801 | 2801 | dirty = "" |
|
2802 | 2802 | if ctx.dirty(missing=True, merge=False, branch=False): |
|
2803 | 2803 | dirty = '+' |
|
2804 | 2804 | fm.data(dirty=dirty) |
|
2805 | 2805 | |
|
2806 | 2806 | hexoutput = [hexfunc(p.node()) for p in parents] |
|
2807 | 2807 | if default or id: |
|
2808 | 2808 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] |
|
2809 | 2809 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) |
|
2810 | 2810 | |
|
2811 | 2811 | if num: |
|
2812 | 2812 | numoutput = ["%d" % p.rev() for p in parents] |
|
2813 | 2813 | output.append("%s%s" % ('+'.join(numoutput), dirty)) |
|
2814 | 2814 | |
|
2815 | 2815 | fn = fm.nested('parents') |
|
2816 | 2816 | for p in parents: |
|
2817 | 2817 | fn.startitem() |
|
2818 | 2818 | fn.data(rev=p.rev()) |
|
2819 | 2819 | fn.data(node=p.hex()) |
|
2820 | 2820 | fn.context(ctx=p) |
|
2821 | 2821 | fn.end() |
|
2822 | 2822 | else: |
|
2823 | 2823 | hexoutput = hexfunc(ctx.node()) |
|
2824 | 2824 | if default or id: |
|
2825 | 2825 | output = [hexoutput] |
|
2826 | 2826 | fm.data(id=hexoutput) |
|
2827 | 2827 | |
|
2828 | 2828 | if num: |
|
2829 | 2829 | output.append(pycompat.bytestr(ctx.rev())) |
|
2830 | 2830 | taglist = ctx.tags() |
|
2831 | 2831 | |
|
2832 | 2832 | if default and not ui.quiet: |
|
2833 | 2833 | b = ctx.branch() |
|
2834 | 2834 | if b != 'default': |
|
2835 | 2835 | output.append("(%s)" % b) |
|
2836 | 2836 | |
|
2837 | 2837 | # multiple tags for a single parent separated by '/' |
|
2838 | 2838 | t = '/'.join(taglist) |
|
2839 | 2839 | if t: |
|
2840 | 2840 | output.append(t) |
|
2841 | 2841 | |
|
2842 | 2842 | # multiple bookmarks for a single parent separated by '/' |
|
2843 | 2843 | bm = '/'.join(ctx.bookmarks()) |
|
2844 | 2844 | if bm: |
|
2845 | 2845 | output.append(bm) |
|
2846 | 2846 | else: |
|
2847 | 2847 | if branch: |
|
2848 | 2848 | output.append(ctx.branch()) |
|
2849 | 2849 | |
|
2850 | 2850 | if tags: |
|
2851 | 2851 | output.extend(taglist) |
|
2852 | 2852 | |
|
2853 | 2853 | if bookmarks: |
|
2854 | 2854 | output.extend(ctx.bookmarks()) |
|
2855 | 2855 | |
|
2856 | 2856 | fm.data(node=ctx.hex()) |
|
2857 | 2857 | fm.data(branch=ctx.branch()) |
|
2858 | 2858 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) |
|
2859 | 2859 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) |
|
2860 | 2860 | fm.context(ctx=ctx) |
|
2861 | 2861 | |
|
2862 | 2862 | fm.plain("%s\n" % ' '.join(output)) |
|
2863 | 2863 | fm.end() |
|
2864 | 2864 | |
|
2865 | 2865 | @command('import|patch', |
|
2866 | 2866 | [('p', 'strip', 1, |
|
2867 | 2867 | _('directory strip option for patch. This has the same ' |
|
2868 | 2868 | 'meaning as the corresponding patch option'), _('NUM')), |
|
2869 | 2869 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
2870 | 2870 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2871 | 2871 | ('f', 'force', None, |
|
2872 | 2872 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
2873 | 2873 | ('', 'no-commit', None, |
|
2874 | 2874 | _("don't commit, just update the working directory")), |
|
2875 | 2875 | ('', 'bypass', None, |
|
2876 | 2876 | _("apply patch without touching the working directory")), |
|
2877 | 2877 | ('', 'partial', None, |
|
2878 | 2878 | _('commit even if some hunks fail')), |
|
2879 | 2879 | ('', 'exact', None, |
|
2880 | 2880 | _('abort if patch would apply lossily')), |
|
2881 | 2881 | ('', 'prefix', '', |
|
2882 | 2882 | _('apply patch to subdirectory'), _('DIR')), |
|
2883 | 2883 | ('', 'import-branch', None, |
|
2884 | 2884 | _('use any branch information in patch (implied by --exact)'))] + |
|
2885 | 2885 | commitopts + commitopts2 + similarityopts, |
|
2886 | 2886 | _('[OPTION]... PATCH...')) |
|
2887 | 2887 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
2888 | 2888 | """import an ordered set of patches |
|
2889 | 2889 | |
|
2890 | 2890 | Import a list of patches and commit them individually (unless |
|
2891 | 2891 | --no-commit is specified). |
|
2892 | 2892 | |
|
2893 | 2893 | To read a patch from standard input (stdin), use "-" as the patch |
|
2894 | 2894 | name. If a URL is specified, the patch will be downloaded from |
|
2895 | 2895 | there. |
|
2896 | 2896 | |
|
2897 | 2897 | Import first applies changes to the working directory (unless |
|
2898 | 2898 | --bypass is specified), import will abort if there are outstanding |
|
2899 | 2899 | changes. |
|
2900 | 2900 | |
|
2901 | 2901 | Use --bypass to apply and commit patches directly to the |
|
2902 | 2902 | repository, without affecting the working directory. Without |
|
2903 | 2903 | --exact, patches will be applied on top of the working directory |
|
2904 | 2904 | parent revision. |
|
2905 | 2905 | |
|
2906 | 2906 | You can import a patch straight from a mail message. Even patches |
|
2907 | 2907 | as attachments work (to use the body part, it must have type |
|
2908 | 2908 | text/plain or text/x-patch). From and Subject headers of email |
|
2909 | 2909 | message are used as default committer and commit message. All |
|
2910 | 2910 | text/plain body parts before first diff are added to the commit |
|
2911 | 2911 | message. |
|
2912 | 2912 | |
|
2913 | 2913 | If the imported patch was generated by :hg:`export`, user and |
|
2914 | 2914 | description from patch override values from message headers and |
|
2915 | 2915 | body. Values given on command line with -m/--message and -u/--user |
|
2916 | 2916 | override these. |
|
2917 | 2917 | |
|
2918 | 2918 | If --exact is specified, import will set the working directory to |
|
2919 | 2919 | the parent of each patch before applying it, and will abort if the |
|
2920 | 2920 | resulting changeset has a different ID than the one recorded in |
|
2921 | 2921 | the patch. This will guard against various ways that portable |
|
2922 | 2922 | patch formats and mail systems might fail to transfer Mercurial |
|
2923 | 2923 | data or metadata. See :hg:`bundle` for lossless transmission. |
|
2924 | 2924 | |
|
2925 | 2925 | Use --partial to ensure a changeset will be created from the patch |
|
2926 | 2926 | even if some hunks fail to apply. Hunks that fail to apply will be |
|
2927 | 2927 | written to a <target-file>.rej file. Conflicts can then be resolved |
|
2928 | 2928 | by hand before :hg:`commit --amend` is run to update the created |
|
2929 | 2929 | changeset. This flag exists to let people import patches that |
|
2930 | 2930 | partially apply without losing the associated metadata (author, |
|
2931 | 2931 | date, description, ...). |
|
2932 | 2932 | |
|
2933 | 2933 | .. note:: |
|
2934 | 2934 | |
|
2935 | 2935 | When no hunks apply cleanly, :hg:`import --partial` will create |
|
2936 | 2936 | an empty changeset, importing only the patch metadata. |
|
2937 | 2937 | |
|
2938 | 2938 | With -s/--similarity, hg will attempt to discover renames and |
|
2939 | 2939 | copies in the patch in the same way as :hg:`addremove`. |
|
2940 | 2940 | |
|
2941 | 2941 | It is possible to use external patch programs to perform the patch |
|
2942 | 2942 | by setting the ``ui.patch`` configuration option. For the default |
|
2943 | 2943 | internal tool, the fuzz can also be configured via ``patch.fuzz``. |
|
2944 | 2944 | See :hg:`help config` for more information about configuration |
|
2945 | 2945 | files and how to use these options. |
|
2946 | 2946 | |
|
2947 | 2947 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2948 | 2948 | |
|
2949 | 2949 | .. container:: verbose |
|
2950 | 2950 | |
|
2951 | 2951 | Examples: |
|
2952 | 2952 | |
|
2953 | 2953 | - import a traditional patch from a website and detect renames:: |
|
2954 | 2954 | |
|
2955 | 2955 | hg import -s 80 http://example.com/bugfix.patch |
|
2956 | 2956 | |
|
2957 | 2957 | - import a changeset from an hgweb server:: |
|
2958 | 2958 | |
|
2959 | 2959 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa |
|
2960 | 2960 | |
|
2961 | 2961 | - import all the patches in an Unix-style mbox:: |
|
2962 | 2962 | |
|
2963 | 2963 | hg import incoming-patches.mbox |
|
2964 | 2964 | |
|
2965 | 2965 | - import patches from stdin:: |
|
2966 | 2966 | |
|
2967 | 2967 | hg import - |
|
2968 | 2968 | |
|
2969 | 2969 | - attempt to exactly restore an exported changeset (not always |
|
2970 | 2970 | possible):: |
|
2971 | 2971 | |
|
2972 | 2972 | hg import --exact proposed-fix.patch |
|
2973 | 2973 | |
|
2974 | 2974 | - use an external tool to apply a patch which is too fuzzy for |
|
2975 | 2975 | the default internal tool. |
|
2976 | 2976 | |
|
2977 | 2977 | hg import --config ui.patch="patch --merge" fuzzy.patch |
|
2978 | 2978 | |
|
2979 | 2979 | - change the default fuzzing from 2 to a less strict 7 |
|
2980 | 2980 | |
|
2981 | 2981 | hg import --config ui.fuzz=7 fuzz.patch |
|
2982 | 2982 | |
|
2983 | 2983 | Returns 0 on success, 1 on partial success (see --partial). |
|
2984 | 2984 | """ |
|
2985 | 2985 | |
|
2986 | 2986 | opts = pycompat.byteskwargs(opts) |
|
2987 | 2987 | if not patch1: |
|
2988 | 2988 | raise error.Abort(_('need at least one patch to import')) |
|
2989 | 2989 | |
|
2990 | 2990 | patches = (patch1,) + patches |
|
2991 | 2991 | |
|
2992 | 2992 | date = opts.get('date') |
|
2993 | 2993 | if date: |
|
2994 | 2994 | opts['date'] = util.parsedate(date) |
|
2995 | 2995 | |
|
2996 | 2996 | exact = opts.get('exact') |
|
2997 | 2997 | update = not opts.get('bypass') |
|
2998 | 2998 | if not update and opts.get('no_commit'): |
|
2999 | 2999 | raise error.Abort(_('cannot use --no-commit with --bypass')) |
|
3000 | 3000 | try: |
|
3001 | 3001 | sim = float(opts.get('similarity') or 0) |
|
3002 | 3002 | except ValueError: |
|
3003 | 3003 | raise error.Abort(_('similarity must be a number')) |
|
3004 | 3004 | if sim < 0 or sim > 100: |
|
3005 | 3005 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
3006 | 3006 | if sim and not update: |
|
3007 | 3007 | raise error.Abort(_('cannot use --similarity with --bypass')) |
|
3008 | 3008 | if exact: |
|
3009 | 3009 | if opts.get('edit'): |
|
3010 | 3010 | raise error.Abort(_('cannot use --exact with --edit')) |
|
3011 | 3011 | if opts.get('prefix'): |
|
3012 | 3012 | raise error.Abort(_('cannot use --exact with --prefix')) |
|
3013 | 3013 | |
|
3014 | 3014 | base = opts["base"] |
|
3015 | 3015 | wlock = dsguard = lock = tr = None |
|
3016 | 3016 | msgs = [] |
|
3017 | 3017 | ret = 0 |
|
3018 | 3018 | |
|
3019 | 3019 | |
|
3020 | 3020 | try: |
|
3021 | 3021 | wlock = repo.wlock() |
|
3022 | 3022 | |
|
3023 | 3023 | if update: |
|
3024 | 3024 | cmdutil.checkunfinished(repo) |
|
3025 | 3025 | if (exact or not opts.get('force')): |
|
3026 | 3026 | cmdutil.bailifchanged(repo) |
|
3027 | 3027 | |
|
3028 | 3028 | if not opts.get('no_commit'): |
|
3029 | 3029 | lock = repo.lock() |
|
3030 | 3030 | tr = repo.transaction('import') |
|
3031 | 3031 | else: |
|
3032 | 3032 | dsguard = dirstateguard.dirstateguard(repo, 'import') |
|
3033 | 3033 | parents = repo[None].parents() |
|
3034 | 3034 | for patchurl in patches: |
|
3035 | 3035 | if patchurl == '-': |
|
3036 | 3036 | ui.status(_('applying patch from stdin\n')) |
|
3037 | 3037 | patchfile = ui.fin |
|
3038 | 3038 | patchurl = 'stdin' # for error message |
|
3039 | 3039 | else: |
|
3040 | 3040 | patchurl = os.path.join(base, patchurl) |
|
3041 | 3041 | ui.status(_('applying %s\n') % patchurl) |
|
3042 | 3042 | patchfile = hg.openpath(ui, patchurl) |
|
3043 | 3043 | |
|
3044 | 3044 | haspatch = False |
|
3045 | 3045 | for hunk in patch.split(patchfile): |
|
3046 | 3046 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, |
|
3047 | 3047 | parents, opts, |
|
3048 | 3048 | msgs, hg.clean) |
|
3049 | 3049 | if msg: |
|
3050 | 3050 | haspatch = True |
|
3051 | 3051 | ui.note(msg + '\n') |
|
3052 | 3052 | if update or exact: |
|
3053 | 3053 | parents = repo[None].parents() |
|
3054 | 3054 | else: |
|
3055 | 3055 | parents = [repo[node]] |
|
3056 | 3056 | if rej: |
|
3057 | 3057 | ui.write_err(_("patch applied partially\n")) |
|
3058 | 3058 | ui.write_err(_("(fix the .rej files and run " |
|
3059 | 3059 | "`hg commit --amend`)\n")) |
|
3060 | 3060 | ret = 1 |
|
3061 | 3061 | break |
|
3062 | 3062 | |
|
3063 | 3063 | if not haspatch: |
|
3064 | 3064 | raise error.Abort(_('%s: no diffs found') % patchurl) |
|
3065 | 3065 | |
|
3066 | 3066 | if tr: |
|
3067 | 3067 | tr.close() |
|
3068 | 3068 | if msgs: |
|
3069 | 3069 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3070 | 3070 | if dsguard: |
|
3071 | 3071 | dsguard.close() |
|
3072 | 3072 | return ret |
|
3073 | 3073 | finally: |
|
3074 | 3074 | if tr: |
|
3075 | 3075 | tr.release() |
|
3076 | 3076 | release(lock, dsguard, wlock) |
|
3077 | 3077 | |
|
3078 | 3078 | @command('incoming|in', |
|
3079 | 3079 | [('f', 'force', None, |
|
3080 | 3080 | _('run even if remote repository is unrelated')), |
|
3081 | 3081 | ('n', 'newest-first', None, _('show newest record first')), |
|
3082 | 3082 | ('', 'bundle', '', |
|
3083 | 3083 | _('file to store the bundles into'), _('FILE')), |
|
3084 | 3084 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3085 | 3085 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3086 | 3086 | ('b', 'branch', [], |
|
3087 | 3087 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3088 | 3088 | ] + logopts + remoteopts + subrepoopts, |
|
3089 | 3089 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3090 | 3090 | def incoming(ui, repo, source="default", **opts): |
|
3091 | 3091 | """show new changesets found in source |
|
3092 | 3092 | |
|
3093 | 3093 | Show new changesets found in the specified path/URL or the default |
|
3094 | 3094 | pull location. These are the changesets that would have been pulled |
|
3095 | 3095 | by :hg:`pull` at the time you issued this command. |
|
3096 | 3096 | |
|
3097 | 3097 | See pull for valid source format details. |
|
3098 | 3098 | |
|
3099 | 3099 | .. container:: verbose |
|
3100 | 3100 | |
|
3101 | 3101 | With -B/--bookmarks, the result of bookmark comparison between |
|
3102 | 3102 | local and remote repositories is displayed. With -v/--verbose, |
|
3103 | 3103 | status is also displayed for each bookmark like below:: |
|
3104 | 3104 | |
|
3105 | 3105 | BM1 01234567890a added |
|
3106 | 3106 | BM2 1234567890ab advanced |
|
3107 | 3107 | BM3 234567890abc diverged |
|
3108 | 3108 | BM4 34567890abcd changed |
|
3109 | 3109 | |
|
3110 | 3110 | The action taken locally when pulling depends on the |
|
3111 | 3111 | status of each bookmark: |
|
3112 | 3112 | |
|
3113 | 3113 | :``added``: pull will create it |
|
3114 | 3114 | :``advanced``: pull will update it |
|
3115 | 3115 | :``diverged``: pull will create a divergent bookmark |
|
3116 | 3116 | :``changed``: result depends on remote changesets |
|
3117 | 3117 | |
|
3118 | 3118 | From the point of view of pulling behavior, bookmark |
|
3119 | 3119 | existing only in the remote repository are treated as ``added``, |
|
3120 | 3120 | even if it is in fact locally deleted. |
|
3121 | 3121 | |
|
3122 | 3122 | .. container:: verbose |
|
3123 | 3123 | |
|
3124 | 3124 | For remote repository, using --bundle avoids downloading the |
|
3125 | 3125 | changesets twice if the incoming is followed by a pull. |
|
3126 | 3126 | |
|
3127 | 3127 | Examples: |
|
3128 | 3128 | |
|
3129 | 3129 | - show incoming changes with patches and full description:: |
|
3130 | 3130 | |
|
3131 | 3131 | hg incoming -vp |
|
3132 | 3132 | |
|
3133 | 3133 | - show incoming changes excluding merges, store a bundle:: |
|
3134 | 3134 | |
|
3135 | 3135 | hg in -vpM --bundle incoming.hg |
|
3136 | 3136 | hg pull incoming.hg |
|
3137 | 3137 | |
|
3138 | 3138 | - briefly list changes inside a bundle:: |
|
3139 | 3139 | |
|
3140 | 3140 | hg in changes.hg -T "{desc|firstline}\\n" |
|
3141 | 3141 | |
|
3142 | 3142 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3143 | 3143 | """ |
|
3144 | 3144 | opts = pycompat.byteskwargs(opts) |
|
3145 | 3145 | if opts.get('graph'): |
|
3146 | 3146 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3147 | 3147 | def display(other, chlist, displayer): |
|
3148 | 3148 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
3149 | 3149 | cmdutil.displaygraph(ui, repo, revdag, displayer, |
|
3150 | 3150 | graphmod.asciiedges) |
|
3151 | 3151 | |
|
3152 | 3152 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3153 | 3153 | return 0 |
|
3154 | 3154 | |
|
3155 | 3155 | if opts.get('bundle') and opts.get('subrepos'): |
|
3156 | 3156 | raise error.Abort(_('cannot combine --bundle and --subrepos')) |
|
3157 | 3157 | |
|
3158 | 3158 | if opts.get('bookmarks'): |
|
3159 | 3159 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3160 | 3160 | opts.get('branch')) |
|
3161 | 3161 | other = hg.peer(repo, opts, source) |
|
3162 | 3162 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3163 | 3163 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3164 | 3164 | return 0 |
|
3165 | 3165 | ui.pager('incoming') |
|
3166 | 3166 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3167 | 3167 | return bookmarks.incoming(ui, repo, other) |
|
3168 | 3168 | |
|
3169 | 3169 | repo._subtoppath = ui.expandpath(source) |
|
3170 | 3170 | try: |
|
3171 | 3171 | return hg.incoming(ui, repo, source, opts) |
|
3172 | 3172 | finally: |
|
3173 | 3173 | del repo._subtoppath |
|
3174 | 3174 | |
|
3175 | 3175 | |
|
3176 | 3176 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), |
|
3177 | 3177 | norepo=True) |
|
3178 | 3178 | def init(ui, dest=".", **opts): |
|
3179 | 3179 | """create a new repository in the given directory |
|
3180 | 3180 | |
|
3181 | 3181 | Initialize a new repository in the given directory. If the given |
|
3182 | 3182 | directory does not exist, it will be created. |
|
3183 | 3183 | |
|
3184 | 3184 | If no directory is given, the current directory is used. |
|
3185 | 3185 | |
|
3186 | 3186 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3187 | 3187 | See :hg:`help urls` for more information. |
|
3188 | 3188 | |
|
3189 | 3189 | Returns 0 on success. |
|
3190 | 3190 | """ |
|
3191 | 3191 | opts = pycompat.byteskwargs(opts) |
|
3192 | 3192 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3193 | 3193 | |
|
3194 | 3194 | @command('locate', |
|
3195 | 3195 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3196 | 3196 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3197 | 3197 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3198 | 3198 | ] + walkopts, |
|
3199 | 3199 | _('[OPTION]... [PATTERN]...')) |
|
3200 | 3200 | def locate(ui, repo, *pats, **opts): |
|
3201 | 3201 | """locate files matching specific patterns (DEPRECATED) |
|
3202 | 3202 | |
|
3203 | 3203 | Print files under Mercurial control in the working directory whose |
|
3204 | 3204 | names match the given patterns. |
|
3205 | 3205 | |
|
3206 | 3206 | By default, this command searches all directories in the working |
|
3207 | 3207 | directory. To search just the current directory and its |
|
3208 | 3208 | subdirectories, use "--include .". |
|
3209 | 3209 | |
|
3210 | 3210 | If no patterns are given to match, this command prints the names |
|
3211 | 3211 | of all files under Mercurial control in the working directory. |
|
3212 | 3212 | |
|
3213 | 3213 | If you want to feed the output of this command into the "xargs" |
|
3214 | 3214 | command, use the -0 option to both this command and "xargs". This |
|
3215 | 3215 | will avoid the problem of "xargs" treating single filenames that |
|
3216 | 3216 | contain whitespace as multiple filenames. |
|
3217 | 3217 | |
|
3218 | 3218 | See :hg:`help files` for a more versatile command. |
|
3219 | 3219 | |
|
3220 | 3220 | Returns 0 if a match is found, 1 otherwise. |
|
3221 | 3221 | """ |
|
3222 | 3222 | opts = pycompat.byteskwargs(opts) |
|
3223 | 3223 | if opts.get('print0'): |
|
3224 | 3224 | end = '\0' |
|
3225 | 3225 | else: |
|
3226 | 3226 | end = '\n' |
|
3227 | 3227 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3228 | 3228 | |
|
3229 | 3229 | ret = 1 |
|
3230 | 3230 | ctx = repo[rev] |
|
3231 | 3231 | m = scmutil.match(ctx, pats, opts, default='relglob', |
|
3232 | 3232 | badfn=lambda x, y: False) |
|
3233 | 3233 | |
|
3234 | 3234 | ui.pager('locate') |
|
3235 | 3235 | for abs in ctx.matches(m): |
|
3236 | 3236 | if opts.get('fullpath'): |
|
3237 | 3237 | ui.write(repo.wjoin(abs), end) |
|
3238 | 3238 | else: |
|
3239 | 3239 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3240 | 3240 | ret = 0 |
|
3241 | 3241 | |
|
3242 | 3242 | return ret |
|
3243 | 3243 | |
|
3244 | 3244 | @command('^log|history', |
|
3245 | 3245 | [('f', 'follow', None, |
|
3246 | 3246 | _('follow changeset history, or file history across copies and renames')), |
|
3247 | 3247 | ('', 'follow-first', None, |
|
3248 | 3248 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3249 | 3249 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3250 | 3250 | ('C', 'copies', None, _('show copied files')), |
|
3251 | 3251 | ('k', 'keyword', [], |
|
3252 | 3252 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3253 | 3253 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), |
|
3254 | 3254 | ('L', 'line-range', [], |
|
3255 | 3255 | _('follow line range of specified file (EXPERIMENTAL)'), |
|
3256 | 3256 | _('FILE,RANGE')), |
|
3257 | 3257 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3258 | 3258 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3259 | 3259 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3260 | 3260 | ('', 'only-branch', [], |
|
3261 | 3261 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3262 | 3262 | _('BRANCH')), |
|
3263 | 3263 | ('b', 'branch', [], |
|
3264 | 3264 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3265 | 3265 | ('P', 'prune', [], |
|
3266 | 3266 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3267 | 3267 | ] + logopts + walkopts, |
|
3268 | 3268 | _('[OPTION]... [FILE]'), |
|
3269 | 3269 | inferrepo=True, cmdtype=readonly) |
|
3270 | 3270 | def log(ui, repo, *pats, **opts): |
|
3271 | 3271 | """show revision history of entire repository or files |
|
3272 | 3272 | |
|
3273 | 3273 | Print the revision history of the specified files or the entire |
|
3274 | 3274 | project. |
|
3275 | 3275 | |
|
3276 | 3276 | If no revision range is specified, the default is ``tip:0`` unless |
|
3277 | 3277 | --follow is set, in which case the working directory parent is |
|
3278 | 3278 | used as the starting revision. |
|
3279 | 3279 | |
|
3280 | 3280 | File history is shown without following rename or copy history of |
|
3281 | 3281 | files. Use -f/--follow with a filename to follow history across |
|
3282 | 3282 | renames and copies. --follow without a filename will only show |
|
3283 | 3283 | ancestors or descendants of the starting revision. |
|
3284 | 3284 | |
|
3285 | 3285 | By default this command prints revision number and changeset id, |
|
3286 | 3286 | tags, non-trivial parents, user, date and time, and a summary for |
|
3287 | 3287 | each commit. When the -v/--verbose switch is used, the list of |
|
3288 | 3288 | changed files and full commit message are shown. |
|
3289 | 3289 | |
|
3290 | 3290 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
3291 | 3291 | recent changeset at the top. |
|
3292 | 3292 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, |
|
3293 | 3293 | and '+' represents a fork where the changeset from the lines below is a |
|
3294 | 3294 | parent of the 'o' merge on the same line. |
|
3295 | 3295 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
|
3296 | 3296 | of a '|' indicates one or more revisions in a path are omitted. |
|
3297 | 3297 | |
|
3298 | 3298 | .. container:: verbose |
|
3299 | 3299 | |
|
3300 | 3300 | Use -L/--line-range FILE,M:N options to follow the history of lines |
|
3301 | 3301 | from M to N in FILE. With -p/--patch only diff hunks affecting |
|
3302 | 3302 | specified line range will be shown. This option requires --follow; |
|
3303 | 3303 | it can be specified multiple times. Currently, this option is not |
|
3304 | 3304 | compatible with --graph. This option is experimental. |
|
3305 | 3305 | |
|
3306 | 3306 | .. note:: |
|
3307 | 3307 | |
|
3308 | 3308 | :hg:`log --patch` may generate unexpected diff output for merge |
|
3309 | 3309 | changesets, as it will only compare the merge changeset against |
|
3310 | 3310 | its first parent. Also, only files different from BOTH parents |
|
3311 | 3311 | will appear in files:. |
|
3312 | 3312 | |
|
3313 | 3313 | .. note:: |
|
3314 | 3314 | |
|
3315 | 3315 | For performance reasons, :hg:`log FILE` may omit duplicate changes |
|
3316 | 3316 | made on branches and will not show removals or mode changes. To |
|
3317 | 3317 | see all such changes, use the --removed switch. |
|
3318 | 3318 | |
|
3319 | 3319 | .. container:: verbose |
|
3320 | 3320 | |
|
3321 | 3321 | .. note:: |
|
3322 | 3322 | |
|
3323 | 3323 | The history resulting from -L/--line-range options depends on diff |
|
3324 | 3324 | options; for instance if white-spaces are ignored, respective changes |
|
3325 | 3325 | with only white-spaces in specified line range will not be listed. |
|
3326 | 3326 | |
|
3327 | 3327 | .. container:: verbose |
|
3328 | 3328 | |
|
3329 | 3329 | Some examples: |
|
3330 | 3330 | |
|
3331 | 3331 | - changesets with full descriptions and file lists:: |
|
3332 | 3332 | |
|
3333 | 3333 | hg log -v |
|
3334 | 3334 | |
|
3335 | 3335 | - changesets ancestral to the working directory:: |
|
3336 | 3336 | |
|
3337 | 3337 | hg log -f |
|
3338 | 3338 | |
|
3339 | 3339 | - last 10 commits on the current branch:: |
|
3340 | 3340 | |
|
3341 | 3341 | hg log -l 10 -b . |
|
3342 | 3342 | |
|
3343 | 3343 | - changesets showing all modifications of a file, including removals:: |
|
3344 | 3344 | |
|
3345 | 3345 | hg log --removed file.c |
|
3346 | 3346 | |
|
3347 | 3347 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
3348 | 3348 | |
|
3349 | 3349 | hg log -Mp lib/ |
|
3350 | 3350 | |
|
3351 | 3351 | - all revision numbers that match a keyword:: |
|
3352 | 3352 | |
|
3353 | 3353 | hg log -k bug --template "{rev}\\n" |
|
3354 | 3354 | |
|
3355 | 3355 | - the full hash identifier of the working directory parent:: |
|
3356 | 3356 | |
|
3357 | 3357 | hg log -r . --template "{node}\\n" |
|
3358 | 3358 | |
|
3359 | 3359 | - list available log templates:: |
|
3360 | 3360 | |
|
3361 | 3361 | hg log -T list |
|
3362 | 3362 | |
|
3363 | 3363 | - check if a given changeset is included in a tagged release:: |
|
3364 | 3364 | |
|
3365 | 3365 | hg log -r "a21ccf and ancestor(1.9)" |
|
3366 | 3366 | |
|
3367 | 3367 | - find all changesets by some user in a date range:: |
|
3368 | 3368 | |
|
3369 | 3369 | hg log -k alice -d "may 2008 to jul 2008" |
|
3370 | 3370 | |
|
3371 | 3371 | - summary of all changesets after the last tag:: |
|
3372 | 3372 | |
|
3373 | 3373 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
3374 | 3374 | |
|
3375 | 3375 | - changesets touching lines 13 to 23 for file.c:: |
|
3376 | 3376 | |
|
3377 | 3377 | hg log -L file.c,13:23 |
|
3378 | 3378 | |
|
3379 | 3379 | - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of |
|
3380 | 3380 | main.c with patch:: |
|
3381 | 3381 | |
|
3382 | 3382 | hg log -L file.c,13:23 -L main.c,2:6 -p |
|
3383 | 3383 | |
|
3384 | 3384 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3385 | 3385 | |
|
3386 | 3386 | See :hg:`help revisions` for more about specifying and ordering |
|
3387 | 3387 | revisions. |
|
3388 | 3388 | |
|
3389 | 3389 | See :hg:`help templates` for more about pre-packaged styles and |
|
3390 | 3390 | specifying custom templates. The default template used by the log |
|
3391 | 3391 | command can be customized via the ``ui.logtemplate`` configuration |
|
3392 | 3392 | setting. |
|
3393 | 3393 | |
|
3394 | 3394 | Returns 0 on success. |
|
3395 | 3395 | |
|
3396 | 3396 | """ |
|
3397 | 3397 | opts = pycompat.byteskwargs(opts) |
|
3398 | 3398 | linerange = opts.get('line_range') |
|
3399 | 3399 | |
|
3400 | 3400 | if linerange and not opts.get('follow'): |
|
3401 | 3401 | raise error.Abort(_('--line-range requires --follow')) |
|
3402 | 3402 | |
|
3403 | 3403 | if linerange and pats: |
|
3404 | 3404 | raise error.Abort( |
|
3405 | 3405 | _('FILE arguments are not compatible with --line-range option') |
|
3406 | 3406 | ) |
|
3407 | 3407 | |
|
3408 | if opts.get('follow') and opts.get('rev'): | |
|
3408 | if opts.get('follow_first') and opts.get('rev'): | |
|
3409 | opts['rev'] = [revsetlang.formatspec('reverse(_firstancestors(%lr))', | |
|
3410 | opts.get('rev'))] | |
|
3411 | del opts['follow_first'] | |
|
3412 | elif opts.get('follow') and opts.get('rev'): | |
|
3409 | 3413 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] |
|
3410 | 3414 | del opts['follow'] |
|
3411 | 3415 | |
|
3412 | 3416 | repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') |
|
3413 | 3417 | revs, filematcher = cmdutil.getlogrevs(repo, pats, opts) |
|
3414 | 3418 | hunksfilter = None |
|
3415 | 3419 | |
|
3416 | 3420 | if opts.get('graph'): |
|
3417 | 3421 | if linerange: |
|
3418 | 3422 | raise error.Abort(_('graph not supported with line range patterns')) |
|
3419 | 3423 | return cmdutil.graphlog(ui, repo, revs, filematcher, opts) |
|
3420 | 3424 | |
|
3421 | 3425 | if linerange: |
|
3422 | 3426 | revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs( |
|
3423 | 3427 | repo, revs, opts) |
|
3424 | 3428 | |
|
3425 | 3429 | if filematcher is not None and lrfilematcher is not None: |
|
3426 | 3430 | basefilematcher = filematcher |
|
3427 | 3431 | |
|
3428 | 3432 | def filematcher(rev): |
|
3429 | 3433 | files = (basefilematcher(rev).files() |
|
3430 | 3434 | + lrfilematcher(rev).files()) |
|
3431 | 3435 | return scmutil.matchfiles(repo, files) |
|
3432 | 3436 | |
|
3433 | 3437 | elif filematcher is None: |
|
3434 | 3438 | filematcher = lrfilematcher |
|
3435 | 3439 | |
|
3436 | 3440 | getrenamed = None |
|
3437 | 3441 | if opts.get('copies'): |
|
3438 | 3442 | endrev = None |
|
3439 | 3443 | if opts.get('rev'): |
|
3440 | 3444 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
3441 | 3445 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
3442 | 3446 | |
|
3443 | 3447 | ui.pager('log') |
|
3444 | 3448 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
3445 | 3449 | for rev in revs: |
|
3446 | 3450 | ctx = repo[rev] |
|
3447 | 3451 | copies = None |
|
3448 | 3452 | if getrenamed is not None and rev: |
|
3449 | 3453 | copies = [] |
|
3450 | 3454 | for fn in ctx.files(): |
|
3451 | 3455 | rename = getrenamed(fn, rev) |
|
3452 | 3456 | if rename: |
|
3453 | 3457 | copies.append((fn, rename[0])) |
|
3454 | 3458 | if filematcher: |
|
3455 | 3459 | revmatchfn = filematcher(ctx.rev()) |
|
3456 | 3460 | else: |
|
3457 | 3461 | revmatchfn = None |
|
3458 | 3462 | if hunksfilter: |
|
3459 | 3463 | revhunksfilter = hunksfilter(rev) |
|
3460 | 3464 | else: |
|
3461 | 3465 | revhunksfilter = None |
|
3462 | 3466 | displayer.show(ctx, copies=copies, matchfn=revmatchfn, |
|
3463 | 3467 | hunksfilterfn=revhunksfilter) |
|
3464 | 3468 | displayer.flush(ctx) |
|
3465 | 3469 | |
|
3466 | 3470 | displayer.close() |
|
3467 | 3471 | |
|
3468 | 3472 | @command('manifest', |
|
3469 | 3473 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
3470 | 3474 | ('', 'all', False, _("list files from all revisions"))] |
|
3471 | 3475 | + formatteropts, |
|
3472 | 3476 | _('[-r REV]'), cmdtype=readonly) |
|
3473 | 3477 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
3474 | 3478 | """output the current or given revision of the project manifest |
|
3475 | 3479 | |
|
3476 | 3480 | Print a list of version controlled files for the given revision. |
|
3477 | 3481 | If no revision is given, the first parent of the working directory |
|
3478 | 3482 | is used, or the null revision if no revision is checked out. |
|
3479 | 3483 | |
|
3480 | 3484 | With -v, print file permissions, symlink and executable bits. |
|
3481 | 3485 | With --debug, print file revision hashes. |
|
3482 | 3486 | |
|
3483 | 3487 | If option --all is specified, the list of all files from all revisions |
|
3484 | 3488 | is printed. This includes deleted and renamed files. |
|
3485 | 3489 | |
|
3486 | 3490 | Returns 0 on success. |
|
3487 | 3491 | """ |
|
3488 | 3492 | opts = pycompat.byteskwargs(opts) |
|
3489 | 3493 | fm = ui.formatter('manifest', opts) |
|
3490 | 3494 | |
|
3491 | 3495 | if opts.get('all'): |
|
3492 | 3496 | if rev or node: |
|
3493 | 3497 | raise error.Abort(_("can't specify a revision with --all")) |
|
3494 | 3498 | |
|
3495 | 3499 | res = [] |
|
3496 | 3500 | prefix = "data/" |
|
3497 | 3501 | suffix = ".i" |
|
3498 | 3502 | plen = len(prefix) |
|
3499 | 3503 | slen = len(suffix) |
|
3500 | 3504 | with repo.lock(): |
|
3501 | 3505 | for fn, b, size in repo.store.datafiles(): |
|
3502 | 3506 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
3503 | 3507 | res.append(fn[plen:-slen]) |
|
3504 | 3508 | ui.pager('manifest') |
|
3505 | 3509 | for f in res: |
|
3506 | 3510 | fm.startitem() |
|
3507 | 3511 | fm.write("path", '%s\n', f) |
|
3508 | 3512 | fm.end() |
|
3509 | 3513 | return |
|
3510 | 3514 | |
|
3511 | 3515 | if rev and node: |
|
3512 | 3516 | raise error.Abort(_("please specify just one revision")) |
|
3513 | 3517 | |
|
3514 | 3518 | if not node: |
|
3515 | 3519 | node = rev |
|
3516 | 3520 | |
|
3517 | 3521 | char = {'l': '@', 'x': '*', '': ''} |
|
3518 | 3522 | mode = {'l': '644', 'x': '755', '': '644'} |
|
3519 | 3523 | if node: |
|
3520 | 3524 | repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn') |
|
3521 | 3525 | ctx = scmutil.revsingle(repo, node) |
|
3522 | 3526 | mf = ctx.manifest() |
|
3523 | 3527 | ui.pager('manifest') |
|
3524 | 3528 | for f in ctx: |
|
3525 | 3529 | fm.startitem() |
|
3526 | 3530 | fl = ctx[f].flags() |
|
3527 | 3531 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
3528 | 3532 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
3529 | 3533 | fm.write('path', '%s\n', f) |
|
3530 | 3534 | fm.end() |
|
3531 | 3535 | |
|
3532 | 3536 | @command('^merge', |
|
3533 | 3537 | [('f', 'force', None, |
|
3534 | 3538 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
3535 | 3539 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
3536 | 3540 | ('P', 'preview', None, |
|
3537 | 3541 | _('review revisions to merge (no merge is performed)')) |
|
3538 | 3542 | ] + mergetoolopts, |
|
3539 | 3543 | _('[-P] [[-r] REV]')) |
|
3540 | 3544 | def merge(ui, repo, node=None, **opts): |
|
3541 | 3545 | """merge another revision into working directory |
|
3542 | 3546 | |
|
3543 | 3547 | The current working directory is updated with all changes made in |
|
3544 | 3548 | the requested revision since the last common predecessor revision. |
|
3545 | 3549 | |
|
3546 | 3550 | Files that changed between either parent are marked as changed for |
|
3547 | 3551 | the next commit and a commit must be performed before any further |
|
3548 | 3552 | updates to the repository are allowed. The next commit will have |
|
3549 | 3553 | two parents. |
|
3550 | 3554 | |
|
3551 | 3555 | ``--tool`` can be used to specify the merge tool used for file |
|
3552 | 3556 | merges. It overrides the HGMERGE environment variable and your |
|
3553 | 3557 | configuration files. See :hg:`help merge-tools` for options. |
|
3554 | 3558 | |
|
3555 | 3559 | If no revision is specified, the working directory's parent is a |
|
3556 | 3560 | head revision, and the current branch contains exactly one other |
|
3557 | 3561 | head, the other head is merged with by default. Otherwise, an |
|
3558 | 3562 | explicit revision with which to merge with must be provided. |
|
3559 | 3563 | |
|
3560 | 3564 | See :hg:`help resolve` for information on handling file conflicts. |
|
3561 | 3565 | |
|
3562 | 3566 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
3563 | 3567 | will check out a clean copy of the original merge parent, losing |
|
3564 | 3568 | all changes. |
|
3565 | 3569 | |
|
3566 | 3570 | Returns 0 on success, 1 if there are unresolved files. |
|
3567 | 3571 | """ |
|
3568 | 3572 | |
|
3569 | 3573 | opts = pycompat.byteskwargs(opts) |
|
3570 | 3574 | if opts.get('rev') and node: |
|
3571 | 3575 | raise error.Abort(_("please specify just one revision")) |
|
3572 | 3576 | if not node: |
|
3573 | 3577 | node = opts.get('rev') |
|
3574 | 3578 | |
|
3575 | 3579 | if node: |
|
3576 | 3580 | node = scmutil.revsingle(repo, node).node() |
|
3577 | 3581 | |
|
3578 | 3582 | if not node: |
|
3579 | 3583 | node = repo[destutil.destmerge(repo)].node() |
|
3580 | 3584 | |
|
3581 | 3585 | if opts.get('preview'): |
|
3582 | 3586 | # find nodes that are ancestors of p2 but not of p1 |
|
3583 | 3587 | p1 = repo.lookup('.') |
|
3584 | 3588 | p2 = repo.lookup(node) |
|
3585 | 3589 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
3586 | 3590 | |
|
3587 | 3591 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3588 | 3592 | for node in nodes: |
|
3589 | 3593 | displayer.show(repo[node]) |
|
3590 | 3594 | displayer.close() |
|
3591 | 3595 | return 0 |
|
3592 | 3596 | |
|
3593 | 3597 | try: |
|
3594 | 3598 | # ui.forcemerge is an internal variable, do not document |
|
3595 | 3599 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
|
3596 | 3600 | force = opts.get('force') |
|
3597 | 3601 | labels = ['working copy', 'merge rev'] |
|
3598 | 3602 | return hg.merge(repo, node, force=force, mergeforce=force, |
|
3599 | 3603 | labels=labels) |
|
3600 | 3604 | finally: |
|
3601 | 3605 | ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
3602 | 3606 | |
|
3603 | 3607 | @command('outgoing|out', |
|
3604 | 3608 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
3605 | 3609 | ('r', 'rev', [], |
|
3606 | 3610 | _('a changeset intended to be included in the destination'), _('REV')), |
|
3607 | 3611 | ('n', 'newest-first', None, _('show newest record first')), |
|
3608 | 3612 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
3609 | 3613 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
3610 | 3614 | _('BRANCH')), |
|
3611 | 3615 | ] + logopts + remoteopts + subrepoopts, |
|
3612 | 3616 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
3613 | 3617 | def outgoing(ui, repo, dest=None, **opts): |
|
3614 | 3618 | """show changesets not found in the destination |
|
3615 | 3619 | |
|
3616 | 3620 | Show changesets not found in the specified destination repository |
|
3617 | 3621 | or the default push location. These are the changesets that would |
|
3618 | 3622 | be pushed if a push was requested. |
|
3619 | 3623 | |
|
3620 | 3624 | See pull for details of valid destination formats. |
|
3621 | 3625 | |
|
3622 | 3626 | .. container:: verbose |
|
3623 | 3627 | |
|
3624 | 3628 | With -B/--bookmarks, the result of bookmark comparison between |
|
3625 | 3629 | local and remote repositories is displayed. With -v/--verbose, |
|
3626 | 3630 | status is also displayed for each bookmark like below:: |
|
3627 | 3631 | |
|
3628 | 3632 | BM1 01234567890a added |
|
3629 | 3633 | BM2 deleted |
|
3630 | 3634 | BM3 234567890abc advanced |
|
3631 | 3635 | BM4 34567890abcd diverged |
|
3632 | 3636 | BM5 4567890abcde changed |
|
3633 | 3637 | |
|
3634 | 3638 | The action taken when pushing depends on the |
|
3635 | 3639 | status of each bookmark: |
|
3636 | 3640 | |
|
3637 | 3641 | :``added``: push with ``-B`` will create it |
|
3638 | 3642 | :``deleted``: push with ``-B`` will delete it |
|
3639 | 3643 | :``advanced``: push will update it |
|
3640 | 3644 | :``diverged``: push with ``-B`` will update it |
|
3641 | 3645 | :``changed``: push with ``-B`` will update it |
|
3642 | 3646 | |
|
3643 | 3647 | From the point of view of pushing behavior, bookmarks |
|
3644 | 3648 | existing only in the remote repository are treated as |
|
3645 | 3649 | ``deleted``, even if it is in fact added remotely. |
|
3646 | 3650 | |
|
3647 | 3651 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
3648 | 3652 | """ |
|
3649 | 3653 | opts = pycompat.byteskwargs(opts) |
|
3650 | 3654 | if opts.get('graph'): |
|
3651 | 3655 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3652 | 3656 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
3653 | 3657 | if not o: |
|
3654 | 3658 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3655 | 3659 | return |
|
3656 | 3660 | |
|
3657 | 3661 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
3658 | 3662 | ui.pager('outgoing') |
|
3659 | 3663 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
3660 | 3664 | cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges) |
|
3661 | 3665 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3662 | 3666 | return 0 |
|
3663 | 3667 | |
|
3664 | 3668 | if opts.get('bookmarks'): |
|
3665 | 3669 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3666 | 3670 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
3667 | 3671 | other = hg.peer(repo, opts, dest) |
|
3668 | 3672 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3669 | 3673 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3670 | 3674 | return 0 |
|
3671 | 3675 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
3672 | 3676 | ui.pager('outgoing') |
|
3673 | 3677 | return bookmarks.outgoing(ui, repo, other) |
|
3674 | 3678 | |
|
3675 | 3679 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3676 | 3680 | try: |
|
3677 | 3681 | return hg.outgoing(ui, repo, dest, opts) |
|
3678 | 3682 | finally: |
|
3679 | 3683 | del repo._subtoppath |
|
3680 | 3684 | |
|
3681 | 3685 | @command('parents', |
|
3682 | 3686 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
3683 | 3687 | ] + templateopts, |
|
3684 | 3688 | _('[-r REV] [FILE]'), |
|
3685 | 3689 | inferrepo=True) |
|
3686 | 3690 | def parents(ui, repo, file_=None, **opts): |
|
3687 | 3691 | """show the parents of the working directory or revision (DEPRECATED) |
|
3688 | 3692 | |
|
3689 | 3693 | Print the working directory's parent revisions. If a revision is |
|
3690 | 3694 | given via -r/--rev, the parent of that revision will be printed. |
|
3691 | 3695 | If a file argument is given, the revision in which the file was |
|
3692 | 3696 | last changed (before the working directory revision or the |
|
3693 | 3697 | argument to --rev if given) is printed. |
|
3694 | 3698 | |
|
3695 | 3699 | This command is equivalent to:: |
|
3696 | 3700 | |
|
3697 | 3701 | hg log -r "p1()+p2()" or |
|
3698 | 3702 | hg log -r "p1(REV)+p2(REV)" or |
|
3699 | 3703 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or |
|
3700 | 3704 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" |
|
3701 | 3705 | |
|
3702 | 3706 | See :hg:`summary` and :hg:`help revsets` for related information. |
|
3703 | 3707 | |
|
3704 | 3708 | Returns 0 on success. |
|
3705 | 3709 | """ |
|
3706 | 3710 | |
|
3707 | 3711 | opts = pycompat.byteskwargs(opts) |
|
3708 | 3712 | rev = opts.get('rev') |
|
3709 | 3713 | if rev: |
|
3710 | 3714 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
3711 | 3715 | ctx = scmutil.revsingle(repo, rev, None) |
|
3712 | 3716 | |
|
3713 | 3717 | if file_: |
|
3714 | 3718 | m = scmutil.match(ctx, (file_,), opts) |
|
3715 | 3719 | if m.anypats() or len(m.files()) != 1: |
|
3716 | 3720 | raise error.Abort(_('can only specify an explicit filename')) |
|
3717 | 3721 | file_ = m.files()[0] |
|
3718 | 3722 | filenodes = [] |
|
3719 | 3723 | for cp in ctx.parents(): |
|
3720 | 3724 | if not cp: |
|
3721 | 3725 | continue |
|
3722 | 3726 | try: |
|
3723 | 3727 | filenodes.append(cp.filenode(file_)) |
|
3724 | 3728 | except error.LookupError: |
|
3725 | 3729 | pass |
|
3726 | 3730 | if not filenodes: |
|
3727 | 3731 | raise error.Abort(_("'%s' not found in manifest!") % file_) |
|
3728 | 3732 | p = [] |
|
3729 | 3733 | for fn in filenodes: |
|
3730 | 3734 | fctx = repo.filectx(file_, fileid=fn) |
|
3731 | 3735 | p.append(fctx.node()) |
|
3732 | 3736 | else: |
|
3733 | 3737 | p = [cp.node() for cp in ctx.parents()] |
|
3734 | 3738 | |
|
3735 | 3739 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3736 | 3740 | for n in p: |
|
3737 | 3741 | if n != nullid: |
|
3738 | 3742 | displayer.show(repo[n]) |
|
3739 | 3743 | displayer.close() |
|
3740 | 3744 | |
|
3741 | 3745 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True, |
|
3742 | 3746 | cmdtype=readonly) |
|
3743 | 3747 | def paths(ui, repo, search=None, **opts): |
|
3744 | 3748 | """show aliases for remote repositories |
|
3745 | 3749 | |
|
3746 | 3750 | Show definition of symbolic path name NAME. If no name is given, |
|
3747 | 3751 | show definition of all available names. |
|
3748 | 3752 | |
|
3749 | 3753 | Option -q/--quiet suppresses all output when searching for NAME |
|
3750 | 3754 | and shows only the path names when listing all definitions. |
|
3751 | 3755 | |
|
3752 | 3756 | Path names are defined in the [paths] section of your |
|
3753 | 3757 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
3754 | 3758 | repository, ``.hg/hgrc`` is used, too. |
|
3755 | 3759 | |
|
3756 | 3760 | The path names ``default`` and ``default-push`` have a special |
|
3757 | 3761 | meaning. When performing a push or pull operation, they are used |
|
3758 | 3762 | as fallbacks if no location is specified on the command-line. |
|
3759 | 3763 | When ``default-push`` is set, it will be used for push and |
|
3760 | 3764 | ``default`` will be used for pull; otherwise ``default`` is used |
|
3761 | 3765 | as the fallback for both. When cloning a repository, the clone |
|
3762 | 3766 | source is written as ``default`` in ``.hg/hgrc``. |
|
3763 | 3767 | |
|
3764 | 3768 | .. note:: |
|
3765 | 3769 | |
|
3766 | 3770 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
3767 | 3771 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` |
|
3768 | 3772 | and :hg:`bundle`) operations. |
|
3769 | 3773 | |
|
3770 | 3774 | See :hg:`help urls` for more information. |
|
3771 | 3775 | |
|
3772 | 3776 | Returns 0 on success. |
|
3773 | 3777 | """ |
|
3774 | 3778 | |
|
3775 | 3779 | opts = pycompat.byteskwargs(opts) |
|
3776 | 3780 | ui.pager('paths') |
|
3777 | 3781 | if search: |
|
3778 | 3782 | pathitems = [(name, path) for name, path in ui.paths.iteritems() |
|
3779 | 3783 | if name == search] |
|
3780 | 3784 | else: |
|
3781 | 3785 | pathitems = sorted(ui.paths.iteritems()) |
|
3782 | 3786 | |
|
3783 | 3787 | fm = ui.formatter('paths', opts) |
|
3784 | 3788 | if fm.isplain(): |
|
3785 | 3789 | hidepassword = util.hidepassword |
|
3786 | 3790 | else: |
|
3787 | 3791 | hidepassword = str |
|
3788 | 3792 | if ui.quiet: |
|
3789 | 3793 | namefmt = '%s\n' |
|
3790 | 3794 | else: |
|
3791 | 3795 | namefmt = '%s = ' |
|
3792 | 3796 | showsubopts = not search and not ui.quiet |
|
3793 | 3797 | |
|
3794 | 3798 | for name, path in pathitems: |
|
3795 | 3799 | fm.startitem() |
|
3796 | 3800 | fm.condwrite(not search, 'name', namefmt, name) |
|
3797 | 3801 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) |
|
3798 | 3802 | for subopt, value in sorted(path.suboptions.items()): |
|
3799 | 3803 | assert subopt not in ('name', 'url') |
|
3800 | 3804 | if showsubopts: |
|
3801 | 3805 | fm.plain('%s:%s = ' % (name, subopt)) |
|
3802 | 3806 | fm.condwrite(showsubopts, subopt, '%s\n', value) |
|
3803 | 3807 | |
|
3804 | 3808 | fm.end() |
|
3805 | 3809 | |
|
3806 | 3810 | if search and not pathitems: |
|
3807 | 3811 | if not ui.quiet: |
|
3808 | 3812 | ui.warn(_("not found!\n")) |
|
3809 | 3813 | return 1 |
|
3810 | 3814 | else: |
|
3811 | 3815 | return 0 |
|
3812 | 3816 | |
|
3813 | 3817 | @command('phase', |
|
3814 | 3818 | [('p', 'public', False, _('set changeset phase to public')), |
|
3815 | 3819 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
3816 | 3820 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
3817 | 3821 | ('f', 'force', False, _('allow to move boundary backward')), |
|
3818 | 3822 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
3819 | 3823 | ], |
|
3820 | 3824 | _('[-p|-d|-s] [-f] [-r] [REV...]')) |
|
3821 | 3825 | def phase(ui, repo, *revs, **opts): |
|
3822 | 3826 | """set or show the current phase name |
|
3823 | 3827 | |
|
3824 | 3828 | With no argument, show the phase name of the current revision(s). |
|
3825 | 3829 | |
|
3826 | 3830 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
3827 | 3831 | phase value of the specified revisions. |
|
3828 | 3832 | |
|
3829 | 3833 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a |
|
3830 | 3834 | lower phase to a higher phase. Phases are ordered as follows:: |
|
3831 | 3835 | |
|
3832 | 3836 | public < draft < secret |
|
3833 | 3837 | |
|
3834 | 3838 | Returns 0 on success, 1 if some phases could not be changed. |
|
3835 | 3839 | |
|
3836 | 3840 | (For more information about the phases concept, see :hg:`help phases`.) |
|
3837 | 3841 | """ |
|
3838 | 3842 | opts = pycompat.byteskwargs(opts) |
|
3839 | 3843 | # search for a unique phase argument |
|
3840 | 3844 | targetphase = None |
|
3841 | 3845 | for idx, name in enumerate(phases.phasenames): |
|
3842 | 3846 | if opts[name]: |
|
3843 | 3847 | if targetphase is not None: |
|
3844 | 3848 | raise error.Abort(_('only one phase can be specified')) |
|
3845 | 3849 | targetphase = idx |
|
3846 | 3850 | |
|
3847 | 3851 | # look for specified revision |
|
3848 | 3852 | revs = list(revs) |
|
3849 | 3853 | revs.extend(opts['rev']) |
|
3850 | 3854 | if not revs: |
|
3851 | 3855 | # display both parents as the second parent phase can influence |
|
3852 | 3856 | # the phase of a merge commit |
|
3853 | 3857 | revs = [c.rev() for c in repo[None].parents()] |
|
3854 | 3858 | |
|
3855 | 3859 | revs = scmutil.revrange(repo, revs) |
|
3856 | 3860 | |
|
3857 | 3861 | ret = 0 |
|
3858 | 3862 | if targetphase is None: |
|
3859 | 3863 | # display |
|
3860 | 3864 | for r in revs: |
|
3861 | 3865 | ctx = repo[r] |
|
3862 | 3866 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
3863 | 3867 | else: |
|
3864 | 3868 | with repo.lock(), repo.transaction("phase") as tr: |
|
3865 | 3869 | # set phase |
|
3866 | 3870 | if not revs: |
|
3867 | 3871 | raise error.Abort(_('empty revision set')) |
|
3868 | 3872 | nodes = [repo[r].node() for r in revs] |
|
3869 | 3873 | # moving revision from public to draft may hide them |
|
3870 | 3874 | # We have to check result on an unfiltered repository |
|
3871 | 3875 | unfi = repo.unfiltered() |
|
3872 | 3876 | getphase = unfi._phasecache.phase |
|
3873 | 3877 | olddata = [getphase(unfi, r) for r in unfi] |
|
3874 | 3878 | phases.advanceboundary(repo, tr, targetphase, nodes) |
|
3875 | 3879 | if opts['force']: |
|
3876 | 3880 | phases.retractboundary(repo, tr, targetphase, nodes) |
|
3877 | 3881 | getphase = unfi._phasecache.phase |
|
3878 | 3882 | newdata = [getphase(unfi, r) for r in unfi] |
|
3879 | 3883 | changes = sum(newdata[r] != olddata[r] for r in unfi) |
|
3880 | 3884 | cl = unfi.changelog |
|
3881 | 3885 | rejected = [n for n in nodes |
|
3882 | 3886 | if newdata[cl.rev(n)] < targetphase] |
|
3883 | 3887 | if rejected: |
|
3884 | 3888 | ui.warn(_('cannot move %i changesets to a higher ' |
|
3885 | 3889 | 'phase, use --force\n') % len(rejected)) |
|
3886 | 3890 | ret = 1 |
|
3887 | 3891 | if changes: |
|
3888 | 3892 | msg = _('phase changed for %i changesets\n') % changes |
|
3889 | 3893 | if ret: |
|
3890 | 3894 | ui.status(msg) |
|
3891 | 3895 | else: |
|
3892 | 3896 | ui.note(msg) |
|
3893 | 3897 | else: |
|
3894 | 3898 | ui.warn(_('no phases changed\n')) |
|
3895 | 3899 | return ret |
|
3896 | 3900 | |
|
3897 | 3901 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): |
|
3898 | 3902 | """Run after a changegroup has been added via pull/unbundle |
|
3899 | 3903 | |
|
3900 | 3904 | This takes arguments below: |
|
3901 | 3905 | |
|
3902 | 3906 | :modheads: change of heads by pull/unbundle |
|
3903 | 3907 | :optupdate: updating working directory is needed or not |
|
3904 | 3908 | :checkout: update destination revision (or None to default destination) |
|
3905 | 3909 | :brev: a name, which might be a bookmark to be activated after updating |
|
3906 | 3910 | """ |
|
3907 | 3911 | if modheads == 0: |
|
3908 | 3912 | return |
|
3909 | 3913 | if optupdate: |
|
3910 | 3914 | try: |
|
3911 | 3915 | return hg.updatetotally(ui, repo, checkout, brev) |
|
3912 | 3916 | except error.UpdateAbort as inst: |
|
3913 | 3917 | msg = _("not updating: %s") % str(inst) |
|
3914 | 3918 | hint = inst.hint |
|
3915 | 3919 | raise error.UpdateAbort(msg, hint=hint) |
|
3916 | 3920 | if modheads > 1: |
|
3917 | 3921 | currentbranchheads = len(repo.branchheads()) |
|
3918 | 3922 | if currentbranchheads == modheads: |
|
3919 | 3923 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
3920 | 3924 | elif currentbranchheads > 1: |
|
3921 | 3925 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
3922 | 3926 | "merge)\n")) |
|
3923 | 3927 | else: |
|
3924 | 3928 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
3925 | 3929 | elif not ui.configbool('commands', 'update.requiredest'): |
|
3926 | 3930 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
3927 | 3931 | |
|
3928 | 3932 | @command('^pull', |
|
3929 | 3933 | [('u', 'update', None, |
|
3930 | 3934 | _('update to new branch head if new descendants were pulled')), |
|
3931 | 3935 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
3932 | 3936 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3933 | 3937 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
3934 | 3938 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
3935 | 3939 | _('BRANCH')), |
|
3936 | 3940 | ] + remoteopts, |
|
3937 | 3941 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
3938 | 3942 | def pull(ui, repo, source="default", **opts): |
|
3939 | 3943 | """pull changes from the specified source |
|
3940 | 3944 | |
|
3941 | 3945 | Pull changes from a remote repository to a local one. |
|
3942 | 3946 | |
|
3943 | 3947 | This finds all changes from the repository at the specified path |
|
3944 | 3948 | or URL and adds them to a local repository (the current one unless |
|
3945 | 3949 | -R is specified). By default, this does not update the copy of the |
|
3946 | 3950 | project in the working directory. |
|
3947 | 3951 | |
|
3948 | 3952 | Use :hg:`incoming` if you want to see what would have been added |
|
3949 | 3953 | by a pull at the time you issued this command. If you then decide |
|
3950 | 3954 | to add those changes to the repository, you should use :hg:`pull |
|
3951 | 3955 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
3952 | 3956 | |
|
3953 | 3957 | If SOURCE is omitted, the 'default' path will be used. |
|
3954 | 3958 | See :hg:`help urls` for more information. |
|
3955 | 3959 | |
|
3956 | 3960 | Specifying bookmark as ``.`` is equivalent to specifying the active |
|
3957 | 3961 | bookmark's name. |
|
3958 | 3962 | |
|
3959 | 3963 | Returns 0 on success, 1 if an update had unresolved files. |
|
3960 | 3964 | """ |
|
3961 | 3965 | |
|
3962 | 3966 | opts = pycompat.byteskwargs(opts) |
|
3963 | 3967 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): |
|
3964 | 3968 | msg = _('update destination required by configuration') |
|
3965 | 3969 | hint = _('use hg pull followed by hg update DEST') |
|
3966 | 3970 | raise error.Abort(msg, hint=hint) |
|
3967 | 3971 | |
|
3968 | 3972 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
3969 | 3973 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
3970 | 3974 | other = hg.peer(repo, opts, source) |
|
3971 | 3975 | try: |
|
3972 | 3976 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
3973 | 3977 | opts.get('rev')) |
|
3974 | 3978 | |
|
3975 | 3979 | |
|
3976 | 3980 | pullopargs = {} |
|
3977 | 3981 | if opts.get('bookmark'): |
|
3978 | 3982 | if not revs: |
|
3979 | 3983 | revs = [] |
|
3980 | 3984 | # The list of bookmark used here is not the one used to actually |
|
3981 | 3985 | # update the bookmark name. This can result in the revision pulled |
|
3982 | 3986 | # not ending up with the name of the bookmark because of a race |
|
3983 | 3987 | # condition on the server. (See issue 4689 for details) |
|
3984 | 3988 | remotebookmarks = other.listkeys('bookmarks') |
|
3985 | 3989 | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) |
|
3986 | 3990 | pullopargs['remotebookmarks'] = remotebookmarks |
|
3987 | 3991 | for b in opts['bookmark']: |
|
3988 | 3992 | b = repo._bookmarks.expandname(b) |
|
3989 | 3993 | if b not in remotebookmarks: |
|
3990 | 3994 | raise error.Abort(_('remote bookmark %s not found!') % b) |
|
3991 | 3995 | revs.append(hex(remotebookmarks[b])) |
|
3992 | 3996 | |
|
3993 | 3997 | if revs: |
|
3994 | 3998 | try: |
|
3995 | 3999 | # When 'rev' is a bookmark name, we cannot guarantee that it |
|
3996 | 4000 | # will be updated with that name because of a race condition |
|
3997 | 4001 | # server side. (See issue 4689 for details) |
|
3998 | 4002 | oldrevs = revs |
|
3999 | 4003 | revs = [] # actually, nodes |
|
4000 | 4004 | for r in oldrevs: |
|
4001 | 4005 | node = other.lookup(r) |
|
4002 | 4006 | revs.append(node) |
|
4003 | 4007 | if r == checkout: |
|
4004 | 4008 | checkout = node |
|
4005 | 4009 | except error.CapabilityError: |
|
4006 | 4010 | err = _("other repository doesn't support revision lookup, " |
|
4007 | 4011 | "so a rev cannot be specified.") |
|
4008 | 4012 | raise error.Abort(err) |
|
4009 | 4013 | |
|
4010 | 4014 | wlock = util.nullcontextmanager() |
|
4011 | 4015 | if opts.get('update'): |
|
4012 | 4016 | wlock = repo.wlock() |
|
4013 | 4017 | with wlock: |
|
4014 | 4018 | pullopargs.update(opts.get('opargs', {})) |
|
4015 | 4019 | modheads = exchange.pull(repo, other, heads=revs, |
|
4016 | 4020 | force=opts.get('force'), |
|
4017 | 4021 | bookmarks=opts.get('bookmark', ()), |
|
4018 | 4022 | opargs=pullopargs).cgresult |
|
4019 | 4023 | |
|
4020 | 4024 | # brev is a name, which might be a bookmark to be activated at |
|
4021 | 4025 | # the end of the update. In other words, it is an explicit |
|
4022 | 4026 | # destination of the update |
|
4023 | 4027 | brev = None |
|
4024 | 4028 | |
|
4025 | 4029 | if checkout: |
|
4026 | 4030 | checkout = str(repo.changelog.rev(checkout)) |
|
4027 | 4031 | |
|
4028 | 4032 | # order below depends on implementation of |
|
4029 | 4033 | # hg.addbranchrevs(). opts['bookmark'] is ignored, |
|
4030 | 4034 | # because 'checkout' is determined without it. |
|
4031 | 4035 | if opts.get('rev'): |
|
4032 | 4036 | brev = opts['rev'][0] |
|
4033 | 4037 | elif opts.get('branch'): |
|
4034 | 4038 | brev = opts['branch'][0] |
|
4035 | 4039 | else: |
|
4036 | 4040 | brev = branches[0] |
|
4037 | 4041 | repo._subtoppath = source |
|
4038 | 4042 | try: |
|
4039 | 4043 | ret = postincoming(ui, repo, modheads, opts.get('update'), |
|
4040 | 4044 | checkout, brev) |
|
4041 | 4045 | |
|
4042 | 4046 | finally: |
|
4043 | 4047 | del repo._subtoppath |
|
4044 | 4048 | |
|
4045 | 4049 | finally: |
|
4046 | 4050 | other.close() |
|
4047 | 4051 | return ret |
|
4048 | 4052 | |
|
4049 | 4053 | @command('^push', |
|
4050 | 4054 | [('f', 'force', None, _('force push')), |
|
4051 | 4055 | ('r', 'rev', [], |
|
4052 | 4056 | _('a changeset intended to be included in the destination'), |
|
4053 | 4057 | _('REV')), |
|
4054 | 4058 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4055 | 4059 | ('b', 'branch', [], |
|
4056 | 4060 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4057 | 4061 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4058 | 4062 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), |
|
4059 | 4063 | ] + remoteopts, |
|
4060 | 4064 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4061 | 4065 | def push(ui, repo, dest=None, **opts): |
|
4062 | 4066 | """push changes to the specified destination |
|
4063 | 4067 | |
|
4064 | 4068 | Push changesets from the local repository to the specified |
|
4065 | 4069 | destination. |
|
4066 | 4070 | |
|
4067 | 4071 | This operation is symmetrical to pull: it is identical to a pull |
|
4068 | 4072 | in the destination repository from the current one. |
|
4069 | 4073 | |
|
4070 | 4074 | By default, push will not allow creation of new heads at the |
|
4071 | 4075 | destination, since multiple heads would make it unclear which head |
|
4072 | 4076 | to use. In this situation, it is recommended to pull and merge |
|
4073 | 4077 | before pushing. |
|
4074 | 4078 | |
|
4075 | 4079 | Use --new-branch if you want to allow push to create a new named |
|
4076 | 4080 | branch that is not present at the destination. This allows you to |
|
4077 | 4081 | only create a new branch without forcing other changes. |
|
4078 | 4082 | |
|
4079 | 4083 | .. note:: |
|
4080 | 4084 | |
|
4081 | 4085 | Extra care should be taken with the -f/--force option, |
|
4082 | 4086 | which will push all new heads on all branches, an action which will |
|
4083 | 4087 | almost always cause confusion for collaborators. |
|
4084 | 4088 | |
|
4085 | 4089 | If -r/--rev is used, the specified revision and all its ancestors |
|
4086 | 4090 | will be pushed to the remote repository. |
|
4087 | 4091 | |
|
4088 | 4092 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4089 | 4093 | ancestors, and the bookmark will be pushed to the remote |
|
4090 | 4094 | repository. Specifying ``.`` is equivalent to specifying the active |
|
4091 | 4095 | bookmark's name. |
|
4092 | 4096 | |
|
4093 | 4097 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4094 | 4098 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4095 | 4099 | |
|
4096 | 4100 | .. container:: verbose |
|
4097 | 4101 | |
|
4098 | 4102 | The --pushvars option sends strings to the server that become |
|
4099 | 4103 | environment variables prepended with ``HG_USERVAR_``. For example, |
|
4100 | 4104 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with |
|
4101 | 4105 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. |
|
4102 | 4106 | |
|
4103 | 4107 | pushvars can provide for user-overridable hooks as well as set debug |
|
4104 | 4108 | levels. One example is having a hook that blocks commits containing |
|
4105 | 4109 | conflict markers, but enables the user to override the hook if the file |
|
4106 | 4110 | is using conflict markers for testing purposes or the file format has |
|
4107 | 4111 | strings that look like conflict markers. |
|
4108 | 4112 | |
|
4109 | 4113 | By default, servers will ignore `--pushvars`. To enable it add the |
|
4110 | 4114 | following to your configuration file:: |
|
4111 | 4115 | |
|
4112 | 4116 | [push] |
|
4113 | 4117 | pushvars.server = true |
|
4114 | 4118 | |
|
4115 | 4119 | Returns 0 if push was successful, 1 if nothing to push. |
|
4116 | 4120 | """ |
|
4117 | 4121 | |
|
4118 | 4122 | opts = pycompat.byteskwargs(opts) |
|
4119 | 4123 | if opts.get('bookmark'): |
|
4120 | 4124 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') |
|
4121 | 4125 | for b in opts['bookmark']: |
|
4122 | 4126 | # translate -B options to -r so changesets get pushed |
|
4123 | 4127 | b = repo._bookmarks.expandname(b) |
|
4124 | 4128 | if b in repo._bookmarks: |
|
4125 | 4129 | opts.setdefault('rev', []).append(b) |
|
4126 | 4130 | else: |
|
4127 | 4131 | # if we try to push a deleted bookmark, translate it to null |
|
4128 | 4132 | # this lets simultaneous -r, -b options continue working |
|
4129 | 4133 | opts.setdefault('rev', []).append("null") |
|
4130 | 4134 | |
|
4131 | 4135 | path = ui.paths.getpath(dest, default=('default-push', 'default')) |
|
4132 | 4136 | if not path: |
|
4133 | 4137 | raise error.Abort(_('default repository not configured!'), |
|
4134 | 4138 | hint=_("see 'hg help config.paths'")) |
|
4135 | 4139 | dest = path.pushloc or path.loc |
|
4136 | 4140 | branches = (path.branch, opts.get('branch') or []) |
|
4137 | 4141 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4138 | 4142 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4139 | 4143 | other = hg.peer(repo, opts, dest) |
|
4140 | 4144 | |
|
4141 | 4145 | if revs: |
|
4142 | 4146 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4143 | 4147 | if not revs: |
|
4144 | 4148 | raise error.Abort(_("specified revisions evaluate to an empty set"), |
|
4145 | 4149 | hint=_("use different revision arguments")) |
|
4146 | 4150 | elif path.pushrev: |
|
4147 | 4151 | # It doesn't make any sense to specify ancestor revisions. So limit |
|
4148 | 4152 | # to DAG heads to make discovery simpler. |
|
4149 | 4153 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) |
|
4150 | 4154 | revs = scmutil.revrange(repo, [expr]) |
|
4151 | 4155 | revs = [repo[rev].node() for rev in revs] |
|
4152 | 4156 | if not revs: |
|
4153 | 4157 | raise error.Abort(_('default push revset for path evaluates to an ' |
|
4154 | 4158 | 'empty set')) |
|
4155 | 4159 | |
|
4156 | 4160 | repo._subtoppath = dest |
|
4157 | 4161 | try: |
|
4158 | 4162 | # push subrepos depth-first for coherent ordering |
|
4159 | 4163 | c = repo[''] |
|
4160 | 4164 | subs = c.substate # only repos that are committed |
|
4161 | 4165 | for s in sorted(subs): |
|
4162 | 4166 | result = c.sub(s).push(opts) |
|
4163 | 4167 | if result == 0: |
|
4164 | 4168 | return not result |
|
4165 | 4169 | finally: |
|
4166 | 4170 | del repo._subtoppath |
|
4167 | 4171 | |
|
4168 | 4172 | opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it |
|
4169 | 4173 | opargs.setdefault('pushvars', []).extend(opts.get('pushvars', [])) |
|
4170 | 4174 | |
|
4171 | 4175 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, |
|
4172 | 4176 | newbranch=opts.get('new_branch'), |
|
4173 | 4177 | bookmarks=opts.get('bookmark', ()), |
|
4174 | 4178 | opargs=opargs) |
|
4175 | 4179 | |
|
4176 | 4180 | result = not pushop.cgresult |
|
4177 | 4181 | |
|
4178 | 4182 | if pushop.bkresult is not None: |
|
4179 | 4183 | if pushop.bkresult == 2: |
|
4180 | 4184 | result = 2 |
|
4181 | 4185 | elif not result and pushop.bkresult: |
|
4182 | 4186 | result = 2 |
|
4183 | 4187 | |
|
4184 | 4188 | return result |
|
4185 | 4189 | |
|
4186 | 4190 | @command('recover', []) |
|
4187 | 4191 | def recover(ui, repo): |
|
4188 | 4192 | """roll back an interrupted transaction |
|
4189 | 4193 | |
|
4190 | 4194 | Recover from an interrupted commit or pull. |
|
4191 | 4195 | |
|
4192 | 4196 | This command tries to fix the repository status after an |
|
4193 | 4197 | interrupted operation. It should only be necessary when Mercurial |
|
4194 | 4198 | suggests it. |
|
4195 | 4199 | |
|
4196 | 4200 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4197 | 4201 | """ |
|
4198 | 4202 | if repo.recover(): |
|
4199 | 4203 | return hg.verify(repo) |
|
4200 | 4204 | return 1 |
|
4201 | 4205 | |
|
4202 | 4206 | @command('^remove|rm', |
|
4203 | 4207 | [('A', 'after', None, _('record delete for missing files')), |
|
4204 | 4208 | ('f', 'force', None, |
|
4205 | 4209 | _('forget added files, delete modified files')), |
|
4206 | 4210 | ] + subrepoopts + walkopts, |
|
4207 | 4211 | _('[OPTION]... FILE...'), |
|
4208 | 4212 | inferrepo=True) |
|
4209 | 4213 | def remove(ui, repo, *pats, **opts): |
|
4210 | 4214 | """remove the specified files on the next commit |
|
4211 | 4215 | |
|
4212 | 4216 | Schedule the indicated files for removal from the current branch. |
|
4213 | 4217 | |
|
4214 | 4218 | This command schedules the files to be removed at the next commit. |
|
4215 | 4219 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4216 | 4220 | files, see :hg:`forget`. |
|
4217 | 4221 | |
|
4218 | 4222 | .. container:: verbose |
|
4219 | 4223 | |
|
4220 | 4224 | -A/--after can be used to remove only files that have already |
|
4221 | 4225 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4222 | 4226 | can be used to remove files from the next revision without |
|
4223 | 4227 | deleting them from the working directory. |
|
4224 | 4228 | |
|
4225 | 4229 | The following table details the behavior of remove for different |
|
4226 | 4230 | file states (columns) and option combinations (rows). The file |
|
4227 | 4231 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4228 | 4232 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4229 | 4233 | (from branch) and Delete (from disk): |
|
4230 | 4234 | |
|
4231 | 4235 | ========= == == == == |
|
4232 | 4236 | opt/state A C M ! |
|
4233 | 4237 | ========= == == == == |
|
4234 | 4238 | none W RD W R |
|
4235 | 4239 | -f R RD RD R |
|
4236 | 4240 | -A W W W R |
|
4237 | 4241 | -Af R R R R |
|
4238 | 4242 | ========= == == == == |
|
4239 | 4243 | |
|
4240 | 4244 | .. note:: |
|
4241 | 4245 | |
|
4242 | 4246 | :hg:`remove` never deletes files in Added [A] state from the |
|
4243 | 4247 | working directory, not even if ``--force`` is specified. |
|
4244 | 4248 | |
|
4245 | 4249 | Returns 0 on success, 1 if any warnings encountered. |
|
4246 | 4250 | """ |
|
4247 | 4251 | |
|
4248 | 4252 | opts = pycompat.byteskwargs(opts) |
|
4249 | 4253 | after, force = opts.get('after'), opts.get('force') |
|
4250 | 4254 | if not pats and not after: |
|
4251 | 4255 | raise error.Abort(_('no files specified')) |
|
4252 | 4256 | |
|
4253 | 4257 | m = scmutil.match(repo[None], pats, opts) |
|
4254 | 4258 | subrepos = opts.get('subrepos') |
|
4255 | 4259 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) |
|
4256 | 4260 | |
|
4257 | 4261 | @command('rename|move|mv', |
|
4258 | 4262 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4259 | 4263 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4260 | 4264 | ] + walkopts + dryrunopts, |
|
4261 | 4265 | _('[OPTION]... SOURCE... DEST')) |
|
4262 | 4266 | def rename(ui, repo, *pats, **opts): |
|
4263 | 4267 | """rename files; equivalent of copy + remove |
|
4264 | 4268 | |
|
4265 | 4269 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4266 | 4270 | is a directory, copies are put in that directory. If dest is a |
|
4267 | 4271 | file, there can only be one source. |
|
4268 | 4272 | |
|
4269 | 4273 | By default, this command copies the contents of files as they |
|
4270 | 4274 | exist in the working directory. If invoked with -A/--after, the |
|
4271 | 4275 | operation is recorded, but no copying is performed. |
|
4272 | 4276 | |
|
4273 | 4277 | This command takes effect at the next commit. To undo a rename |
|
4274 | 4278 | before that, see :hg:`revert`. |
|
4275 | 4279 | |
|
4276 | 4280 | Returns 0 on success, 1 if errors are encountered. |
|
4277 | 4281 | """ |
|
4278 | 4282 | opts = pycompat.byteskwargs(opts) |
|
4279 | 4283 | with repo.wlock(False): |
|
4280 | 4284 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4281 | 4285 | |
|
4282 | 4286 | @command('resolve', |
|
4283 | 4287 | [('a', 'all', None, _('select all unresolved files')), |
|
4284 | 4288 | ('l', 'list', None, _('list state of files needing merge')), |
|
4285 | 4289 | ('m', 'mark', None, _('mark files as resolved')), |
|
4286 | 4290 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4287 | 4291 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4288 | 4292 | + mergetoolopts + walkopts + formatteropts, |
|
4289 | 4293 | _('[OPTION]... [FILE]...'), |
|
4290 | 4294 | inferrepo=True) |
|
4291 | 4295 | def resolve(ui, repo, *pats, **opts): |
|
4292 | 4296 | """redo merges or set/view the merge status of files |
|
4293 | 4297 | |
|
4294 | 4298 | Merges with unresolved conflicts are often the result of |
|
4295 | 4299 | non-interactive merging using the ``internal:merge`` configuration |
|
4296 | 4300 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4297 | 4301 | command is used to manage the files involved in a merge, after |
|
4298 | 4302 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4299 | 4303 | working directory must have two parents). See :hg:`help |
|
4300 | 4304 | merge-tools` for information on configuring merge tools. |
|
4301 | 4305 | |
|
4302 | 4306 | The resolve command can be used in the following ways: |
|
4303 | 4307 | |
|
4304 | 4308 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4305 | 4309 | files, discarding any previous merge attempts. Re-merging is not |
|
4306 | 4310 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4307 | 4311 | to select all unresolved files. ``--tool`` can be used to specify |
|
4308 | 4312 | the merge tool used for the given files. It overrides the HGMERGE |
|
4309 | 4313 | environment variable and your configuration files. Previous file |
|
4310 | 4314 | contents are saved with a ``.orig`` suffix. |
|
4311 | 4315 | |
|
4312 | 4316 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4313 | 4317 | (e.g. after having manually fixed-up the files). The default is |
|
4314 | 4318 | to mark all unresolved files. |
|
4315 | 4319 | |
|
4316 | 4320 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4317 | 4321 | default is to mark all resolved files. |
|
4318 | 4322 | |
|
4319 | 4323 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4320 | 4324 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4321 | 4325 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter |
|
4322 | 4326 | the list. See :hg:`help filesets` for details. |
|
4323 | 4327 | |
|
4324 | 4328 | .. note:: |
|
4325 | 4329 | |
|
4326 | 4330 | Mercurial will not let you commit files with unresolved merge |
|
4327 | 4331 | conflicts. You must use :hg:`resolve -m ...` before you can |
|
4328 | 4332 | commit after a conflicting merge. |
|
4329 | 4333 | |
|
4330 | 4334 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4331 | 4335 | """ |
|
4332 | 4336 | |
|
4333 | 4337 | opts = pycompat.byteskwargs(opts) |
|
4334 | 4338 | flaglist = 'all mark unmark list no_status'.split() |
|
4335 | 4339 | all, mark, unmark, show, nostatus = \ |
|
4336 | 4340 | [opts.get(o) for o in flaglist] |
|
4337 | 4341 | |
|
4338 | 4342 | if (show and (mark or unmark)) or (mark and unmark): |
|
4339 | 4343 | raise error.Abort(_("too many options specified")) |
|
4340 | 4344 | if pats and all: |
|
4341 | 4345 | raise error.Abort(_("can't specify --all and patterns")) |
|
4342 | 4346 | if not (all or pats or show or mark or unmark): |
|
4343 | 4347 | raise error.Abort(_('no files or directories specified'), |
|
4344 | 4348 | hint=('use --all to re-merge all unresolved files')) |
|
4345 | 4349 | |
|
4346 | 4350 | if show: |
|
4347 | 4351 | ui.pager('resolve') |
|
4348 | 4352 | fm = ui.formatter('resolve', opts) |
|
4349 | 4353 | ms = mergemod.mergestate.read(repo) |
|
4350 | 4354 | m = scmutil.match(repo[None], pats, opts) |
|
4351 | 4355 | |
|
4352 | 4356 | # Labels and keys based on merge state. Unresolved path conflicts show |
|
4353 | 4357 | # as 'P'. Resolved path conflicts show as 'R', the same as normal |
|
4354 | 4358 | # resolved conflicts. |
|
4355 | 4359 | mergestateinfo = { |
|
4356 | 4360 | 'u': ('resolve.unresolved', 'U'), |
|
4357 | 4361 | 'r': ('resolve.resolved', 'R'), |
|
4358 | 4362 | 'pu': ('resolve.unresolved', 'P'), |
|
4359 | 4363 | 'pr': ('resolve.resolved', 'R'), |
|
4360 | 4364 | 'd': ('resolve.driverresolved', 'D'), |
|
4361 | 4365 | } |
|
4362 | 4366 | |
|
4363 | 4367 | for f in ms: |
|
4364 | 4368 | if not m(f): |
|
4365 | 4369 | continue |
|
4366 | 4370 | |
|
4367 | 4371 | label, key = mergestateinfo[ms[f]] |
|
4368 | 4372 | fm.startitem() |
|
4369 | 4373 | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) |
|
4370 | 4374 | fm.write('path', '%s\n', f, label=label) |
|
4371 | 4375 | fm.end() |
|
4372 | 4376 | return 0 |
|
4373 | 4377 | |
|
4374 | 4378 | with repo.wlock(): |
|
4375 | 4379 | ms = mergemod.mergestate.read(repo) |
|
4376 | 4380 | |
|
4377 | 4381 | if not (ms.active() or repo.dirstate.p2() != nullid): |
|
4378 | 4382 | raise error.Abort( |
|
4379 | 4383 | _('resolve command not applicable when not merging')) |
|
4380 | 4384 | |
|
4381 | 4385 | wctx = repo[None] |
|
4382 | 4386 | |
|
4383 | 4387 | if ms.mergedriver and ms.mdstate() == 'u': |
|
4384 | 4388 | proceed = mergemod.driverpreprocess(repo, ms, wctx) |
|
4385 | 4389 | ms.commit() |
|
4386 | 4390 | # allow mark and unmark to go through |
|
4387 | 4391 | if not mark and not unmark and not proceed: |
|
4388 | 4392 | return 1 |
|
4389 | 4393 | |
|
4390 | 4394 | m = scmutil.match(wctx, pats, opts) |
|
4391 | 4395 | ret = 0 |
|
4392 | 4396 | didwork = False |
|
4393 | 4397 | runconclude = False |
|
4394 | 4398 | |
|
4395 | 4399 | tocomplete = [] |
|
4396 | 4400 | for f in ms: |
|
4397 | 4401 | if not m(f): |
|
4398 | 4402 | continue |
|
4399 | 4403 | |
|
4400 | 4404 | didwork = True |
|
4401 | 4405 | |
|
4402 | 4406 | # don't let driver-resolved files be marked, and run the conclude |
|
4403 | 4407 | # step if asked to resolve |
|
4404 | 4408 | if ms[f] == "d": |
|
4405 | 4409 | exact = m.exact(f) |
|
4406 | 4410 | if mark: |
|
4407 | 4411 | if exact: |
|
4408 | 4412 | ui.warn(_('not marking %s as it is driver-resolved\n') |
|
4409 | 4413 | % f) |
|
4410 | 4414 | elif unmark: |
|
4411 | 4415 | if exact: |
|
4412 | 4416 | ui.warn(_('not unmarking %s as it is driver-resolved\n') |
|
4413 | 4417 | % f) |
|
4414 | 4418 | else: |
|
4415 | 4419 | runconclude = True |
|
4416 | 4420 | continue |
|
4417 | 4421 | |
|
4418 | 4422 | # path conflicts must be resolved manually |
|
4419 | 4423 | if ms[f] in ("pu", "pr"): |
|
4420 | 4424 | if mark: |
|
4421 | 4425 | ms.mark(f, "pr") |
|
4422 | 4426 | elif unmark: |
|
4423 | 4427 | ms.mark(f, "pu") |
|
4424 | 4428 | elif ms[f] == "pu": |
|
4425 | 4429 | ui.warn(_('%s: path conflict must be resolved manually\n') |
|
4426 | 4430 | % f) |
|
4427 | 4431 | continue |
|
4428 | 4432 | |
|
4429 | 4433 | if mark: |
|
4430 | 4434 | ms.mark(f, "r") |
|
4431 | 4435 | elif unmark: |
|
4432 | 4436 | ms.mark(f, "u") |
|
4433 | 4437 | else: |
|
4434 | 4438 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4435 | 4439 | a = repo.wjoin(f) |
|
4436 | 4440 | try: |
|
4437 | 4441 | util.copyfile(a, a + ".resolve") |
|
4438 | 4442 | except (IOError, OSError) as inst: |
|
4439 | 4443 | if inst.errno != errno.ENOENT: |
|
4440 | 4444 | raise |
|
4441 | 4445 | |
|
4442 | 4446 | try: |
|
4443 | 4447 | # preresolve file |
|
4444 | 4448 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4445 | 4449 | 'resolve') |
|
4446 | 4450 | complete, r = ms.preresolve(f, wctx) |
|
4447 | 4451 | if not complete: |
|
4448 | 4452 | tocomplete.append(f) |
|
4449 | 4453 | elif r: |
|
4450 | 4454 | ret = 1 |
|
4451 | 4455 | finally: |
|
4452 | 4456 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4453 | 4457 | ms.commit() |
|
4454 | 4458 | |
|
4455 | 4459 | # replace filemerge's .orig file with our resolve file, but only |
|
4456 | 4460 | # for merges that are complete |
|
4457 | 4461 | if complete: |
|
4458 | 4462 | try: |
|
4459 | 4463 | util.rename(a + ".resolve", |
|
4460 | 4464 | scmutil.origpath(ui, repo, a)) |
|
4461 | 4465 | except OSError as inst: |
|
4462 | 4466 | if inst.errno != errno.ENOENT: |
|
4463 | 4467 | raise |
|
4464 | 4468 | |
|
4465 | 4469 | for f in tocomplete: |
|
4466 | 4470 | try: |
|
4467 | 4471 | # resolve file |
|
4468 | 4472 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4469 | 4473 | 'resolve') |
|
4470 | 4474 | r = ms.resolve(f, wctx) |
|
4471 | 4475 | if r: |
|
4472 | 4476 | ret = 1 |
|
4473 | 4477 | finally: |
|
4474 | 4478 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4475 | 4479 | ms.commit() |
|
4476 | 4480 | |
|
4477 | 4481 | # replace filemerge's .orig file with our resolve file |
|
4478 | 4482 | a = repo.wjoin(f) |
|
4479 | 4483 | try: |
|
4480 | 4484 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) |
|
4481 | 4485 | except OSError as inst: |
|
4482 | 4486 | if inst.errno != errno.ENOENT: |
|
4483 | 4487 | raise |
|
4484 | 4488 | |
|
4485 | 4489 | ms.commit() |
|
4486 | 4490 | ms.recordactions() |
|
4487 | 4491 | |
|
4488 | 4492 | if not didwork and pats: |
|
4489 | 4493 | hint = None |
|
4490 | 4494 | if not any([p for p in pats if p.find(':') >= 0]): |
|
4491 | 4495 | pats = ['path:%s' % p for p in pats] |
|
4492 | 4496 | m = scmutil.match(wctx, pats, opts) |
|
4493 | 4497 | for f in ms: |
|
4494 | 4498 | if not m(f): |
|
4495 | 4499 | continue |
|
4496 | 4500 | flags = ''.join(['-%s ' % o[0] for o in flaglist |
|
4497 | 4501 | if opts.get(o)]) |
|
4498 | 4502 | hint = _("(try: hg resolve %s%s)\n") % ( |
|
4499 | 4503 | flags, |
|
4500 | 4504 | ' '.join(pats)) |
|
4501 | 4505 | break |
|
4502 | 4506 | ui.warn(_("arguments do not match paths that need resolving\n")) |
|
4503 | 4507 | if hint: |
|
4504 | 4508 | ui.warn(hint) |
|
4505 | 4509 | elif ms.mergedriver and ms.mdstate() != 's': |
|
4506 | 4510 | # run conclude step when either a driver-resolved file is requested |
|
4507 | 4511 | # or there are no driver-resolved files |
|
4508 | 4512 | # we can't use 'ret' to determine whether any files are unresolved |
|
4509 | 4513 | # because we might not have tried to resolve some |
|
4510 | 4514 | if ((runconclude or not list(ms.driverresolved())) |
|
4511 | 4515 | and not list(ms.unresolved())): |
|
4512 | 4516 | proceed = mergemod.driverconclude(repo, ms, wctx) |
|
4513 | 4517 | ms.commit() |
|
4514 | 4518 | if not proceed: |
|
4515 | 4519 | return 1 |
|
4516 | 4520 | |
|
4517 | 4521 | # Nudge users into finishing an unfinished operation |
|
4518 | 4522 | unresolvedf = list(ms.unresolved()) |
|
4519 | 4523 | driverresolvedf = list(ms.driverresolved()) |
|
4520 | 4524 | if not unresolvedf and not driverresolvedf: |
|
4521 | 4525 | ui.status(_('(no more unresolved files)\n')) |
|
4522 | 4526 | cmdutil.checkafterresolved(repo) |
|
4523 | 4527 | elif not unresolvedf: |
|
4524 | 4528 | ui.status(_('(no more unresolved files -- ' |
|
4525 | 4529 | 'run "hg resolve --all" to conclude)\n')) |
|
4526 | 4530 | |
|
4527 | 4531 | return ret |
|
4528 | 4532 | |
|
4529 | 4533 | @command('revert', |
|
4530 | 4534 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4531 | 4535 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4532 | 4536 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4533 | 4537 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4534 | 4538 | ('i', 'interactive', None, _('interactively select the changes')), |
|
4535 | 4539 | ] + walkopts + dryrunopts, |
|
4536 | 4540 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4537 | 4541 | def revert(ui, repo, *pats, **opts): |
|
4538 | 4542 | """restore files to their checkout state |
|
4539 | 4543 | |
|
4540 | 4544 | .. note:: |
|
4541 | 4545 | |
|
4542 | 4546 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4543 | 4547 | To cancel an uncommitted merge (and lose your changes), |
|
4544 | 4548 | use :hg:`update --clean .`. |
|
4545 | 4549 | |
|
4546 | 4550 | With no revision specified, revert the specified files or directories |
|
4547 | 4551 | to the contents they had in the parent of the working directory. |
|
4548 | 4552 | This restores the contents of files to an unmodified |
|
4549 | 4553 | state and unschedules adds, removes, copies, and renames. If the |
|
4550 | 4554 | working directory has two parents, you must explicitly specify a |
|
4551 | 4555 | revision. |
|
4552 | 4556 | |
|
4553 | 4557 | Using the -r/--rev or -d/--date options, revert the given files or |
|
4554 | 4558 | directories to their states as of a specific revision. Because |
|
4555 | 4559 | revert does not change the working directory parents, this will |
|
4556 | 4560 | cause these files to appear modified. This can be helpful to "back |
|
4557 | 4561 | out" some or all of an earlier change. See :hg:`backout` for a |
|
4558 | 4562 | related method. |
|
4559 | 4563 | |
|
4560 | 4564 | Modified files are saved with a .orig suffix before reverting. |
|
4561 | 4565 | To disable these backups, use --no-backup. It is possible to store |
|
4562 | 4566 | the backup files in a custom directory relative to the root of the |
|
4563 | 4567 | repository by setting the ``ui.origbackuppath`` configuration |
|
4564 | 4568 | option. |
|
4565 | 4569 | |
|
4566 | 4570 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4567 | 4571 | |
|
4568 | 4572 | See :hg:`help backout` for a way to reverse the effect of an |
|
4569 | 4573 | earlier changeset. |
|
4570 | 4574 | |
|
4571 | 4575 | Returns 0 on success. |
|
4572 | 4576 | """ |
|
4573 | 4577 | |
|
4574 | 4578 | opts = pycompat.byteskwargs(opts) |
|
4575 | 4579 | if opts.get("date"): |
|
4576 | 4580 | if opts.get("rev"): |
|
4577 | 4581 | raise error.Abort(_("you can't specify a revision and a date")) |
|
4578 | 4582 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
4579 | 4583 | |
|
4580 | 4584 | parent, p2 = repo.dirstate.parents() |
|
4581 | 4585 | if not opts.get('rev') and p2 != nullid: |
|
4582 | 4586 | # revert after merge is a trap for new users (issue2915) |
|
4583 | 4587 | raise error.Abort(_('uncommitted merge with no revision specified'), |
|
4584 | 4588 | hint=_("use 'hg update' or see 'hg help revert'")) |
|
4585 | 4589 | |
|
4586 | 4590 | rev = opts.get('rev') |
|
4587 | 4591 | if rev: |
|
4588 | 4592 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
4589 | 4593 | ctx = scmutil.revsingle(repo, rev) |
|
4590 | 4594 | |
|
4591 | 4595 | if (not (pats or opts.get('include') or opts.get('exclude') or |
|
4592 | 4596 | opts.get('all') or opts.get('interactive'))): |
|
4593 | 4597 | msg = _("no files or directories specified") |
|
4594 | 4598 | if p2 != nullid: |
|
4595 | 4599 | hint = _("uncommitted merge, use --all to discard all changes," |
|
4596 | 4600 | " or 'hg update -C .' to abort the merge") |
|
4597 | 4601 | raise error.Abort(msg, hint=hint) |
|
4598 | 4602 | dirty = any(repo.status()) |
|
4599 | 4603 | node = ctx.node() |
|
4600 | 4604 | if node != parent: |
|
4601 | 4605 | if dirty: |
|
4602 | 4606 | hint = _("uncommitted changes, use --all to discard all" |
|
4603 | 4607 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
4604 | 4608 | else: |
|
4605 | 4609 | hint = _("use --all to revert all files," |
|
4606 | 4610 | " or 'hg update %s' to update") % ctx.rev() |
|
4607 | 4611 | elif dirty: |
|
4608 | 4612 | hint = _("uncommitted changes, use --all to discard all changes") |
|
4609 | 4613 | else: |
|
4610 | 4614 | hint = _("use --all to revert all files") |
|
4611 | 4615 | raise error.Abort(msg, hint=hint) |
|
4612 | 4616 | |
|
4613 | 4617 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, |
|
4614 | 4618 | **pycompat.strkwargs(opts)) |
|
4615 | 4619 | |
|
4616 | 4620 | @command('rollback', dryrunopts + |
|
4617 | 4621 | [('f', 'force', False, _('ignore safety measures'))]) |
|
4618 | 4622 | def rollback(ui, repo, **opts): |
|
4619 | 4623 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
4620 | 4624 | |
|
4621 | 4625 | Please use :hg:`commit --amend` instead of rollback to correct |
|
4622 | 4626 | mistakes in the last commit. |
|
4623 | 4627 | |
|
4624 | 4628 | This command should be used with care. There is only one level of |
|
4625 | 4629 | rollback, and there is no way to undo a rollback. It will also |
|
4626 | 4630 | restore the dirstate at the time of the last transaction, losing |
|
4627 | 4631 | any dirstate changes since that time. This command does not alter |
|
4628 | 4632 | the working directory. |
|
4629 | 4633 | |
|
4630 | 4634 | Transactions are used to encapsulate the effects of all commands |
|
4631 | 4635 | that create new changesets or propagate existing changesets into a |
|
4632 | 4636 | repository. |
|
4633 | 4637 | |
|
4634 | 4638 | .. container:: verbose |
|
4635 | 4639 | |
|
4636 | 4640 | For example, the following commands are transactional, and their |
|
4637 | 4641 | effects can be rolled back: |
|
4638 | 4642 | |
|
4639 | 4643 | - commit |
|
4640 | 4644 | - import |
|
4641 | 4645 | - pull |
|
4642 | 4646 | - push (with this repository as the destination) |
|
4643 | 4647 | - unbundle |
|
4644 | 4648 | |
|
4645 | 4649 | To avoid permanent data loss, rollback will refuse to rollback a |
|
4646 | 4650 | commit transaction if it isn't checked out. Use --force to |
|
4647 | 4651 | override this protection. |
|
4648 | 4652 | |
|
4649 | 4653 | The rollback command can be entirely disabled by setting the |
|
4650 | 4654 | ``ui.rollback`` configuration setting to false. If you're here |
|
4651 | 4655 | because you want to use rollback and it's disabled, you can |
|
4652 | 4656 | re-enable the command by setting ``ui.rollback`` to true. |
|
4653 | 4657 | |
|
4654 | 4658 | This command is not intended for use on public repositories. Once |
|
4655 | 4659 | changes are visible for pull by other users, rolling a transaction |
|
4656 | 4660 | back locally is ineffective (someone else may already have pulled |
|
4657 | 4661 | the changes). Furthermore, a race is possible with readers of the |
|
4658 | 4662 | repository; for example an in-progress pull from the repository |
|
4659 | 4663 | may fail if a rollback is performed. |
|
4660 | 4664 | |
|
4661 | 4665 | Returns 0 on success, 1 if no rollback data is available. |
|
4662 | 4666 | """ |
|
4663 | 4667 | if not ui.configbool('ui', 'rollback'): |
|
4664 | 4668 | raise error.Abort(_('rollback is disabled because it is unsafe'), |
|
4665 | 4669 | hint=('see `hg help -v rollback` for information')) |
|
4666 | 4670 | return repo.rollback(dryrun=opts.get(r'dry_run'), |
|
4667 | 4671 | force=opts.get(r'force')) |
|
4668 | 4672 | |
|
4669 | 4673 | @command('root', [], cmdtype=readonly) |
|
4670 | 4674 | def root(ui, repo): |
|
4671 | 4675 | """print the root (top) of the current working directory |
|
4672 | 4676 | |
|
4673 | 4677 | Print the root directory of the current repository. |
|
4674 | 4678 | |
|
4675 | 4679 | Returns 0 on success. |
|
4676 | 4680 | """ |
|
4677 | 4681 | ui.write(repo.root + "\n") |
|
4678 | 4682 | |
|
4679 | 4683 | @command('^serve', |
|
4680 | 4684 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
4681 | 4685 | _('FILE')), |
|
4682 | 4686 | ('d', 'daemon', None, _('run server in background')), |
|
4683 | 4687 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), |
|
4684 | 4688 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
4685 | 4689 | # use string type, then we can check if something was passed |
|
4686 | 4690 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
4687 | 4691 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
4688 | 4692 | _('ADDR')), |
|
4689 | 4693 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
4690 | 4694 | _('PREFIX')), |
|
4691 | 4695 | ('n', 'name', '', |
|
4692 | 4696 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
4693 | 4697 | ('', 'web-conf', '', |
|
4694 | 4698 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), |
|
4695 | 4699 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
4696 | 4700 | _('FILE')), |
|
4697 | 4701 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
4698 | 4702 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), |
|
4699 | 4703 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), |
|
4700 | 4704 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
4701 | 4705 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
4702 | 4706 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
4703 | 4707 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] |
|
4704 | 4708 | + subrepoopts, |
|
4705 | 4709 | _('[OPTION]...'), |
|
4706 | 4710 | optionalrepo=True) |
|
4707 | 4711 | def serve(ui, repo, **opts): |
|
4708 | 4712 | """start stand-alone webserver |
|
4709 | 4713 | |
|
4710 | 4714 | Start a local HTTP repository browser and pull server. You can use |
|
4711 | 4715 | this for ad-hoc sharing and browsing of repositories. It is |
|
4712 | 4716 | recommended to use a real web server to serve a repository for |
|
4713 | 4717 | longer periods of time. |
|
4714 | 4718 | |
|
4715 | 4719 | Please note that the server does not implement access control. |
|
4716 | 4720 | This means that, by default, anybody can read from the server and |
|
4717 | 4721 | nobody can write to it by default. Set the ``web.allow-push`` |
|
4718 | 4722 | option to ``*`` to allow everybody to push to the server. You |
|
4719 | 4723 | should use a real web server if you need to authenticate users. |
|
4720 | 4724 | |
|
4721 | 4725 | By default, the server logs accesses to stdout and errors to |
|
4722 | 4726 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
4723 | 4727 | files. |
|
4724 | 4728 | |
|
4725 | 4729 | To have the server choose a free port number to listen on, specify |
|
4726 | 4730 | a port number of 0; in this case, the server will print the port |
|
4727 | 4731 | number it uses. |
|
4728 | 4732 | |
|
4729 | 4733 | Returns 0 on success. |
|
4730 | 4734 | """ |
|
4731 | 4735 | |
|
4732 | 4736 | opts = pycompat.byteskwargs(opts) |
|
4733 | 4737 | if opts["stdio"] and opts["cmdserver"]: |
|
4734 | 4738 | raise error.Abort(_("cannot use --stdio with --cmdserver")) |
|
4735 | 4739 | |
|
4736 | 4740 | if opts["stdio"]: |
|
4737 | 4741 | if repo is None: |
|
4738 | 4742 | raise error.RepoError(_("there is no Mercurial repository here" |
|
4739 | 4743 | " (.hg not found)")) |
|
4740 | 4744 | s = sshserver.sshserver(ui, repo) |
|
4741 | 4745 | s.serve_forever() |
|
4742 | 4746 | |
|
4743 | 4747 | service = server.createservice(ui, repo, opts) |
|
4744 | 4748 | return server.runservice(opts, initfn=service.init, runfn=service.run) |
|
4745 | 4749 | |
|
4746 | 4750 | @command('^status|st', |
|
4747 | 4751 | [('A', 'all', None, _('show status of all files')), |
|
4748 | 4752 | ('m', 'modified', None, _('show only modified files')), |
|
4749 | 4753 | ('a', 'added', None, _('show only added files')), |
|
4750 | 4754 | ('r', 'removed', None, _('show only removed files')), |
|
4751 | 4755 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
4752 | 4756 | ('c', 'clean', None, _('show only files without changes')), |
|
4753 | 4757 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
4754 | 4758 | ('i', 'ignored', None, _('show only ignored files')), |
|
4755 | 4759 | ('n', 'no-status', None, _('hide status prefix')), |
|
4756 | 4760 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), |
|
4757 | 4761 | ('C', 'copies', None, _('show source of copied files')), |
|
4758 | 4762 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
4759 | 4763 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
4760 | 4764 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
4761 | 4765 | ] + walkopts + subrepoopts + formatteropts, |
|
4762 | 4766 | _('[OPTION]... [FILE]...'), |
|
4763 | 4767 | inferrepo=True, cmdtype=readonly) |
|
4764 | 4768 | def status(ui, repo, *pats, **opts): |
|
4765 | 4769 | """show changed files in the working directory |
|
4766 | 4770 | |
|
4767 | 4771 | Show status of files in the repository. If names are given, only |
|
4768 | 4772 | files that match are shown. Files that are clean or ignored or |
|
4769 | 4773 | the source of a copy/move operation, are not listed unless |
|
4770 | 4774 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
4771 | 4775 | Unless options described with "show only ..." are given, the |
|
4772 | 4776 | options -mardu are used. |
|
4773 | 4777 | |
|
4774 | 4778 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
4775 | 4779 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
4776 | 4780 | |
|
4777 | 4781 | .. note:: |
|
4778 | 4782 | |
|
4779 | 4783 | :hg:`status` may appear to disagree with diff if permissions have |
|
4780 | 4784 | changed or a merge has occurred. The standard diff format does |
|
4781 | 4785 | not report permission changes and diff only reports changes |
|
4782 | 4786 | relative to one merge parent. |
|
4783 | 4787 | |
|
4784 | 4788 | If one revision is given, it is used as the base revision. |
|
4785 | 4789 | If two revisions are given, the differences between them are |
|
4786 | 4790 | shown. The --change option can also be used as a shortcut to list |
|
4787 | 4791 | the changed files of a revision from its first parent. |
|
4788 | 4792 | |
|
4789 | 4793 | The codes used to show the status of files are:: |
|
4790 | 4794 | |
|
4791 | 4795 | M = modified |
|
4792 | 4796 | A = added |
|
4793 | 4797 | R = removed |
|
4794 | 4798 | C = clean |
|
4795 | 4799 | ! = missing (deleted by non-hg command, but still tracked) |
|
4796 | 4800 | ? = not tracked |
|
4797 | 4801 | I = ignored |
|
4798 | 4802 | = origin of the previous file (with --copies) |
|
4799 | 4803 | |
|
4800 | 4804 | .. container:: verbose |
|
4801 | 4805 | |
|
4802 | 4806 | The -t/--terse option abbreviates the output by showing only the directory |
|
4803 | 4807 | name if all the files in it share the same status. The option takes an |
|
4804 | 4808 | argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' |
|
4805 | 4809 | for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' |
|
4806 | 4810 | for 'ignored' and 'c' for clean. |
|
4807 | 4811 | |
|
4808 | 4812 | It abbreviates only those statuses which are passed. Note that clean and |
|
4809 | 4813 | ignored files are not displayed with '--terse ic' unless the -c/--clean |
|
4810 | 4814 | and -i/--ignored options are also used. |
|
4811 | 4815 | |
|
4812 | 4816 | The -v/--verbose option shows information when the repository is in an |
|
4813 | 4817 | unfinished merge, shelve, rebase state etc. You can have this behavior |
|
4814 | 4818 | turned on by default by enabling the ``commands.status.verbose`` option. |
|
4815 | 4819 | |
|
4816 | 4820 | You can skip displaying some of these states by setting |
|
4817 | 4821 | ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', |
|
4818 | 4822 | 'histedit', 'merge', 'rebase', or 'unshelve'. |
|
4819 | 4823 | |
|
4820 | 4824 | Examples: |
|
4821 | 4825 | |
|
4822 | 4826 | - show changes in the working directory relative to a |
|
4823 | 4827 | changeset:: |
|
4824 | 4828 | |
|
4825 | 4829 | hg status --rev 9353 |
|
4826 | 4830 | |
|
4827 | 4831 | - show changes in the working directory relative to the |
|
4828 | 4832 | current directory (see :hg:`help patterns` for more information):: |
|
4829 | 4833 | |
|
4830 | 4834 | hg status re: |
|
4831 | 4835 | |
|
4832 | 4836 | - show all changes including copies in an existing changeset:: |
|
4833 | 4837 | |
|
4834 | 4838 | hg status --copies --change 9353 |
|
4835 | 4839 | |
|
4836 | 4840 | - get a NUL separated list of added files, suitable for xargs:: |
|
4837 | 4841 | |
|
4838 | 4842 | hg status -an0 |
|
4839 | 4843 | |
|
4840 | 4844 | - show more information about the repository status, abbreviating |
|
4841 | 4845 | added, removed, modified, deleted, and untracked paths:: |
|
4842 | 4846 | |
|
4843 | 4847 | hg status -v -t mardu |
|
4844 | 4848 | |
|
4845 | 4849 | Returns 0 on success. |
|
4846 | 4850 | |
|
4847 | 4851 | """ |
|
4848 | 4852 | |
|
4849 | 4853 | opts = pycompat.byteskwargs(opts) |
|
4850 | 4854 | revs = opts.get('rev') |
|
4851 | 4855 | change = opts.get('change') |
|
4852 | 4856 | terse = opts.get('terse') |
|
4853 | 4857 | |
|
4854 | 4858 | if revs and change: |
|
4855 | 4859 | msg = _('cannot specify --rev and --change at the same time') |
|
4856 | 4860 | raise error.Abort(msg) |
|
4857 | 4861 | elif revs and terse: |
|
4858 | 4862 | msg = _('cannot use --terse with --rev') |
|
4859 | 4863 | raise error.Abort(msg) |
|
4860 | 4864 | elif change: |
|
4861 | 4865 | repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
|
4862 | 4866 | node2 = scmutil.revsingle(repo, change, None).node() |
|
4863 | 4867 | node1 = repo[node2].p1().node() |
|
4864 | 4868 | else: |
|
4865 | 4869 | repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
|
4866 | 4870 | node1, node2 = scmutil.revpair(repo, revs) |
|
4867 | 4871 | |
|
4868 | 4872 | if pats or ui.configbool('commands', 'status.relative'): |
|
4869 | 4873 | cwd = repo.getcwd() |
|
4870 | 4874 | else: |
|
4871 | 4875 | cwd = '' |
|
4872 | 4876 | |
|
4873 | 4877 | if opts.get('print0'): |
|
4874 | 4878 | end = '\0' |
|
4875 | 4879 | else: |
|
4876 | 4880 | end = '\n' |
|
4877 | 4881 | copy = {} |
|
4878 | 4882 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
4879 | 4883 | show = [k for k in states if opts.get(k)] |
|
4880 | 4884 | if opts.get('all'): |
|
4881 | 4885 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
4882 | 4886 | |
|
4883 | 4887 | if not show: |
|
4884 | 4888 | if ui.quiet: |
|
4885 | 4889 | show = states[:4] |
|
4886 | 4890 | else: |
|
4887 | 4891 | show = states[:5] |
|
4888 | 4892 | |
|
4889 | 4893 | m = scmutil.match(repo[node2], pats, opts) |
|
4890 | 4894 | if terse: |
|
4891 | 4895 | # we need to compute clean and unknown to terse |
|
4892 | 4896 | stat = repo.status(node1, node2, m, |
|
4893 | 4897 | 'ignored' in show or 'i' in terse, |
|
4894 | 4898 | True, True, opts.get('subrepos')) |
|
4895 | 4899 | |
|
4896 | 4900 | stat = cmdutil.tersedir(stat, terse) |
|
4897 | 4901 | else: |
|
4898 | 4902 | stat = repo.status(node1, node2, m, |
|
4899 | 4903 | 'ignored' in show, 'clean' in show, |
|
4900 | 4904 | 'unknown' in show, opts.get('subrepos')) |
|
4901 | 4905 | |
|
4902 | 4906 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) |
|
4903 | 4907 | |
|
4904 | 4908 | if (opts.get('all') or opts.get('copies') |
|
4905 | 4909 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
|
4906 | 4910 | copy = copies.pathcopies(repo[node1], repo[node2], m) |
|
4907 | 4911 | |
|
4908 | 4912 | ui.pager('status') |
|
4909 | 4913 | fm = ui.formatter('status', opts) |
|
4910 | 4914 | fmt = '%s' + end |
|
4911 | 4915 | showchar = not opts.get('no_status') |
|
4912 | 4916 | |
|
4913 | 4917 | for state, char, files in changestates: |
|
4914 | 4918 | if state in show: |
|
4915 | 4919 | label = 'status.' + state |
|
4916 | 4920 | for f in files: |
|
4917 | 4921 | fm.startitem() |
|
4918 | 4922 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
4919 | 4923 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
4920 | 4924 | if f in copy: |
|
4921 | 4925 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
4922 | 4926 | label='status.copied') |
|
4923 | 4927 | |
|
4924 | 4928 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) |
|
4925 | 4929 | and not ui.plain()): |
|
4926 | 4930 | cmdutil.morestatus(repo, fm) |
|
4927 | 4931 | fm.end() |
|
4928 | 4932 | |
|
4929 | 4933 | @command('^summary|sum', |
|
4930 | 4934 | [('', 'remote', None, _('check for push and pull'))], |
|
4931 | 4935 | '[--remote]', cmdtype=readonly) |
|
4932 | 4936 | def summary(ui, repo, **opts): |
|
4933 | 4937 | """summarize working directory state |
|
4934 | 4938 | |
|
4935 | 4939 | This generates a brief summary of the working directory state, |
|
4936 | 4940 | including parents, branch, commit status, phase and available updates. |
|
4937 | 4941 | |
|
4938 | 4942 | With the --remote option, this will check the default paths for |
|
4939 | 4943 | incoming and outgoing changes. This can be time-consuming. |
|
4940 | 4944 | |
|
4941 | 4945 | Returns 0 on success. |
|
4942 | 4946 | """ |
|
4943 | 4947 | |
|
4944 | 4948 | opts = pycompat.byteskwargs(opts) |
|
4945 | 4949 | ui.pager('summary') |
|
4946 | 4950 | ctx = repo[None] |
|
4947 | 4951 | parents = ctx.parents() |
|
4948 | 4952 | pnode = parents[0].node() |
|
4949 | 4953 | marks = [] |
|
4950 | 4954 | |
|
4951 | 4955 | ms = None |
|
4952 | 4956 | try: |
|
4953 | 4957 | ms = mergemod.mergestate.read(repo) |
|
4954 | 4958 | except error.UnsupportedMergeRecords as e: |
|
4955 | 4959 | s = ' '.join(e.recordtypes) |
|
4956 | 4960 | ui.warn( |
|
4957 | 4961 | _('warning: merge state has unsupported record types: %s\n') % s) |
|
4958 | 4962 | unresolved = [] |
|
4959 | 4963 | else: |
|
4960 | 4964 | unresolved = list(ms.unresolved()) |
|
4961 | 4965 | |
|
4962 | 4966 | for p in parents: |
|
4963 | 4967 | # label with log.changeset (instead of log.parent) since this |
|
4964 | 4968 | # shows a working directory parent *changeset*: |
|
4965 | 4969 | # i18n: column positioning for "hg summary" |
|
4966 | 4970 | ui.write(_('parent: %d:%s ') % (p.rev(), p), |
|
4967 | 4971 | label=cmdutil._changesetlabels(p)) |
|
4968 | 4972 | ui.write(' '.join(p.tags()), label='log.tag') |
|
4969 | 4973 | if p.bookmarks(): |
|
4970 | 4974 | marks.extend(p.bookmarks()) |
|
4971 | 4975 | if p.rev() == -1: |
|
4972 | 4976 | if not len(repo): |
|
4973 | 4977 | ui.write(_(' (empty repository)')) |
|
4974 | 4978 | else: |
|
4975 | 4979 | ui.write(_(' (no revision checked out)')) |
|
4976 | 4980 | if p.obsolete(): |
|
4977 | 4981 | ui.write(_(' (obsolete)')) |
|
4978 | 4982 | if p.isunstable(): |
|
4979 | 4983 | instabilities = (ui.label(instability, 'trouble.%s' % instability) |
|
4980 | 4984 | for instability in p.instabilities()) |
|
4981 | 4985 | ui.write(' (' |
|
4982 | 4986 | + ', '.join(instabilities) |
|
4983 | 4987 | + ')') |
|
4984 | 4988 | ui.write('\n') |
|
4985 | 4989 | if p.description(): |
|
4986 | 4990 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
4987 | 4991 | label='log.summary') |
|
4988 | 4992 | |
|
4989 | 4993 | branch = ctx.branch() |
|
4990 | 4994 | bheads = repo.branchheads(branch) |
|
4991 | 4995 | # i18n: column positioning for "hg summary" |
|
4992 | 4996 | m = _('branch: %s\n') % branch |
|
4993 | 4997 | if branch != 'default': |
|
4994 | 4998 | ui.write(m, label='log.branch') |
|
4995 | 4999 | else: |
|
4996 | 5000 | ui.status(m, label='log.branch') |
|
4997 | 5001 | |
|
4998 | 5002 | if marks: |
|
4999 | 5003 | active = repo._activebookmark |
|
5000 | 5004 | # i18n: column positioning for "hg summary" |
|
5001 | 5005 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5002 | 5006 | if active is not None: |
|
5003 | 5007 | if active in marks: |
|
5004 | 5008 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) |
|
5005 | 5009 | marks.remove(active) |
|
5006 | 5010 | else: |
|
5007 | 5011 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) |
|
5008 | 5012 | for m in marks: |
|
5009 | 5013 | ui.write(' ' + m, label='log.bookmark') |
|
5010 | 5014 | ui.write('\n', label='log.bookmark') |
|
5011 | 5015 | |
|
5012 | 5016 | status = repo.status(unknown=True) |
|
5013 | 5017 | |
|
5014 | 5018 | c = repo.dirstate.copies() |
|
5015 | 5019 | copied, renamed = [], [] |
|
5016 | 5020 | for d, s in c.iteritems(): |
|
5017 | 5021 | if s in status.removed: |
|
5018 | 5022 | status.removed.remove(s) |
|
5019 | 5023 | renamed.append(d) |
|
5020 | 5024 | else: |
|
5021 | 5025 | copied.append(d) |
|
5022 | 5026 | if d in status.added: |
|
5023 | 5027 | status.added.remove(d) |
|
5024 | 5028 | |
|
5025 | 5029 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5026 | 5030 | |
|
5027 | 5031 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), |
|
5028 | 5032 | (ui.label(_('%d added'), 'status.added'), status.added), |
|
5029 | 5033 | (ui.label(_('%d removed'), 'status.removed'), status.removed), |
|
5030 | 5034 | (ui.label(_('%d renamed'), 'status.copied'), renamed), |
|
5031 | 5035 | (ui.label(_('%d copied'), 'status.copied'), copied), |
|
5032 | 5036 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), |
|
5033 | 5037 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), |
|
5034 | 5038 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), |
|
5035 | 5039 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] |
|
5036 | 5040 | t = [] |
|
5037 | 5041 | for l, s in labels: |
|
5038 | 5042 | if s: |
|
5039 | 5043 | t.append(l % len(s)) |
|
5040 | 5044 | |
|
5041 | 5045 | t = ', '.join(t) |
|
5042 | 5046 | cleanworkdir = False |
|
5043 | 5047 | |
|
5044 | 5048 | if repo.vfs.exists('graftstate'): |
|
5045 | 5049 | t += _(' (graft in progress)') |
|
5046 | 5050 | if repo.vfs.exists('updatestate'): |
|
5047 | 5051 | t += _(' (interrupted update)') |
|
5048 | 5052 | elif len(parents) > 1: |
|
5049 | 5053 | t += _(' (merge)') |
|
5050 | 5054 | elif branch != parents[0].branch(): |
|
5051 | 5055 | t += _(' (new branch)') |
|
5052 | 5056 | elif (parents[0].closesbranch() and |
|
5053 | 5057 | pnode in repo.branchheads(branch, closed=True)): |
|
5054 | 5058 | t += _(' (head closed)') |
|
5055 | 5059 | elif not (status.modified or status.added or status.removed or renamed or |
|
5056 | 5060 | copied or subs): |
|
5057 | 5061 | t += _(' (clean)') |
|
5058 | 5062 | cleanworkdir = True |
|
5059 | 5063 | elif pnode not in bheads: |
|
5060 | 5064 | t += _(' (new branch head)') |
|
5061 | 5065 | |
|
5062 | 5066 | if parents: |
|
5063 | 5067 | pendingphase = max(p.phase() for p in parents) |
|
5064 | 5068 | else: |
|
5065 | 5069 | pendingphase = phases.public |
|
5066 | 5070 | |
|
5067 | 5071 | if pendingphase > phases.newcommitphase(ui): |
|
5068 | 5072 | t += ' (%s)' % phases.phasenames[pendingphase] |
|
5069 | 5073 | |
|
5070 | 5074 | if cleanworkdir: |
|
5071 | 5075 | # i18n: column positioning for "hg summary" |
|
5072 | 5076 | ui.status(_('commit: %s\n') % t.strip()) |
|
5073 | 5077 | else: |
|
5074 | 5078 | # i18n: column positioning for "hg summary" |
|
5075 | 5079 | ui.write(_('commit: %s\n') % t.strip()) |
|
5076 | 5080 | |
|
5077 | 5081 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5078 | 5082 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], |
|
5079 | 5083 | bheads)) |
|
5080 | 5084 | |
|
5081 | 5085 | if new == 0: |
|
5082 | 5086 | # i18n: column positioning for "hg summary" |
|
5083 | 5087 | ui.status(_('update: (current)\n')) |
|
5084 | 5088 | elif pnode not in bheads: |
|
5085 | 5089 | # i18n: column positioning for "hg summary" |
|
5086 | 5090 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5087 | 5091 | else: |
|
5088 | 5092 | # i18n: column positioning for "hg summary" |
|
5089 | 5093 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5090 | 5094 | (new, len(bheads))) |
|
5091 | 5095 | |
|
5092 | 5096 | t = [] |
|
5093 | 5097 | draft = len(repo.revs('draft()')) |
|
5094 | 5098 | if draft: |
|
5095 | 5099 | t.append(_('%d draft') % draft) |
|
5096 | 5100 | secret = len(repo.revs('secret()')) |
|
5097 | 5101 | if secret: |
|
5098 | 5102 | t.append(_('%d secret') % secret) |
|
5099 | 5103 | |
|
5100 | 5104 | if draft or secret: |
|
5101 | 5105 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
5102 | 5106 | |
|
5103 | 5107 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
5104 | 5108 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): |
|
5105 | 5109 | numtrouble = len(repo.revs(trouble + "()")) |
|
5106 | 5110 | # We write all the possibilities to ease translation |
|
5107 | 5111 | troublemsg = { |
|
5108 | 5112 | "orphan": _("orphan: %d changesets"), |
|
5109 | 5113 | "contentdivergent": _("content-divergent: %d changesets"), |
|
5110 | 5114 | "phasedivergent": _("phase-divergent: %d changesets"), |
|
5111 | 5115 | } |
|
5112 | 5116 | if numtrouble > 0: |
|
5113 | 5117 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
|
5114 | 5118 | |
|
5115 | 5119 | cmdutil.summaryhooks(ui, repo) |
|
5116 | 5120 | |
|
5117 | 5121 | if opts.get('remote'): |
|
5118 | 5122 | needsincoming, needsoutgoing = True, True |
|
5119 | 5123 | else: |
|
5120 | 5124 | needsincoming, needsoutgoing = False, False |
|
5121 | 5125 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
5122 | 5126 | if i: |
|
5123 | 5127 | needsincoming = True |
|
5124 | 5128 | if o: |
|
5125 | 5129 | needsoutgoing = True |
|
5126 | 5130 | if not needsincoming and not needsoutgoing: |
|
5127 | 5131 | return |
|
5128 | 5132 | |
|
5129 | 5133 | def getincoming(): |
|
5130 | 5134 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5131 | 5135 | sbranch = branches[0] |
|
5132 | 5136 | try: |
|
5133 | 5137 | other = hg.peer(repo, {}, source) |
|
5134 | 5138 | except error.RepoError: |
|
5135 | 5139 | if opts.get('remote'): |
|
5136 | 5140 | raise |
|
5137 | 5141 | return source, sbranch, None, None, None |
|
5138 | 5142 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5139 | 5143 | if revs: |
|
5140 | 5144 | revs = [other.lookup(rev) for rev in revs] |
|
5141 | 5145 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5142 | 5146 | repo.ui.pushbuffer() |
|
5143 | 5147 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5144 | 5148 | repo.ui.popbuffer() |
|
5145 | 5149 | return source, sbranch, other, commoninc, commoninc[1] |
|
5146 | 5150 | |
|
5147 | 5151 | if needsincoming: |
|
5148 | 5152 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
5149 | 5153 | else: |
|
5150 | 5154 | source = sbranch = sother = commoninc = incoming = None |
|
5151 | 5155 | |
|
5152 | 5156 | def getoutgoing(): |
|
5153 | 5157 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5154 | 5158 | dbranch = branches[0] |
|
5155 | 5159 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5156 | 5160 | if source != dest: |
|
5157 | 5161 | try: |
|
5158 | 5162 | dother = hg.peer(repo, {}, dest) |
|
5159 | 5163 | except error.RepoError: |
|
5160 | 5164 | if opts.get('remote'): |
|
5161 | 5165 | raise |
|
5162 | 5166 | return dest, dbranch, None, None |
|
5163 | 5167 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5164 | 5168 | elif sother is None: |
|
5165 | 5169 | # there is no explicit destination peer, but source one is invalid |
|
5166 | 5170 | return dest, dbranch, None, None |
|
5167 | 5171 | else: |
|
5168 | 5172 | dother = sother |
|
5169 | 5173 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5170 | 5174 | common = None |
|
5171 | 5175 | else: |
|
5172 | 5176 | common = commoninc |
|
5173 | 5177 | if revs: |
|
5174 | 5178 | revs = [repo.lookup(rev) for rev in revs] |
|
5175 | 5179 | repo.ui.pushbuffer() |
|
5176 | 5180 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, |
|
5177 | 5181 | commoninc=common) |
|
5178 | 5182 | repo.ui.popbuffer() |
|
5179 | 5183 | return dest, dbranch, dother, outgoing |
|
5180 | 5184 | |
|
5181 | 5185 | if needsoutgoing: |
|
5182 | 5186 | dest, dbranch, dother, outgoing = getoutgoing() |
|
5183 | 5187 | else: |
|
5184 | 5188 | dest = dbranch = dother = outgoing = None |
|
5185 | 5189 | |
|
5186 | 5190 | if opts.get('remote'): |
|
5187 | 5191 | t = [] |
|
5188 | 5192 | if incoming: |
|
5189 | 5193 | t.append(_('1 or more incoming')) |
|
5190 | 5194 | o = outgoing.missing |
|
5191 | 5195 | if o: |
|
5192 | 5196 | t.append(_('%d outgoing') % len(o)) |
|
5193 | 5197 | other = dother or sother |
|
5194 | 5198 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5195 | 5199 | counts = bookmarks.summary(repo, other) |
|
5196 | 5200 | if counts[0] > 0: |
|
5197 | 5201 | t.append(_('%d incoming bookmarks') % counts[0]) |
|
5198 | 5202 | if counts[1] > 0: |
|
5199 | 5203 | t.append(_('%d outgoing bookmarks') % counts[1]) |
|
5200 | 5204 | |
|
5201 | 5205 | if t: |
|
5202 | 5206 | # i18n: column positioning for "hg summary" |
|
5203 | 5207 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5204 | 5208 | else: |
|
5205 | 5209 | # i18n: column positioning for "hg summary" |
|
5206 | 5210 | ui.status(_('remote: (synced)\n')) |
|
5207 | 5211 | |
|
5208 | 5212 | cmdutil.summaryremotehooks(ui, repo, opts, |
|
5209 | 5213 | ((source, sbranch, sother, commoninc), |
|
5210 | 5214 | (dest, dbranch, dother, outgoing))) |
|
5211 | 5215 | |
|
5212 | 5216 | @command('tag', |
|
5213 | 5217 | [('f', 'force', None, _('force tag')), |
|
5214 | 5218 | ('l', 'local', None, _('make the tag local')), |
|
5215 | 5219 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5216 | 5220 | ('', 'remove', None, _('remove a tag')), |
|
5217 | 5221 | # -l/--local is already there, commitopts cannot be used |
|
5218 | 5222 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
5219 | 5223 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), |
|
5220 | 5224 | ] + commitopts2, |
|
5221 | 5225 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5222 | 5226 | def tag(ui, repo, name1, *names, **opts): |
|
5223 | 5227 | """add one or more tags for the current or given revision |
|
5224 | 5228 | |
|
5225 | 5229 | Name a particular revision using <name>. |
|
5226 | 5230 | |
|
5227 | 5231 | Tags are used to name particular revisions of the repository and are |
|
5228 | 5232 | very useful to compare different revisions, to go back to significant |
|
5229 | 5233 | earlier versions or to mark branch points as releases, etc. Changing |
|
5230 | 5234 | an existing tag is normally disallowed; use -f/--force to override. |
|
5231 | 5235 | |
|
5232 | 5236 | If no revision is given, the parent of the working directory is |
|
5233 | 5237 | used. |
|
5234 | 5238 | |
|
5235 | 5239 | To facilitate version control, distribution, and merging of tags, |
|
5236 | 5240 | they are stored as a file named ".hgtags" which is managed similarly |
|
5237 | 5241 | to other project files and can be hand-edited if necessary. This |
|
5238 | 5242 | also means that tagging creates a new commit. The file |
|
5239 | 5243 | ".hg/localtags" is used for local tags (not shared among |
|
5240 | 5244 | repositories). |
|
5241 | 5245 | |
|
5242 | 5246 | Tag commits are usually made at the head of a branch. If the parent |
|
5243 | 5247 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5244 | 5248 | -f/--force to force the tag commit to be based on a non-head |
|
5245 | 5249 | changeset. |
|
5246 | 5250 | |
|
5247 | 5251 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5248 | 5252 | |
|
5249 | 5253 | Since tag names have priority over branch names during revision |
|
5250 | 5254 | lookup, using an existing branch name as a tag name is discouraged. |
|
5251 | 5255 | |
|
5252 | 5256 | Returns 0 on success. |
|
5253 | 5257 | """ |
|
5254 | 5258 | opts = pycompat.byteskwargs(opts) |
|
5255 | 5259 | wlock = lock = None |
|
5256 | 5260 | try: |
|
5257 | 5261 | wlock = repo.wlock() |
|
5258 | 5262 | lock = repo.lock() |
|
5259 | 5263 | rev_ = "." |
|
5260 | 5264 | names = [t.strip() for t in (name1,) + names] |
|
5261 | 5265 | if len(names) != len(set(names)): |
|
5262 | 5266 | raise error.Abort(_('tag names must be unique')) |
|
5263 | 5267 | for n in names: |
|
5264 | 5268 | scmutil.checknewlabel(repo, n, 'tag') |
|
5265 | 5269 | if not n: |
|
5266 | 5270 | raise error.Abort(_('tag names cannot consist entirely of ' |
|
5267 | 5271 | 'whitespace')) |
|
5268 | 5272 | if opts.get('rev') and opts.get('remove'): |
|
5269 | 5273 | raise error.Abort(_("--rev and --remove are incompatible")) |
|
5270 | 5274 | if opts.get('rev'): |
|
5271 | 5275 | rev_ = opts['rev'] |
|
5272 | 5276 | message = opts.get('message') |
|
5273 | 5277 | if opts.get('remove'): |
|
5274 | 5278 | if opts.get('local'): |
|
5275 | 5279 | expectedtype = 'local' |
|
5276 | 5280 | else: |
|
5277 | 5281 | expectedtype = 'global' |
|
5278 | 5282 | |
|
5279 | 5283 | for n in names: |
|
5280 | 5284 | if not repo.tagtype(n): |
|
5281 | 5285 | raise error.Abort(_("tag '%s' does not exist") % n) |
|
5282 | 5286 | if repo.tagtype(n) != expectedtype: |
|
5283 | 5287 | if expectedtype == 'global': |
|
5284 | 5288 | raise error.Abort(_("tag '%s' is not a global tag") % n) |
|
5285 | 5289 | else: |
|
5286 | 5290 | raise error.Abort(_("tag '%s' is not a local tag") % n) |
|
5287 | 5291 | rev_ = 'null' |
|
5288 | 5292 | if not message: |
|
5289 | 5293 | # we don't translate commit messages |
|
5290 | 5294 | message = 'Removed tag %s' % ', '.join(names) |
|
5291 | 5295 | elif not opts.get('force'): |
|
5292 | 5296 | for n in names: |
|
5293 | 5297 | if n in repo.tags(): |
|
5294 | 5298 | raise error.Abort(_("tag '%s' already exists " |
|
5295 | 5299 | "(use -f to force)") % n) |
|
5296 | 5300 | if not opts.get('local'): |
|
5297 | 5301 | p1, p2 = repo.dirstate.parents() |
|
5298 | 5302 | if p2 != nullid: |
|
5299 | 5303 | raise error.Abort(_('uncommitted merge')) |
|
5300 | 5304 | bheads = repo.branchheads() |
|
5301 | 5305 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5302 | 5306 | raise error.Abort(_('working directory is not at a branch head ' |
|
5303 | 5307 | '(use -f to force)')) |
|
5304 | 5308 | r = scmutil.revsingle(repo, rev_).node() |
|
5305 | 5309 | |
|
5306 | 5310 | if not message: |
|
5307 | 5311 | # we don't translate commit messages |
|
5308 | 5312 | message = ('Added tag %s for changeset %s' % |
|
5309 | 5313 | (', '.join(names), short(r))) |
|
5310 | 5314 | |
|
5311 | 5315 | date = opts.get('date') |
|
5312 | 5316 | if date: |
|
5313 | 5317 | date = util.parsedate(date) |
|
5314 | 5318 | |
|
5315 | 5319 | if opts.get('remove'): |
|
5316 | 5320 | editform = 'tag.remove' |
|
5317 | 5321 | else: |
|
5318 | 5322 | editform = 'tag.add' |
|
5319 | 5323 | editor = cmdutil.getcommiteditor(editform=editform, |
|
5320 | 5324 | **pycompat.strkwargs(opts)) |
|
5321 | 5325 | |
|
5322 | 5326 | # don't allow tagging the null rev |
|
5323 | 5327 | if (not opts.get('remove') and |
|
5324 | 5328 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5325 | 5329 | raise error.Abort(_("cannot tag null revision")) |
|
5326 | 5330 | |
|
5327 | 5331 | tagsmod.tag(repo, names, r, message, opts.get('local'), |
|
5328 | 5332 | opts.get('user'), date, editor=editor) |
|
5329 | 5333 | finally: |
|
5330 | 5334 | release(lock, wlock) |
|
5331 | 5335 | |
|
5332 | 5336 | @command('tags', formatteropts, '', cmdtype=readonly) |
|
5333 | 5337 | def tags(ui, repo, **opts): |
|
5334 | 5338 | """list repository tags |
|
5335 | 5339 | |
|
5336 | 5340 | This lists both regular and local tags. When the -v/--verbose |
|
5337 | 5341 | switch is used, a third column "local" is printed for local tags. |
|
5338 | 5342 | When the -q/--quiet switch is used, only the tag name is printed. |
|
5339 | 5343 | |
|
5340 | 5344 | Returns 0 on success. |
|
5341 | 5345 | """ |
|
5342 | 5346 | |
|
5343 | 5347 | opts = pycompat.byteskwargs(opts) |
|
5344 | 5348 | ui.pager('tags') |
|
5345 | 5349 | fm = ui.formatter('tags', opts) |
|
5346 | 5350 | hexfunc = fm.hexfunc |
|
5347 | 5351 | tagtype = "" |
|
5348 | 5352 | |
|
5349 | 5353 | for t, n in reversed(repo.tagslist()): |
|
5350 | 5354 | hn = hexfunc(n) |
|
5351 | 5355 | label = 'tags.normal' |
|
5352 | 5356 | tagtype = '' |
|
5353 | 5357 | if repo.tagtype(t) == 'local': |
|
5354 | 5358 | label = 'tags.local' |
|
5355 | 5359 | tagtype = 'local' |
|
5356 | 5360 | |
|
5357 | 5361 | fm.startitem() |
|
5358 | 5362 | fm.write('tag', '%s', t, label=label) |
|
5359 | 5363 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5360 | 5364 | fm.condwrite(not ui.quiet, 'rev node', fmt, |
|
5361 | 5365 | repo.changelog.rev(n), hn, label=label) |
|
5362 | 5366 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5363 | 5367 | tagtype, label=label) |
|
5364 | 5368 | fm.plain('\n') |
|
5365 | 5369 | fm.end() |
|
5366 | 5370 | |
|
5367 | 5371 | @command('tip', |
|
5368 | 5372 | [('p', 'patch', None, _('show patch')), |
|
5369 | 5373 | ('g', 'git', None, _('use git extended diff format')), |
|
5370 | 5374 | ] + templateopts, |
|
5371 | 5375 | _('[-p] [-g]')) |
|
5372 | 5376 | def tip(ui, repo, **opts): |
|
5373 | 5377 | """show the tip revision (DEPRECATED) |
|
5374 | 5378 | |
|
5375 | 5379 | The tip revision (usually just called the tip) is the changeset |
|
5376 | 5380 | most recently added to the repository (and therefore the most |
|
5377 | 5381 | recently changed head). |
|
5378 | 5382 | |
|
5379 | 5383 | If you have just made a commit, that commit will be the tip. If |
|
5380 | 5384 | you have just pulled changes from another repository, the tip of |
|
5381 | 5385 | that repository becomes the current tip. The "tip" tag is special |
|
5382 | 5386 | and cannot be renamed or assigned to a different changeset. |
|
5383 | 5387 | |
|
5384 | 5388 | This command is deprecated, please use :hg:`heads` instead. |
|
5385 | 5389 | |
|
5386 | 5390 | Returns 0 on success. |
|
5387 | 5391 | """ |
|
5388 | 5392 | opts = pycompat.byteskwargs(opts) |
|
5389 | 5393 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5390 | 5394 | displayer.show(repo['tip']) |
|
5391 | 5395 | displayer.close() |
|
5392 | 5396 | |
|
5393 | 5397 | @command('unbundle', |
|
5394 | 5398 | [('u', 'update', None, |
|
5395 | 5399 | _('update to new branch head if changesets were unbundled'))], |
|
5396 | 5400 | _('[-u] FILE...')) |
|
5397 | 5401 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5398 | 5402 | """apply one or more bundle files |
|
5399 | 5403 | |
|
5400 | 5404 | Apply one or more bundle files generated by :hg:`bundle`. |
|
5401 | 5405 | |
|
5402 | 5406 | Returns 0 on success, 1 if an update has unresolved files. |
|
5403 | 5407 | """ |
|
5404 | 5408 | fnames = (fname1,) + fnames |
|
5405 | 5409 | |
|
5406 | 5410 | with repo.lock(): |
|
5407 | 5411 | for fname in fnames: |
|
5408 | 5412 | f = hg.openpath(ui, fname) |
|
5409 | 5413 | gen = exchange.readbundle(ui, f, fname) |
|
5410 | 5414 | if isinstance(gen, streamclone.streamcloneapplier): |
|
5411 | 5415 | raise error.Abort( |
|
5412 | 5416 | _('packed bundles cannot be applied with ' |
|
5413 | 5417 | '"hg unbundle"'), |
|
5414 | 5418 | hint=_('use "hg debugapplystreamclonebundle"')) |
|
5415 | 5419 | url = 'bundle:' + fname |
|
5416 | 5420 | try: |
|
5417 | 5421 | txnname = 'unbundle' |
|
5418 | 5422 | if not isinstance(gen, bundle2.unbundle20): |
|
5419 | 5423 | txnname = 'unbundle\n%s' % util.hidepassword(url) |
|
5420 | 5424 | with repo.transaction(txnname) as tr: |
|
5421 | 5425 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', |
|
5422 | 5426 | url=url) |
|
5423 | 5427 | except error.BundleUnknownFeatureError as exc: |
|
5424 | 5428 | raise error.Abort( |
|
5425 | 5429 | _('%s: unknown bundle feature, %s') % (fname, exc), |
|
5426 | 5430 | hint=_("see https://mercurial-scm.org/" |
|
5427 | 5431 | "wiki/BundleFeature for more " |
|
5428 | 5432 | "information")) |
|
5429 | 5433 | modheads = bundle2.combinechangegroupresults(op) |
|
5430 | 5434 | |
|
5431 | 5435 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
|
5432 | 5436 | |
|
5433 | 5437 | @command('^update|up|checkout|co', |
|
5434 | 5438 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5435 | 5439 | ('c', 'check', None, _('require clean working directory')), |
|
5436 | 5440 | ('m', 'merge', None, _('merge uncommitted changes')), |
|
5437 | 5441 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5438 | 5442 | ('r', 'rev', '', _('revision'), _('REV')) |
|
5439 | 5443 | ] + mergetoolopts, |
|
5440 | 5444 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) |
|
5441 | 5445 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, |
|
5442 | 5446 | merge=None, tool=None): |
|
5443 | 5447 | """update working directory (or switch revisions) |
|
5444 | 5448 | |
|
5445 | 5449 | Update the repository's working directory to the specified |
|
5446 | 5450 | changeset. If no changeset is specified, update to the tip of the |
|
5447 | 5451 | current named branch and move the active bookmark (see :hg:`help |
|
5448 | 5452 | bookmarks`). |
|
5449 | 5453 | |
|
5450 | 5454 | Update sets the working directory's parent revision to the specified |
|
5451 | 5455 | changeset (see :hg:`help parents`). |
|
5452 | 5456 | |
|
5453 | 5457 | If the changeset is not a descendant or ancestor of the working |
|
5454 | 5458 | directory's parent and there are uncommitted changes, the update is |
|
5455 | 5459 | aborted. With the -c/--check option, the working directory is checked |
|
5456 | 5460 | for uncommitted changes; if none are found, the working directory is |
|
5457 | 5461 | updated to the specified changeset. |
|
5458 | 5462 | |
|
5459 | 5463 | .. container:: verbose |
|
5460 | 5464 | |
|
5461 | 5465 | The -C/--clean, -c/--check, and -m/--merge options control what |
|
5462 | 5466 | happens if the working directory contains uncommitted changes. |
|
5463 | 5467 | At most of one of them can be specified. |
|
5464 | 5468 | |
|
5465 | 5469 | 1. If no option is specified, and if |
|
5466 | 5470 | the requested changeset is an ancestor or descendant of |
|
5467 | 5471 | the working directory's parent, the uncommitted changes |
|
5468 | 5472 | are merged into the requested changeset and the merged |
|
5469 | 5473 | result is left uncommitted. If the requested changeset is |
|
5470 | 5474 | not an ancestor or descendant (that is, it is on another |
|
5471 | 5475 | branch), the update is aborted and the uncommitted changes |
|
5472 | 5476 | are preserved. |
|
5473 | 5477 | |
|
5474 | 5478 | 2. With the -m/--merge option, the update is allowed even if the |
|
5475 | 5479 | requested changeset is not an ancestor or descendant of |
|
5476 | 5480 | the working directory's parent. |
|
5477 | 5481 | |
|
5478 | 5482 | 3. With the -c/--check option, the update is aborted and the |
|
5479 | 5483 | uncommitted changes are preserved. |
|
5480 | 5484 | |
|
5481 | 5485 | 4. With the -C/--clean option, uncommitted changes are discarded and |
|
5482 | 5486 | the working directory is updated to the requested changeset. |
|
5483 | 5487 | |
|
5484 | 5488 | To cancel an uncommitted merge (and lose your changes), use |
|
5485 | 5489 | :hg:`update --clean .`. |
|
5486 | 5490 | |
|
5487 | 5491 | Use null as the changeset to remove the working directory (like |
|
5488 | 5492 | :hg:`clone -U`). |
|
5489 | 5493 | |
|
5490 | 5494 | If you want to revert just one file to an older revision, use |
|
5491 | 5495 | :hg:`revert [-r REV] NAME`. |
|
5492 | 5496 | |
|
5493 | 5497 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5494 | 5498 | |
|
5495 | 5499 | Returns 0 on success, 1 if there are unresolved files. |
|
5496 | 5500 | """ |
|
5497 | 5501 | if rev and node: |
|
5498 | 5502 | raise error.Abort(_("please specify just one revision")) |
|
5499 | 5503 | |
|
5500 | 5504 | if ui.configbool('commands', 'update.requiredest'): |
|
5501 | 5505 | if not node and not rev and not date: |
|
5502 | 5506 | raise error.Abort(_('you must specify a destination'), |
|
5503 | 5507 | hint=_('for example: hg update ".::"')) |
|
5504 | 5508 | |
|
5505 | 5509 | if rev is None or rev == '': |
|
5506 | 5510 | rev = node |
|
5507 | 5511 | |
|
5508 | 5512 | if date and rev is not None: |
|
5509 | 5513 | raise error.Abort(_("you can't specify a revision and a date")) |
|
5510 | 5514 | |
|
5511 | 5515 | if len([x for x in (clean, check, merge) if x]) > 1: |
|
5512 | 5516 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
|
5513 | 5517 | "or -m/--merge")) |
|
5514 | 5518 | |
|
5515 | 5519 | updatecheck = None |
|
5516 | 5520 | if check: |
|
5517 | 5521 | updatecheck = 'abort' |
|
5518 | 5522 | elif merge: |
|
5519 | 5523 | updatecheck = 'none' |
|
5520 | 5524 | |
|
5521 | 5525 | with repo.wlock(): |
|
5522 | 5526 | cmdutil.clearunfinished(repo) |
|
5523 | 5527 | |
|
5524 | 5528 | if date: |
|
5525 | 5529 | rev = cmdutil.finddate(ui, repo, date) |
|
5526 | 5530 | |
|
5527 | 5531 | # if we defined a bookmark, we have to remember the original name |
|
5528 | 5532 | brev = rev |
|
5529 | 5533 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
5530 | 5534 | ctx = scmutil.revsingle(repo, rev, rev) |
|
5531 | 5535 | rev = ctx.rev() |
|
5532 | 5536 | if ctx.hidden(): |
|
5533 | 5537 | ui.warn(_("updating to a hidden changeset %s\n") % ctx.hex()[:12]) |
|
5534 | 5538 | |
|
5535 | 5539 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
|
5536 | 5540 | |
|
5537 | 5541 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
|
5538 | 5542 | updatecheck=updatecheck) |
|
5539 | 5543 | |
|
5540 | 5544 | @command('verify', []) |
|
5541 | 5545 | def verify(ui, repo): |
|
5542 | 5546 | """verify the integrity of the repository |
|
5543 | 5547 | |
|
5544 | 5548 | Verify the integrity of the current repository. |
|
5545 | 5549 | |
|
5546 | 5550 | This will perform an extensive check of the repository's |
|
5547 | 5551 | integrity, validating the hashes and checksums of each entry in |
|
5548 | 5552 | the changelog, manifest, and tracked files, as well as the |
|
5549 | 5553 | integrity of their crosslinks and indices. |
|
5550 | 5554 | |
|
5551 | 5555 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption |
|
5552 | 5556 | for more information about recovery from corruption of the |
|
5553 | 5557 | repository. |
|
5554 | 5558 | |
|
5555 | 5559 | Returns 0 on success, 1 if errors are encountered. |
|
5556 | 5560 | """ |
|
5557 | 5561 | return hg.verify(repo) |
|
5558 | 5562 | |
|
5559 | 5563 | @command('version', [] + formatteropts, norepo=True, cmdtype=readonly) |
|
5560 | 5564 | def version_(ui, **opts): |
|
5561 | 5565 | """output version and copyright information""" |
|
5562 | 5566 | opts = pycompat.byteskwargs(opts) |
|
5563 | 5567 | if ui.verbose: |
|
5564 | 5568 | ui.pager('version') |
|
5565 | 5569 | fm = ui.formatter("version", opts) |
|
5566 | 5570 | fm.startitem() |
|
5567 | 5571 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), |
|
5568 | 5572 | util.version()) |
|
5569 | 5573 | license = _( |
|
5570 | 5574 | "(see https://mercurial-scm.org for more information)\n" |
|
5571 | 5575 | "\nCopyright (C) 2005-2017 Matt Mackall and others\n" |
|
5572 | 5576 | "This is free software; see the source for copying conditions. " |
|
5573 | 5577 | "There is NO\nwarranty; " |
|
5574 | 5578 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5575 | 5579 | ) |
|
5576 | 5580 | if not ui.quiet: |
|
5577 | 5581 | fm.plain(license) |
|
5578 | 5582 | |
|
5579 | 5583 | if ui.verbose: |
|
5580 | 5584 | fm.plain(_("\nEnabled extensions:\n\n")) |
|
5581 | 5585 | # format names and versions into columns |
|
5582 | 5586 | names = [] |
|
5583 | 5587 | vers = [] |
|
5584 | 5588 | isinternals = [] |
|
5585 | 5589 | for name, module in extensions.extensions(): |
|
5586 | 5590 | names.append(name) |
|
5587 | 5591 | vers.append(extensions.moduleversion(module) or None) |
|
5588 | 5592 | isinternals.append(extensions.ismoduleinternal(module)) |
|
5589 | 5593 | fn = fm.nested("extensions") |
|
5590 | 5594 | if names: |
|
5591 | 5595 | namefmt = " %%-%ds " % max(len(n) for n in names) |
|
5592 | 5596 | places = [_("external"), _("internal")] |
|
5593 | 5597 | for n, v, p in zip(names, vers, isinternals): |
|
5594 | 5598 | fn.startitem() |
|
5595 | 5599 | fn.condwrite(ui.verbose, "name", namefmt, n) |
|
5596 | 5600 | if ui.verbose: |
|
5597 | 5601 | fn.plain("%s " % places[p]) |
|
5598 | 5602 | fn.data(bundled=p) |
|
5599 | 5603 | fn.condwrite(ui.verbose and v, "ver", "%s", v) |
|
5600 | 5604 | if ui.verbose: |
|
5601 | 5605 | fn.plain("\n") |
|
5602 | 5606 | fn.end() |
|
5603 | 5607 | fm.end() |
|
5604 | 5608 | |
|
5605 | 5609 | def loadcmdtable(ui, name, cmdtable): |
|
5606 | 5610 | """Load command functions from specified cmdtable |
|
5607 | 5611 | """ |
|
5608 | 5612 | overrides = [cmd for cmd in cmdtable if cmd in table] |
|
5609 | 5613 | if overrides: |
|
5610 | 5614 | ui.warn(_("extension '%s' overrides commands: %s\n") |
|
5611 | 5615 | % (name, " ".join(overrides))) |
|
5612 | 5616 | table.update(cmdtable) |
@@ -1,3561 +1,3542 b'' | |||
|
1 | 1 | @ (34) head |
|
2 | 2 | | |
|
3 | 3 | | o (33) head |
|
4 | 4 | | | |
|
5 | 5 | o | (32) expand |
|
6 | 6 | |\ \ |
|
7 | 7 | | o \ (31) expand |
|
8 | 8 | | |\ \ |
|
9 | 9 | | | o \ (30) expand |
|
10 | 10 | | | |\ \ |
|
11 | 11 | | | | o | (29) regular commit |
|
12 | 12 | | | | | | |
|
13 | 13 | | | o | | (28) merge zero known |
|
14 | 14 | | | |\ \ \ |
|
15 | 15 | o | | | | | (27) collapse |
|
16 | 16 | |/ / / / / |
|
17 | 17 | | | o---+ (26) merge one known; far right |
|
18 | 18 | | | | | | |
|
19 | 19 | +---o | | (25) merge one known; far left |
|
20 | 20 | | | | | | |
|
21 | 21 | | | o | | (24) merge one known; immediate right |
|
22 | 22 | | | |\| | |
|
23 | 23 | | | o | | (23) merge one known; immediate left |
|
24 | 24 | | |/| | | |
|
25 | 25 | +---o---+ (22) merge two known; one far left, one far right |
|
26 | 26 | | | / / |
|
27 | 27 | o | | | (21) expand |
|
28 | 28 | |\ \ \ \ |
|
29 | 29 | | o---+-+ (20) merge two known; two far right |
|
30 | 30 | | / / / |
|
31 | 31 | o | | | (19) expand |
|
32 | 32 | |\ \ \ \ |
|
33 | 33 | +---+---o (18) merge two known; two far left |
|
34 | 34 | | | | | |
|
35 | 35 | | o | | (17) expand |
|
36 | 36 | | |\ \ \ |
|
37 | 37 | | | o---+ (16) merge two known; one immediate right, one near right |
|
38 | 38 | | | |/ / |
|
39 | 39 | o | | | (15) expand |
|
40 | 40 | |\ \ \ \ |
|
41 | 41 | | o-----+ (14) merge two known; one immediate right, one far right |
|
42 | 42 | | |/ / / |
|
43 | 43 | o | | | (13) expand |
|
44 | 44 | |\ \ \ \ |
|
45 | 45 | +---o | | (12) merge two known; one immediate right, one far left |
|
46 | 46 | | | |/ / |
|
47 | 47 | | o | | (11) expand |
|
48 | 48 | | |\ \ \ |
|
49 | 49 | | | o---+ (10) merge two known; one immediate left, one near right |
|
50 | 50 | | |/ / / |
|
51 | 51 | o | | | (9) expand |
|
52 | 52 | |\ \ \ \ |
|
53 | 53 | | o-----+ (8) merge two known; one immediate left, one far right |
|
54 | 54 | |/ / / / |
|
55 | 55 | o | | | (7) expand |
|
56 | 56 | |\ \ \ \ |
|
57 | 57 | +---o | | (6) merge two known; one immediate left, one far left |
|
58 | 58 | | |/ / / |
|
59 | 59 | | o | | (5) expand |
|
60 | 60 | | |\ \ \ |
|
61 | 61 | | | o | | (4) merge two known; one immediate left, one immediate right |
|
62 | 62 | | |/|/ / |
|
63 | 63 | | o / / (3) collapse |
|
64 | 64 | |/ / / |
|
65 | 65 | o / / (2) collapse |
|
66 | 66 | |/ / |
|
67 | 67 | o / (1) collapse |
|
68 | 68 | |/ |
|
69 | 69 | o (0) root |
|
70 | 70 | |
|
71 | 71 | |
|
72 | 72 | $ commit() |
|
73 | 73 | > { |
|
74 | 74 | > rev=$1 |
|
75 | 75 | > msg=$2 |
|
76 | 76 | > shift 2 |
|
77 | 77 | > if [ "$#" -gt 0 ]; then |
|
78 | 78 | > hg debugsetparents "$@" |
|
79 | 79 | > fi |
|
80 | 80 | > echo $rev > a |
|
81 | 81 | > hg commit -Aqd "$rev 0" -m "($rev) $msg" |
|
82 | 82 | > } |
|
83 | 83 | |
|
84 | 84 | $ cat > printrevset.py <<EOF |
|
85 | 85 | > from __future__ import absolute_import |
|
86 | 86 | > from mercurial import ( |
|
87 | 87 | > cmdutil, |
|
88 | 88 | > commands, |
|
89 | 89 | > extensions, |
|
90 | 90 | > revsetlang, |
|
91 | 91 | > smartset, |
|
92 | 92 | > ) |
|
93 | 93 | > |
|
94 | 94 | > def logrevset(repo, pats, opts): |
|
95 | 95 | > revs = cmdutil._logrevs(repo, opts) |
|
96 | 96 | > if not revs: |
|
97 | 97 | > return None |
|
98 | 98 | > return cmdutil._makelogrevset(repo, pats, opts, revs)[0] |
|
99 | 99 | > |
|
100 | 100 | > def uisetup(ui): |
|
101 | 101 | > def printrevset(orig, repo, pats, opts): |
|
102 | 102 | > revs, filematcher = orig(repo, pats, opts) |
|
103 | 103 | > if opts.get('print_revset'): |
|
104 | 104 | > expr = logrevset(repo, pats, opts) |
|
105 | 105 | > if expr: |
|
106 | 106 | > tree = revsetlang.parse(expr) |
|
107 | 107 | > tree = revsetlang.analyze(tree) |
|
108 | 108 | > else: |
|
109 | 109 | > tree = [] |
|
110 | 110 | > ui = repo.ui |
|
111 | 111 | > ui.write('%r\n' % (opts.get('rev', []),)) |
|
112 | 112 | > ui.write(revsetlang.prettyformat(tree) + '\n') |
|
113 | 113 | > ui.write(smartset.prettyformat(revs) + '\n') |
|
114 | 114 | > revs = smartset.baseset() # display no revisions |
|
115 | 115 | > return revs, filematcher |
|
116 | 116 | > extensions.wrapfunction(cmdutil, 'getlogrevs', printrevset) |
|
117 | 117 | > aliases, entry = cmdutil.findcmd('log', commands.table) |
|
118 | 118 | > entry[1].append(('', 'print-revset', False, |
|
119 | 119 | > 'print generated revset and exit (DEPRECATED)')) |
|
120 | 120 | > EOF |
|
121 | 121 | |
|
122 | 122 | $ echo "[extensions]" >> $HGRCPATH |
|
123 | 123 | $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH |
|
124 | 124 | |
|
125 | 125 | $ hg init repo |
|
126 | 126 | $ cd repo |
|
127 | 127 | |
|
128 | 128 | Empty repo: |
|
129 | 129 | |
|
130 | 130 | $ hg log -G |
|
131 | 131 | |
|
132 | 132 | |
|
133 | 133 | Building DAG: |
|
134 | 134 | |
|
135 | 135 | $ commit 0 "root" |
|
136 | 136 | $ commit 1 "collapse" 0 |
|
137 | 137 | $ commit 2 "collapse" 1 |
|
138 | 138 | $ commit 3 "collapse" 2 |
|
139 | 139 | $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
140 | 140 | $ commit 5 "expand" 3 4 |
|
141 | 141 | $ commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
142 | 142 | $ commit 7 "expand" 2 5 |
|
143 | 143 | $ commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
144 | 144 | $ commit 9 "expand" 7 8 |
|
145 | 145 | $ commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
146 | 146 | $ commit 11 "expand" 6 10 |
|
147 | 147 | $ commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
148 | 148 | $ commit 13 "expand" 9 11 |
|
149 | 149 | $ commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
150 | 150 | $ commit 15 "expand" 13 14 |
|
151 | 151 | $ commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
152 | 152 | $ commit 17 "expand" 12 16 |
|
153 | 153 | $ commit 18 "merge two known; two far left" 1 15 |
|
154 | 154 | $ commit 19 "expand" 15 17 |
|
155 | 155 | $ commit 20 "merge two known; two far right" 0 18 |
|
156 | 156 | $ commit 21 "expand" 19 20 |
|
157 | 157 | $ commit 22 "merge two known; one far left, one far right" 18 21 |
|
158 | 158 | $ commit 23 "merge one known; immediate left" 1 22 |
|
159 | 159 | $ commit 24 "merge one known; immediate right" 0 23 |
|
160 | 160 | $ commit 25 "merge one known; far left" 21 24 |
|
161 | 161 | $ commit 26 "merge one known; far right" 18 25 |
|
162 | 162 | $ commit 27 "collapse" 21 |
|
163 | 163 | $ commit 28 "merge zero known" 1 26 |
|
164 | 164 | $ commit 29 "regular commit" 0 |
|
165 | 165 | $ commit 30 "expand" 28 29 |
|
166 | 166 | $ commit 31 "expand" 21 30 |
|
167 | 167 | $ commit 32 "expand" 27 31 |
|
168 | 168 | $ commit 33 "head" 18 |
|
169 | 169 | $ commit 34 "head" 32 |
|
170 | 170 | |
|
171 | 171 | |
|
172 | 172 | $ hg log -G -q |
|
173 | 173 | @ 34:fea3ac5810e0 |
|
174 | 174 | | |
|
175 | 175 | | o 33:68608f5145f9 |
|
176 | 176 | | | |
|
177 | 177 | o | 32:d06dffa21a31 |
|
178 | 178 | |\ \ |
|
179 | 179 | | o \ 31:621d83e11f67 |
|
180 | 180 | | |\ \ |
|
181 | 181 | | | o \ 30:6e11cd4b648f |
|
182 | 182 | | | |\ \ |
|
183 | 183 | | | | o | 29:cd9bb2be7593 |
|
184 | 184 | | | | | | |
|
185 | 185 | | | o | | 28:44ecd0b9ae99 |
|
186 | 186 | | | |\ \ \ |
|
187 | 187 | o | | | | | 27:886ed638191b |
|
188 | 188 | |/ / / / / |
|
189 | 189 | | | o---+ 26:7f25b6c2f0b9 |
|
190 | 190 | | | | | | |
|
191 | 191 | +---o | | 25:91da8ed57247 |
|
192 | 192 | | | | | | |
|
193 | 193 | | | o | | 24:a9c19a3d96b7 |
|
194 | 194 | | | |\| | |
|
195 | 195 | | | o | | 23:a01cddf0766d |
|
196 | 196 | | |/| | | |
|
197 | 197 | +---o---+ 22:e0d9cccacb5d |
|
198 | 198 | | | / / |
|
199 | 199 | o | | | 21:d42a756af44d |
|
200 | 200 | |\ \ \ \ |
|
201 | 201 | | o---+-+ 20:d30ed6450e32 |
|
202 | 202 | | / / / |
|
203 | 203 | o | | | 19:31ddc2c1573b |
|
204 | 204 | |\ \ \ \ |
|
205 | 205 | +---+---o 18:1aa84d96232a |
|
206 | 206 | | | | | |
|
207 | 207 | | o | | 17:44765d7c06e0 |
|
208 | 208 | | |\ \ \ |
|
209 | 209 | | | o---+ 16:3677d192927d |
|
210 | 210 | | | |/ / |
|
211 | 211 | o | | | 15:1dda3f72782d |
|
212 | 212 | |\ \ \ \ |
|
213 | 213 | | o-----+ 14:8eac370358ef |
|
214 | 214 | | |/ / / |
|
215 | 215 | o | | | 13:22d8966a97e3 |
|
216 | 216 | |\ \ \ \ |
|
217 | 217 | +---o | | 12:86b91144a6e9 |
|
218 | 218 | | | |/ / |
|
219 | 219 | | o | | 11:832d76e6bdf2 |
|
220 | 220 | | |\ \ \ |
|
221 | 221 | | | o---+ 10:74c64d036d72 |
|
222 | 222 | | |/ / / |
|
223 | 223 | o | | | 9:7010c0af0a35 |
|
224 | 224 | |\ \ \ \ |
|
225 | 225 | | o-----+ 8:7a0b11f71937 |
|
226 | 226 | |/ / / / |
|
227 | 227 | o | | | 7:b632bb1b1224 |
|
228 | 228 | |\ \ \ \ |
|
229 | 229 | +---o | | 6:b105a072e251 |
|
230 | 230 | | |/ / / |
|
231 | 231 | | o | | 5:4409d547b708 |
|
232 | 232 | | |\ \ \ |
|
233 | 233 | | | o | | 4:26a8bac39d9f |
|
234 | 234 | | |/|/ / |
|
235 | 235 | | o / / 3:27eef8ed80b4 |
|
236 | 236 | |/ / / |
|
237 | 237 | o / / 2:3d9a33b8d1e1 |
|
238 | 238 | |/ / |
|
239 | 239 | o / 1:6db2ef61d156 |
|
240 | 240 | |/ |
|
241 | 241 | o 0:e6eb3150255d |
|
242 | 242 | |
|
243 | 243 | |
|
244 | 244 | $ hg log -G |
|
245 | 245 | @ changeset: 34:fea3ac5810e0 |
|
246 | 246 | | tag: tip |
|
247 | 247 | | parent: 32:d06dffa21a31 |
|
248 | 248 | | user: test |
|
249 | 249 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
250 | 250 | | summary: (34) head |
|
251 | 251 | | |
|
252 | 252 | | o changeset: 33:68608f5145f9 |
|
253 | 253 | | | parent: 18:1aa84d96232a |
|
254 | 254 | | | user: test |
|
255 | 255 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
256 | 256 | | | summary: (33) head |
|
257 | 257 | | | |
|
258 | 258 | o | changeset: 32:d06dffa21a31 |
|
259 | 259 | |\ \ parent: 27:886ed638191b |
|
260 | 260 | | | | parent: 31:621d83e11f67 |
|
261 | 261 | | | | user: test |
|
262 | 262 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
263 | 263 | | | | summary: (32) expand |
|
264 | 264 | | | | |
|
265 | 265 | | o | changeset: 31:621d83e11f67 |
|
266 | 266 | | |\ \ parent: 21:d42a756af44d |
|
267 | 267 | | | | | parent: 30:6e11cd4b648f |
|
268 | 268 | | | | | user: test |
|
269 | 269 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
270 | 270 | | | | | summary: (31) expand |
|
271 | 271 | | | | | |
|
272 | 272 | | | o | changeset: 30:6e11cd4b648f |
|
273 | 273 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
274 | 274 | | | | | | parent: 29:cd9bb2be7593 |
|
275 | 275 | | | | | | user: test |
|
276 | 276 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
277 | 277 | | | | | | summary: (30) expand |
|
278 | 278 | | | | | | |
|
279 | 279 | | | | o | changeset: 29:cd9bb2be7593 |
|
280 | 280 | | | | | | parent: 0:e6eb3150255d |
|
281 | 281 | | | | | | user: test |
|
282 | 282 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
283 | 283 | | | | | | summary: (29) regular commit |
|
284 | 284 | | | | | | |
|
285 | 285 | | | o | | changeset: 28:44ecd0b9ae99 |
|
286 | 286 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
287 | 287 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
288 | 288 | | | | | | | user: test |
|
289 | 289 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
290 | 290 | | | | | | | summary: (28) merge zero known |
|
291 | 291 | | | | | | | |
|
292 | 292 | o | | | | | changeset: 27:886ed638191b |
|
293 | 293 | |/ / / / / parent: 21:d42a756af44d |
|
294 | 294 | | | | | | user: test |
|
295 | 295 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
296 | 296 | | | | | | summary: (27) collapse |
|
297 | 297 | | | | | | |
|
298 | 298 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
299 | 299 | | | | | | parent: 18:1aa84d96232a |
|
300 | 300 | | | | | | parent: 25:91da8ed57247 |
|
301 | 301 | | | | | | user: test |
|
302 | 302 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
303 | 303 | | | | | | summary: (26) merge one known; far right |
|
304 | 304 | | | | | | |
|
305 | 305 | +---o | | changeset: 25:91da8ed57247 |
|
306 | 306 | | | | | | parent: 21:d42a756af44d |
|
307 | 307 | | | | | | parent: 24:a9c19a3d96b7 |
|
308 | 308 | | | | | | user: test |
|
309 | 309 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
310 | 310 | | | | | | summary: (25) merge one known; far left |
|
311 | 311 | | | | | | |
|
312 | 312 | | | o | | changeset: 24:a9c19a3d96b7 |
|
313 | 313 | | | |\| | parent: 0:e6eb3150255d |
|
314 | 314 | | | | | | parent: 23:a01cddf0766d |
|
315 | 315 | | | | | | user: test |
|
316 | 316 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
317 | 317 | | | | | | summary: (24) merge one known; immediate right |
|
318 | 318 | | | | | | |
|
319 | 319 | | | o | | changeset: 23:a01cddf0766d |
|
320 | 320 | | |/| | | parent: 1:6db2ef61d156 |
|
321 | 321 | | | | | | parent: 22:e0d9cccacb5d |
|
322 | 322 | | | | | | user: test |
|
323 | 323 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
324 | 324 | | | | | | summary: (23) merge one known; immediate left |
|
325 | 325 | | | | | | |
|
326 | 326 | +---o---+ changeset: 22:e0d9cccacb5d |
|
327 | 327 | | | | | parent: 18:1aa84d96232a |
|
328 | 328 | | | / / parent: 21:d42a756af44d |
|
329 | 329 | | | | | user: test |
|
330 | 330 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
331 | 331 | | | | | summary: (22) merge two known; one far left, one far right |
|
332 | 332 | | | | | |
|
333 | 333 | o | | | changeset: 21:d42a756af44d |
|
334 | 334 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
335 | 335 | | | | | | parent: 20:d30ed6450e32 |
|
336 | 336 | | | | | | user: test |
|
337 | 337 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
338 | 338 | | | | | | summary: (21) expand |
|
339 | 339 | | | | | | |
|
340 | 340 | | o---+-+ changeset: 20:d30ed6450e32 |
|
341 | 341 | | | | | parent: 0:e6eb3150255d |
|
342 | 342 | | / / / parent: 18:1aa84d96232a |
|
343 | 343 | | | | | user: test |
|
344 | 344 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
345 | 345 | | | | | summary: (20) merge two known; two far right |
|
346 | 346 | | | | | |
|
347 | 347 | o | | | changeset: 19:31ddc2c1573b |
|
348 | 348 | |\ \ \ \ parent: 15:1dda3f72782d |
|
349 | 349 | | | | | | parent: 17:44765d7c06e0 |
|
350 | 350 | | | | | | user: test |
|
351 | 351 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
352 | 352 | | | | | | summary: (19) expand |
|
353 | 353 | | | | | | |
|
354 | 354 | +---+---o changeset: 18:1aa84d96232a |
|
355 | 355 | | | | | parent: 1:6db2ef61d156 |
|
356 | 356 | | | | | parent: 15:1dda3f72782d |
|
357 | 357 | | | | | user: test |
|
358 | 358 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
359 | 359 | | | | | summary: (18) merge two known; two far left |
|
360 | 360 | | | | | |
|
361 | 361 | | o | | changeset: 17:44765d7c06e0 |
|
362 | 362 | | |\ \ \ parent: 12:86b91144a6e9 |
|
363 | 363 | | | | | | parent: 16:3677d192927d |
|
364 | 364 | | | | | | user: test |
|
365 | 365 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
366 | 366 | | | | | | summary: (17) expand |
|
367 | 367 | | | | | | |
|
368 | 368 | | | o---+ changeset: 16:3677d192927d |
|
369 | 369 | | | | | | parent: 0:e6eb3150255d |
|
370 | 370 | | | |/ / parent: 1:6db2ef61d156 |
|
371 | 371 | | | | | user: test |
|
372 | 372 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
373 | 373 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
374 | 374 | | | | | |
|
375 | 375 | o | | | changeset: 15:1dda3f72782d |
|
376 | 376 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
377 | 377 | | | | | | parent: 14:8eac370358ef |
|
378 | 378 | | | | | | user: test |
|
379 | 379 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
380 | 380 | | | | | | summary: (15) expand |
|
381 | 381 | | | | | | |
|
382 | 382 | | o-----+ changeset: 14:8eac370358ef |
|
383 | 383 | | | | | | parent: 0:e6eb3150255d |
|
384 | 384 | | |/ / / parent: 12:86b91144a6e9 |
|
385 | 385 | | | | | user: test |
|
386 | 386 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
387 | 387 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
388 | 388 | | | | | |
|
389 | 389 | o | | | changeset: 13:22d8966a97e3 |
|
390 | 390 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
391 | 391 | | | | | | parent: 11:832d76e6bdf2 |
|
392 | 392 | | | | | | user: test |
|
393 | 393 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
394 | 394 | | | | | | summary: (13) expand |
|
395 | 395 | | | | | | |
|
396 | 396 | +---o | | changeset: 12:86b91144a6e9 |
|
397 | 397 | | | |/ / parent: 1:6db2ef61d156 |
|
398 | 398 | | | | | parent: 9:7010c0af0a35 |
|
399 | 399 | | | | | user: test |
|
400 | 400 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
401 | 401 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
402 | 402 | | | | | |
|
403 | 403 | | o | | changeset: 11:832d76e6bdf2 |
|
404 | 404 | | |\ \ \ parent: 6:b105a072e251 |
|
405 | 405 | | | | | | parent: 10:74c64d036d72 |
|
406 | 406 | | | | | | user: test |
|
407 | 407 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
408 | 408 | | | | | | summary: (11) expand |
|
409 | 409 | | | | | | |
|
410 | 410 | | | o---+ changeset: 10:74c64d036d72 |
|
411 | 411 | | | | | | parent: 0:e6eb3150255d |
|
412 | 412 | | |/ / / parent: 6:b105a072e251 |
|
413 | 413 | | | | | user: test |
|
414 | 414 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
415 | 415 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
416 | 416 | | | | | |
|
417 | 417 | o | | | changeset: 9:7010c0af0a35 |
|
418 | 418 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
419 | 419 | | | | | | parent: 8:7a0b11f71937 |
|
420 | 420 | | | | | | user: test |
|
421 | 421 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
422 | 422 | | | | | | summary: (9) expand |
|
423 | 423 | | | | | | |
|
424 | 424 | | o-----+ changeset: 8:7a0b11f71937 |
|
425 | 425 | | | | | | parent: 0:e6eb3150255d |
|
426 | 426 | |/ / / / parent: 7:b632bb1b1224 |
|
427 | 427 | | | | | user: test |
|
428 | 428 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
429 | 429 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
430 | 430 | | | | | |
|
431 | 431 | o | | | changeset: 7:b632bb1b1224 |
|
432 | 432 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
433 | 433 | | | | | | parent: 5:4409d547b708 |
|
434 | 434 | | | | | | user: test |
|
435 | 435 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
436 | 436 | | | | | | summary: (7) expand |
|
437 | 437 | | | | | | |
|
438 | 438 | +---o | | changeset: 6:b105a072e251 |
|
439 | 439 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
440 | 440 | | | | | parent: 5:4409d547b708 |
|
441 | 441 | | | | | user: test |
|
442 | 442 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
443 | 443 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
444 | 444 | | | | | |
|
445 | 445 | | o | | changeset: 5:4409d547b708 |
|
446 | 446 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
447 | 447 | | | | | | parent: 4:26a8bac39d9f |
|
448 | 448 | | | | | | user: test |
|
449 | 449 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
450 | 450 | | | | | | summary: (5) expand |
|
451 | 451 | | | | | | |
|
452 | 452 | | | o | | changeset: 4:26a8bac39d9f |
|
453 | 453 | | |/|/ / parent: 1:6db2ef61d156 |
|
454 | 454 | | | | | parent: 3:27eef8ed80b4 |
|
455 | 455 | | | | | user: test |
|
456 | 456 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
457 | 457 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
458 | 458 | | | | | |
|
459 | 459 | | o | | changeset: 3:27eef8ed80b4 |
|
460 | 460 | |/ / / user: test |
|
461 | 461 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
462 | 462 | | | | summary: (3) collapse |
|
463 | 463 | | | | |
|
464 | 464 | o | | changeset: 2:3d9a33b8d1e1 |
|
465 | 465 | |/ / user: test |
|
466 | 466 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
467 | 467 | | | summary: (2) collapse |
|
468 | 468 | | | |
|
469 | 469 | o | changeset: 1:6db2ef61d156 |
|
470 | 470 | |/ user: test |
|
471 | 471 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
472 | 472 | | summary: (1) collapse |
|
473 | 473 | | |
|
474 | 474 | o changeset: 0:e6eb3150255d |
|
475 | 475 | user: test |
|
476 | 476 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
477 | 477 | summary: (0) root |
|
478 | 478 | |
|
479 | 479 | |
|
480 | 480 | File glog: |
|
481 | 481 | $ hg log -G a |
|
482 | 482 | @ changeset: 34:fea3ac5810e0 |
|
483 | 483 | | tag: tip |
|
484 | 484 | | parent: 32:d06dffa21a31 |
|
485 | 485 | | user: test |
|
486 | 486 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
487 | 487 | | summary: (34) head |
|
488 | 488 | | |
|
489 | 489 | | o changeset: 33:68608f5145f9 |
|
490 | 490 | | | parent: 18:1aa84d96232a |
|
491 | 491 | | | user: test |
|
492 | 492 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
493 | 493 | | | summary: (33) head |
|
494 | 494 | | | |
|
495 | 495 | o | changeset: 32:d06dffa21a31 |
|
496 | 496 | |\ \ parent: 27:886ed638191b |
|
497 | 497 | | | | parent: 31:621d83e11f67 |
|
498 | 498 | | | | user: test |
|
499 | 499 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
500 | 500 | | | | summary: (32) expand |
|
501 | 501 | | | | |
|
502 | 502 | | o | changeset: 31:621d83e11f67 |
|
503 | 503 | | |\ \ parent: 21:d42a756af44d |
|
504 | 504 | | | | | parent: 30:6e11cd4b648f |
|
505 | 505 | | | | | user: test |
|
506 | 506 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
507 | 507 | | | | | summary: (31) expand |
|
508 | 508 | | | | | |
|
509 | 509 | | | o | changeset: 30:6e11cd4b648f |
|
510 | 510 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
511 | 511 | | | | | | parent: 29:cd9bb2be7593 |
|
512 | 512 | | | | | | user: test |
|
513 | 513 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
514 | 514 | | | | | | summary: (30) expand |
|
515 | 515 | | | | | | |
|
516 | 516 | | | | o | changeset: 29:cd9bb2be7593 |
|
517 | 517 | | | | | | parent: 0:e6eb3150255d |
|
518 | 518 | | | | | | user: test |
|
519 | 519 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
520 | 520 | | | | | | summary: (29) regular commit |
|
521 | 521 | | | | | | |
|
522 | 522 | | | o | | changeset: 28:44ecd0b9ae99 |
|
523 | 523 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
524 | 524 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
525 | 525 | | | | | | | user: test |
|
526 | 526 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
527 | 527 | | | | | | | summary: (28) merge zero known |
|
528 | 528 | | | | | | | |
|
529 | 529 | o | | | | | changeset: 27:886ed638191b |
|
530 | 530 | |/ / / / / parent: 21:d42a756af44d |
|
531 | 531 | | | | | | user: test |
|
532 | 532 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
533 | 533 | | | | | | summary: (27) collapse |
|
534 | 534 | | | | | | |
|
535 | 535 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
536 | 536 | | | | | | parent: 18:1aa84d96232a |
|
537 | 537 | | | | | | parent: 25:91da8ed57247 |
|
538 | 538 | | | | | | user: test |
|
539 | 539 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
540 | 540 | | | | | | summary: (26) merge one known; far right |
|
541 | 541 | | | | | | |
|
542 | 542 | +---o | | changeset: 25:91da8ed57247 |
|
543 | 543 | | | | | | parent: 21:d42a756af44d |
|
544 | 544 | | | | | | parent: 24:a9c19a3d96b7 |
|
545 | 545 | | | | | | user: test |
|
546 | 546 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
547 | 547 | | | | | | summary: (25) merge one known; far left |
|
548 | 548 | | | | | | |
|
549 | 549 | | | o | | changeset: 24:a9c19a3d96b7 |
|
550 | 550 | | | |\| | parent: 0:e6eb3150255d |
|
551 | 551 | | | | | | parent: 23:a01cddf0766d |
|
552 | 552 | | | | | | user: test |
|
553 | 553 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
554 | 554 | | | | | | summary: (24) merge one known; immediate right |
|
555 | 555 | | | | | | |
|
556 | 556 | | | o | | changeset: 23:a01cddf0766d |
|
557 | 557 | | |/| | | parent: 1:6db2ef61d156 |
|
558 | 558 | | | | | | parent: 22:e0d9cccacb5d |
|
559 | 559 | | | | | | user: test |
|
560 | 560 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
561 | 561 | | | | | | summary: (23) merge one known; immediate left |
|
562 | 562 | | | | | | |
|
563 | 563 | +---o---+ changeset: 22:e0d9cccacb5d |
|
564 | 564 | | | | | parent: 18:1aa84d96232a |
|
565 | 565 | | | / / parent: 21:d42a756af44d |
|
566 | 566 | | | | | user: test |
|
567 | 567 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
568 | 568 | | | | | summary: (22) merge two known; one far left, one far right |
|
569 | 569 | | | | | |
|
570 | 570 | o | | | changeset: 21:d42a756af44d |
|
571 | 571 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
572 | 572 | | | | | | parent: 20:d30ed6450e32 |
|
573 | 573 | | | | | | user: test |
|
574 | 574 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
575 | 575 | | | | | | summary: (21) expand |
|
576 | 576 | | | | | | |
|
577 | 577 | | o---+-+ changeset: 20:d30ed6450e32 |
|
578 | 578 | | | | | parent: 0:e6eb3150255d |
|
579 | 579 | | / / / parent: 18:1aa84d96232a |
|
580 | 580 | | | | | user: test |
|
581 | 581 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
582 | 582 | | | | | summary: (20) merge two known; two far right |
|
583 | 583 | | | | | |
|
584 | 584 | o | | | changeset: 19:31ddc2c1573b |
|
585 | 585 | |\ \ \ \ parent: 15:1dda3f72782d |
|
586 | 586 | | | | | | parent: 17:44765d7c06e0 |
|
587 | 587 | | | | | | user: test |
|
588 | 588 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
589 | 589 | | | | | | summary: (19) expand |
|
590 | 590 | | | | | | |
|
591 | 591 | +---+---o changeset: 18:1aa84d96232a |
|
592 | 592 | | | | | parent: 1:6db2ef61d156 |
|
593 | 593 | | | | | parent: 15:1dda3f72782d |
|
594 | 594 | | | | | user: test |
|
595 | 595 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
596 | 596 | | | | | summary: (18) merge two known; two far left |
|
597 | 597 | | | | | |
|
598 | 598 | | o | | changeset: 17:44765d7c06e0 |
|
599 | 599 | | |\ \ \ parent: 12:86b91144a6e9 |
|
600 | 600 | | | | | | parent: 16:3677d192927d |
|
601 | 601 | | | | | | user: test |
|
602 | 602 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
603 | 603 | | | | | | summary: (17) expand |
|
604 | 604 | | | | | | |
|
605 | 605 | | | o---+ changeset: 16:3677d192927d |
|
606 | 606 | | | | | | parent: 0:e6eb3150255d |
|
607 | 607 | | | |/ / parent: 1:6db2ef61d156 |
|
608 | 608 | | | | | user: test |
|
609 | 609 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
610 | 610 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
611 | 611 | | | | | |
|
612 | 612 | o | | | changeset: 15:1dda3f72782d |
|
613 | 613 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
614 | 614 | | | | | | parent: 14:8eac370358ef |
|
615 | 615 | | | | | | user: test |
|
616 | 616 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
617 | 617 | | | | | | summary: (15) expand |
|
618 | 618 | | | | | | |
|
619 | 619 | | o-----+ changeset: 14:8eac370358ef |
|
620 | 620 | | | | | | parent: 0:e6eb3150255d |
|
621 | 621 | | |/ / / parent: 12:86b91144a6e9 |
|
622 | 622 | | | | | user: test |
|
623 | 623 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
624 | 624 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
625 | 625 | | | | | |
|
626 | 626 | o | | | changeset: 13:22d8966a97e3 |
|
627 | 627 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
628 | 628 | | | | | | parent: 11:832d76e6bdf2 |
|
629 | 629 | | | | | | user: test |
|
630 | 630 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
631 | 631 | | | | | | summary: (13) expand |
|
632 | 632 | | | | | | |
|
633 | 633 | +---o | | changeset: 12:86b91144a6e9 |
|
634 | 634 | | | |/ / parent: 1:6db2ef61d156 |
|
635 | 635 | | | | | parent: 9:7010c0af0a35 |
|
636 | 636 | | | | | user: test |
|
637 | 637 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
638 | 638 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
639 | 639 | | | | | |
|
640 | 640 | | o | | changeset: 11:832d76e6bdf2 |
|
641 | 641 | | |\ \ \ parent: 6:b105a072e251 |
|
642 | 642 | | | | | | parent: 10:74c64d036d72 |
|
643 | 643 | | | | | | user: test |
|
644 | 644 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
645 | 645 | | | | | | summary: (11) expand |
|
646 | 646 | | | | | | |
|
647 | 647 | | | o---+ changeset: 10:74c64d036d72 |
|
648 | 648 | | | | | | parent: 0:e6eb3150255d |
|
649 | 649 | | |/ / / parent: 6:b105a072e251 |
|
650 | 650 | | | | | user: test |
|
651 | 651 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
652 | 652 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
653 | 653 | | | | | |
|
654 | 654 | o | | | changeset: 9:7010c0af0a35 |
|
655 | 655 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
656 | 656 | | | | | | parent: 8:7a0b11f71937 |
|
657 | 657 | | | | | | user: test |
|
658 | 658 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
659 | 659 | | | | | | summary: (9) expand |
|
660 | 660 | | | | | | |
|
661 | 661 | | o-----+ changeset: 8:7a0b11f71937 |
|
662 | 662 | | | | | | parent: 0:e6eb3150255d |
|
663 | 663 | |/ / / / parent: 7:b632bb1b1224 |
|
664 | 664 | | | | | user: test |
|
665 | 665 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
666 | 666 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
667 | 667 | | | | | |
|
668 | 668 | o | | | changeset: 7:b632bb1b1224 |
|
669 | 669 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
670 | 670 | | | | | | parent: 5:4409d547b708 |
|
671 | 671 | | | | | | user: test |
|
672 | 672 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
673 | 673 | | | | | | summary: (7) expand |
|
674 | 674 | | | | | | |
|
675 | 675 | +---o | | changeset: 6:b105a072e251 |
|
676 | 676 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
677 | 677 | | | | | parent: 5:4409d547b708 |
|
678 | 678 | | | | | user: test |
|
679 | 679 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
680 | 680 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
681 | 681 | | | | | |
|
682 | 682 | | o | | changeset: 5:4409d547b708 |
|
683 | 683 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
684 | 684 | | | | | | parent: 4:26a8bac39d9f |
|
685 | 685 | | | | | | user: test |
|
686 | 686 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
687 | 687 | | | | | | summary: (5) expand |
|
688 | 688 | | | | | | |
|
689 | 689 | | | o | | changeset: 4:26a8bac39d9f |
|
690 | 690 | | |/|/ / parent: 1:6db2ef61d156 |
|
691 | 691 | | | | | parent: 3:27eef8ed80b4 |
|
692 | 692 | | | | | user: test |
|
693 | 693 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
694 | 694 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
695 | 695 | | | | | |
|
696 | 696 | | o | | changeset: 3:27eef8ed80b4 |
|
697 | 697 | |/ / / user: test |
|
698 | 698 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
699 | 699 | | | | summary: (3) collapse |
|
700 | 700 | | | | |
|
701 | 701 | o | | changeset: 2:3d9a33b8d1e1 |
|
702 | 702 | |/ / user: test |
|
703 | 703 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
704 | 704 | | | summary: (2) collapse |
|
705 | 705 | | | |
|
706 | 706 | o | changeset: 1:6db2ef61d156 |
|
707 | 707 | |/ user: test |
|
708 | 708 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
709 | 709 | | summary: (1) collapse |
|
710 | 710 | | |
|
711 | 711 | o changeset: 0:e6eb3150255d |
|
712 | 712 | user: test |
|
713 | 713 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
714 | 714 | summary: (0) root |
|
715 | 715 | |
|
716 | 716 | |
|
717 | 717 | File glog per revset: |
|
718 | 718 | |
|
719 | 719 | $ hg log -G -r 'file("a")' |
|
720 | 720 | @ changeset: 34:fea3ac5810e0 |
|
721 | 721 | | tag: tip |
|
722 | 722 | | parent: 32:d06dffa21a31 |
|
723 | 723 | | user: test |
|
724 | 724 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
725 | 725 | | summary: (34) head |
|
726 | 726 | | |
|
727 | 727 | | o changeset: 33:68608f5145f9 |
|
728 | 728 | | | parent: 18:1aa84d96232a |
|
729 | 729 | | | user: test |
|
730 | 730 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
731 | 731 | | | summary: (33) head |
|
732 | 732 | | | |
|
733 | 733 | o | changeset: 32:d06dffa21a31 |
|
734 | 734 | |\ \ parent: 27:886ed638191b |
|
735 | 735 | | | | parent: 31:621d83e11f67 |
|
736 | 736 | | | | user: test |
|
737 | 737 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
738 | 738 | | | | summary: (32) expand |
|
739 | 739 | | | | |
|
740 | 740 | | o | changeset: 31:621d83e11f67 |
|
741 | 741 | | |\ \ parent: 21:d42a756af44d |
|
742 | 742 | | | | | parent: 30:6e11cd4b648f |
|
743 | 743 | | | | | user: test |
|
744 | 744 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
745 | 745 | | | | | summary: (31) expand |
|
746 | 746 | | | | | |
|
747 | 747 | | | o | changeset: 30:6e11cd4b648f |
|
748 | 748 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
749 | 749 | | | | | | parent: 29:cd9bb2be7593 |
|
750 | 750 | | | | | | user: test |
|
751 | 751 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
752 | 752 | | | | | | summary: (30) expand |
|
753 | 753 | | | | | | |
|
754 | 754 | | | | o | changeset: 29:cd9bb2be7593 |
|
755 | 755 | | | | | | parent: 0:e6eb3150255d |
|
756 | 756 | | | | | | user: test |
|
757 | 757 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
758 | 758 | | | | | | summary: (29) regular commit |
|
759 | 759 | | | | | | |
|
760 | 760 | | | o | | changeset: 28:44ecd0b9ae99 |
|
761 | 761 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
762 | 762 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
763 | 763 | | | | | | | user: test |
|
764 | 764 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
765 | 765 | | | | | | | summary: (28) merge zero known |
|
766 | 766 | | | | | | | |
|
767 | 767 | o | | | | | changeset: 27:886ed638191b |
|
768 | 768 | |/ / / / / parent: 21:d42a756af44d |
|
769 | 769 | | | | | | user: test |
|
770 | 770 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
771 | 771 | | | | | | summary: (27) collapse |
|
772 | 772 | | | | | | |
|
773 | 773 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
774 | 774 | | | | | | parent: 18:1aa84d96232a |
|
775 | 775 | | | | | | parent: 25:91da8ed57247 |
|
776 | 776 | | | | | | user: test |
|
777 | 777 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
778 | 778 | | | | | | summary: (26) merge one known; far right |
|
779 | 779 | | | | | | |
|
780 | 780 | +---o | | changeset: 25:91da8ed57247 |
|
781 | 781 | | | | | | parent: 21:d42a756af44d |
|
782 | 782 | | | | | | parent: 24:a9c19a3d96b7 |
|
783 | 783 | | | | | | user: test |
|
784 | 784 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
785 | 785 | | | | | | summary: (25) merge one known; far left |
|
786 | 786 | | | | | | |
|
787 | 787 | | | o | | changeset: 24:a9c19a3d96b7 |
|
788 | 788 | | | |\| | parent: 0:e6eb3150255d |
|
789 | 789 | | | | | | parent: 23:a01cddf0766d |
|
790 | 790 | | | | | | user: test |
|
791 | 791 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
792 | 792 | | | | | | summary: (24) merge one known; immediate right |
|
793 | 793 | | | | | | |
|
794 | 794 | | | o | | changeset: 23:a01cddf0766d |
|
795 | 795 | | |/| | | parent: 1:6db2ef61d156 |
|
796 | 796 | | | | | | parent: 22:e0d9cccacb5d |
|
797 | 797 | | | | | | user: test |
|
798 | 798 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
799 | 799 | | | | | | summary: (23) merge one known; immediate left |
|
800 | 800 | | | | | | |
|
801 | 801 | +---o---+ changeset: 22:e0d9cccacb5d |
|
802 | 802 | | | | | parent: 18:1aa84d96232a |
|
803 | 803 | | | / / parent: 21:d42a756af44d |
|
804 | 804 | | | | | user: test |
|
805 | 805 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
806 | 806 | | | | | summary: (22) merge two known; one far left, one far right |
|
807 | 807 | | | | | |
|
808 | 808 | o | | | changeset: 21:d42a756af44d |
|
809 | 809 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
810 | 810 | | | | | | parent: 20:d30ed6450e32 |
|
811 | 811 | | | | | | user: test |
|
812 | 812 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
813 | 813 | | | | | | summary: (21) expand |
|
814 | 814 | | | | | | |
|
815 | 815 | | o---+-+ changeset: 20:d30ed6450e32 |
|
816 | 816 | | | | | parent: 0:e6eb3150255d |
|
817 | 817 | | / / / parent: 18:1aa84d96232a |
|
818 | 818 | | | | | user: test |
|
819 | 819 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
820 | 820 | | | | | summary: (20) merge two known; two far right |
|
821 | 821 | | | | | |
|
822 | 822 | o | | | changeset: 19:31ddc2c1573b |
|
823 | 823 | |\ \ \ \ parent: 15:1dda3f72782d |
|
824 | 824 | | | | | | parent: 17:44765d7c06e0 |
|
825 | 825 | | | | | | user: test |
|
826 | 826 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
827 | 827 | | | | | | summary: (19) expand |
|
828 | 828 | | | | | | |
|
829 | 829 | +---+---o changeset: 18:1aa84d96232a |
|
830 | 830 | | | | | parent: 1:6db2ef61d156 |
|
831 | 831 | | | | | parent: 15:1dda3f72782d |
|
832 | 832 | | | | | user: test |
|
833 | 833 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
834 | 834 | | | | | summary: (18) merge two known; two far left |
|
835 | 835 | | | | | |
|
836 | 836 | | o | | changeset: 17:44765d7c06e0 |
|
837 | 837 | | |\ \ \ parent: 12:86b91144a6e9 |
|
838 | 838 | | | | | | parent: 16:3677d192927d |
|
839 | 839 | | | | | | user: test |
|
840 | 840 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
841 | 841 | | | | | | summary: (17) expand |
|
842 | 842 | | | | | | |
|
843 | 843 | | | o---+ changeset: 16:3677d192927d |
|
844 | 844 | | | | | | parent: 0:e6eb3150255d |
|
845 | 845 | | | |/ / parent: 1:6db2ef61d156 |
|
846 | 846 | | | | | user: test |
|
847 | 847 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
848 | 848 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
849 | 849 | | | | | |
|
850 | 850 | o | | | changeset: 15:1dda3f72782d |
|
851 | 851 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
852 | 852 | | | | | | parent: 14:8eac370358ef |
|
853 | 853 | | | | | | user: test |
|
854 | 854 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
855 | 855 | | | | | | summary: (15) expand |
|
856 | 856 | | | | | | |
|
857 | 857 | | o-----+ changeset: 14:8eac370358ef |
|
858 | 858 | | | | | | parent: 0:e6eb3150255d |
|
859 | 859 | | |/ / / parent: 12:86b91144a6e9 |
|
860 | 860 | | | | | user: test |
|
861 | 861 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
862 | 862 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
863 | 863 | | | | | |
|
864 | 864 | o | | | changeset: 13:22d8966a97e3 |
|
865 | 865 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
866 | 866 | | | | | | parent: 11:832d76e6bdf2 |
|
867 | 867 | | | | | | user: test |
|
868 | 868 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
869 | 869 | | | | | | summary: (13) expand |
|
870 | 870 | | | | | | |
|
871 | 871 | +---o | | changeset: 12:86b91144a6e9 |
|
872 | 872 | | | |/ / parent: 1:6db2ef61d156 |
|
873 | 873 | | | | | parent: 9:7010c0af0a35 |
|
874 | 874 | | | | | user: test |
|
875 | 875 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
876 | 876 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
877 | 877 | | | | | |
|
878 | 878 | | o | | changeset: 11:832d76e6bdf2 |
|
879 | 879 | | |\ \ \ parent: 6:b105a072e251 |
|
880 | 880 | | | | | | parent: 10:74c64d036d72 |
|
881 | 881 | | | | | | user: test |
|
882 | 882 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
883 | 883 | | | | | | summary: (11) expand |
|
884 | 884 | | | | | | |
|
885 | 885 | | | o---+ changeset: 10:74c64d036d72 |
|
886 | 886 | | | | | | parent: 0:e6eb3150255d |
|
887 | 887 | | |/ / / parent: 6:b105a072e251 |
|
888 | 888 | | | | | user: test |
|
889 | 889 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
890 | 890 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
891 | 891 | | | | | |
|
892 | 892 | o | | | changeset: 9:7010c0af0a35 |
|
893 | 893 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
894 | 894 | | | | | | parent: 8:7a0b11f71937 |
|
895 | 895 | | | | | | user: test |
|
896 | 896 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
897 | 897 | | | | | | summary: (9) expand |
|
898 | 898 | | | | | | |
|
899 | 899 | | o-----+ changeset: 8:7a0b11f71937 |
|
900 | 900 | | | | | | parent: 0:e6eb3150255d |
|
901 | 901 | |/ / / / parent: 7:b632bb1b1224 |
|
902 | 902 | | | | | user: test |
|
903 | 903 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
904 | 904 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
905 | 905 | | | | | |
|
906 | 906 | o | | | changeset: 7:b632bb1b1224 |
|
907 | 907 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
908 | 908 | | | | | | parent: 5:4409d547b708 |
|
909 | 909 | | | | | | user: test |
|
910 | 910 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
911 | 911 | | | | | | summary: (7) expand |
|
912 | 912 | | | | | | |
|
913 | 913 | +---o | | changeset: 6:b105a072e251 |
|
914 | 914 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
915 | 915 | | | | | parent: 5:4409d547b708 |
|
916 | 916 | | | | | user: test |
|
917 | 917 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
918 | 918 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
919 | 919 | | | | | |
|
920 | 920 | | o | | changeset: 5:4409d547b708 |
|
921 | 921 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
922 | 922 | | | | | | parent: 4:26a8bac39d9f |
|
923 | 923 | | | | | | user: test |
|
924 | 924 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
925 | 925 | | | | | | summary: (5) expand |
|
926 | 926 | | | | | | |
|
927 | 927 | | | o | | changeset: 4:26a8bac39d9f |
|
928 | 928 | | |/|/ / parent: 1:6db2ef61d156 |
|
929 | 929 | | | | | parent: 3:27eef8ed80b4 |
|
930 | 930 | | | | | user: test |
|
931 | 931 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
932 | 932 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
933 | 933 | | | | | |
|
934 | 934 | | o | | changeset: 3:27eef8ed80b4 |
|
935 | 935 | |/ / / user: test |
|
936 | 936 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
937 | 937 | | | | summary: (3) collapse |
|
938 | 938 | | | | |
|
939 | 939 | o | | changeset: 2:3d9a33b8d1e1 |
|
940 | 940 | |/ / user: test |
|
941 | 941 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
942 | 942 | | | summary: (2) collapse |
|
943 | 943 | | | |
|
944 | 944 | o | changeset: 1:6db2ef61d156 |
|
945 | 945 | |/ user: test |
|
946 | 946 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
947 | 947 | | summary: (1) collapse |
|
948 | 948 | | |
|
949 | 949 | o changeset: 0:e6eb3150255d |
|
950 | 950 | user: test |
|
951 | 951 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
952 | 952 | summary: (0) root |
|
953 | 953 | |
|
954 | 954 | |
|
955 | 955 | |
|
956 | 956 | File glog per revset (only merges): |
|
957 | 957 | |
|
958 | 958 | $ hg log -G -r 'file("a")' -m |
|
959 | 959 | o changeset: 32:d06dffa21a31 |
|
960 | 960 | |\ parent: 27:886ed638191b |
|
961 | 961 | | : parent: 31:621d83e11f67 |
|
962 | 962 | | : user: test |
|
963 | 963 | | : date: Thu Jan 01 00:00:32 1970 +0000 |
|
964 | 964 | | : summary: (32) expand |
|
965 | 965 | | : |
|
966 | 966 | o : changeset: 31:621d83e11f67 |
|
967 | 967 | |\: parent: 21:d42a756af44d |
|
968 | 968 | | : parent: 30:6e11cd4b648f |
|
969 | 969 | | : user: test |
|
970 | 970 | | : date: Thu Jan 01 00:00:31 1970 +0000 |
|
971 | 971 | | : summary: (31) expand |
|
972 | 972 | | : |
|
973 | 973 | o : changeset: 30:6e11cd4b648f |
|
974 | 974 | |\ \ parent: 28:44ecd0b9ae99 |
|
975 | 975 | | ~ : parent: 29:cd9bb2be7593 |
|
976 | 976 | | : user: test |
|
977 | 977 | | : date: Thu Jan 01 00:00:30 1970 +0000 |
|
978 | 978 | | : summary: (30) expand |
|
979 | 979 | | / |
|
980 | 980 | o : changeset: 28:44ecd0b9ae99 |
|
981 | 981 | |\ \ parent: 1:6db2ef61d156 |
|
982 | 982 | | ~ : parent: 26:7f25b6c2f0b9 |
|
983 | 983 | | : user: test |
|
984 | 984 | | : date: Thu Jan 01 00:00:28 1970 +0000 |
|
985 | 985 | | : summary: (28) merge zero known |
|
986 | 986 | | / |
|
987 | 987 | o : changeset: 26:7f25b6c2f0b9 |
|
988 | 988 | |\ \ parent: 18:1aa84d96232a |
|
989 | 989 | | | : parent: 25:91da8ed57247 |
|
990 | 990 | | | : user: test |
|
991 | 991 | | | : date: Thu Jan 01 00:00:26 1970 +0000 |
|
992 | 992 | | | : summary: (26) merge one known; far right |
|
993 | 993 | | | : |
|
994 | 994 | | o : changeset: 25:91da8ed57247 |
|
995 | 995 | | |\: parent: 21:d42a756af44d |
|
996 | 996 | | | : parent: 24:a9c19a3d96b7 |
|
997 | 997 | | | : user: test |
|
998 | 998 | | | : date: Thu Jan 01 00:00:25 1970 +0000 |
|
999 | 999 | | | : summary: (25) merge one known; far left |
|
1000 | 1000 | | | : |
|
1001 | 1001 | | o : changeset: 24:a9c19a3d96b7 |
|
1002 | 1002 | | |\ \ parent: 0:e6eb3150255d |
|
1003 | 1003 | | | ~ : parent: 23:a01cddf0766d |
|
1004 | 1004 | | | : user: test |
|
1005 | 1005 | | | : date: Thu Jan 01 00:00:24 1970 +0000 |
|
1006 | 1006 | | | : summary: (24) merge one known; immediate right |
|
1007 | 1007 | | | / |
|
1008 | 1008 | | o : changeset: 23:a01cddf0766d |
|
1009 | 1009 | | |\ \ parent: 1:6db2ef61d156 |
|
1010 | 1010 | | | ~ : parent: 22:e0d9cccacb5d |
|
1011 | 1011 | | | : user: test |
|
1012 | 1012 | | | : date: Thu Jan 01 00:00:23 1970 +0000 |
|
1013 | 1013 | | | : summary: (23) merge one known; immediate left |
|
1014 | 1014 | | | / |
|
1015 | 1015 | | o : changeset: 22:e0d9cccacb5d |
|
1016 | 1016 | |/:/ parent: 18:1aa84d96232a |
|
1017 | 1017 | | : parent: 21:d42a756af44d |
|
1018 | 1018 | | : user: test |
|
1019 | 1019 | | : date: Thu Jan 01 00:00:22 1970 +0000 |
|
1020 | 1020 | | : summary: (22) merge two known; one far left, one far right |
|
1021 | 1021 | | : |
|
1022 | 1022 | | o changeset: 21:d42a756af44d |
|
1023 | 1023 | | |\ parent: 19:31ddc2c1573b |
|
1024 | 1024 | | | | parent: 20:d30ed6450e32 |
|
1025 | 1025 | | | | user: test |
|
1026 | 1026 | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
1027 | 1027 | | | | summary: (21) expand |
|
1028 | 1028 | | | | |
|
1029 | 1029 | +---o changeset: 20:d30ed6450e32 |
|
1030 | 1030 | | | | parent: 0:e6eb3150255d |
|
1031 | 1031 | | | ~ parent: 18:1aa84d96232a |
|
1032 | 1032 | | | user: test |
|
1033 | 1033 | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
1034 | 1034 | | | summary: (20) merge two known; two far right |
|
1035 | 1035 | | | |
|
1036 | 1036 | | o changeset: 19:31ddc2c1573b |
|
1037 | 1037 | | |\ parent: 15:1dda3f72782d |
|
1038 | 1038 | | | | parent: 17:44765d7c06e0 |
|
1039 | 1039 | | | | user: test |
|
1040 | 1040 | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
1041 | 1041 | | | | summary: (19) expand |
|
1042 | 1042 | | | | |
|
1043 | 1043 | o | | changeset: 18:1aa84d96232a |
|
1044 | 1044 | |\| | parent: 1:6db2ef61d156 |
|
1045 | 1045 | ~ | | parent: 15:1dda3f72782d |
|
1046 | 1046 | | | user: test |
|
1047 | 1047 | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
1048 | 1048 | | | summary: (18) merge two known; two far left |
|
1049 | 1049 | / / |
|
1050 | 1050 | | o changeset: 17:44765d7c06e0 |
|
1051 | 1051 | | |\ parent: 12:86b91144a6e9 |
|
1052 | 1052 | | | | parent: 16:3677d192927d |
|
1053 | 1053 | | | | user: test |
|
1054 | 1054 | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
1055 | 1055 | | | | summary: (17) expand |
|
1056 | 1056 | | | | |
|
1057 | 1057 | | | o changeset: 16:3677d192927d |
|
1058 | 1058 | | | |\ parent: 0:e6eb3150255d |
|
1059 | 1059 | | | ~ ~ parent: 1:6db2ef61d156 |
|
1060 | 1060 | | | user: test |
|
1061 | 1061 | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
1062 | 1062 | | | summary: (16) merge two known; one immediate right, one near right |
|
1063 | 1063 | | | |
|
1064 | 1064 | o | changeset: 15:1dda3f72782d |
|
1065 | 1065 | |\ \ parent: 13:22d8966a97e3 |
|
1066 | 1066 | | | | parent: 14:8eac370358ef |
|
1067 | 1067 | | | | user: test |
|
1068 | 1068 | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
1069 | 1069 | | | | summary: (15) expand |
|
1070 | 1070 | | | | |
|
1071 | 1071 | | o | changeset: 14:8eac370358ef |
|
1072 | 1072 | | |\| parent: 0:e6eb3150255d |
|
1073 | 1073 | | ~ | parent: 12:86b91144a6e9 |
|
1074 | 1074 | | | user: test |
|
1075 | 1075 | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
1076 | 1076 | | | summary: (14) merge two known; one immediate right, one far right |
|
1077 | 1077 | | / |
|
1078 | 1078 | o | changeset: 13:22d8966a97e3 |
|
1079 | 1079 | |\ \ parent: 9:7010c0af0a35 |
|
1080 | 1080 | | | | parent: 11:832d76e6bdf2 |
|
1081 | 1081 | | | | user: test |
|
1082 | 1082 | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
1083 | 1083 | | | | summary: (13) expand |
|
1084 | 1084 | | | | |
|
1085 | 1085 | +---o changeset: 12:86b91144a6e9 |
|
1086 | 1086 | | | | parent: 1:6db2ef61d156 |
|
1087 | 1087 | | | ~ parent: 9:7010c0af0a35 |
|
1088 | 1088 | | | user: test |
|
1089 | 1089 | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
1090 | 1090 | | | summary: (12) merge two known; one immediate right, one far left |
|
1091 | 1091 | | | |
|
1092 | 1092 | | o changeset: 11:832d76e6bdf2 |
|
1093 | 1093 | | |\ parent: 6:b105a072e251 |
|
1094 | 1094 | | | | parent: 10:74c64d036d72 |
|
1095 | 1095 | | | | user: test |
|
1096 | 1096 | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
1097 | 1097 | | | | summary: (11) expand |
|
1098 | 1098 | | | | |
|
1099 | 1099 | | | o changeset: 10:74c64d036d72 |
|
1100 | 1100 | | |/| parent: 0:e6eb3150255d |
|
1101 | 1101 | | | ~ parent: 6:b105a072e251 |
|
1102 | 1102 | | | user: test |
|
1103 | 1103 | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
1104 | 1104 | | | summary: (10) merge two known; one immediate left, one near right |
|
1105 | 1105 | | | |
|
1106 | 1106 | o | changeset: 9:7010c0af0a35 |
|
1107 | 1107 | |\ \ parent: 7:b632bb1b1224 |
|
1108 | 1108 | | | | parent: 8:7a0b11f71937 |
|
1109 | 1109 | | | | user: test |
|
1110 | 1110 | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1111 | 1111 | | | | summary: (9) expand |
|
1112 | 1112 | | | | |
|
1113 | 1113 | | o | changeset: 8:7a0b11f71937 |
|
1114 | 1114 | |/| | parent: 0:e6eb3150255d |
|
1115 | 1115 | | ~ | parent: 7:b632bb1b1224 |
|
1116 | 1116 | | | user: test |
|
1117 | 1117 | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1118 | 1118 | | | summary: (8) merge two known; one immediate left, one far right |
|
1119 | 1119 | | / |
|
1120 | 1120 | o | changeset: 7:b632bb1b1224 |
|
1121 | 1121 | |\ \ parent: 2:3d9a33b8d1e1 |
|
1122 | 1122 | | ~ | parent: 5:4409d547b708 |
|
1123 | 1123 | | | user: test |
|
1124 | 1124 | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
1125 | 1125 | | | summary: (7) expand |
|
1126 | 1126 | | / |
|
1127 | 1127 | | o changeset: 6:b105a072e251 |
|
1128 | 1128 | |/| parent: 2:3d9a33b8d1e1 |
|
1129 | 1129 | | ~ parent: 5:4409d547b708 |
|
1130 | 1130 | | user: test |
|
1131 | 1131 | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
1132 | 1132 | | summary: (6) merge two known; one immediate left, one far left |
|
1133 | 1133 | | |
|
1134 | 1134 | o changeset: 5:4409d547b708 |
|
1135 | 1135 | |\ parent: 3:27eef8ed80b4 |
|
1136 | 1136 | | ~ parent: 4:26a8bac39d9f |
|
1137 | 1137 | | user: test |
|
1138 | 1138 | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
1139 | 1139 | | summary: (5) expand |
|
1140 | 1140 | | |
|
1141 | 1141 | o changeset: 4:26a8bac39d9f |
|
1142 | 1142 | |\ parent: 1:6db2ef61d156 |
|
1143 | 1143 | ~ ~ parent: 3:27eef8ed80b4 |
|
1144 | 1144 | user: test |
|
1145 | 1145 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
1146 | 1146 | summary: (4) merge two known; one immediate left, one immediate right |
|
1147 | 1147 | |
|
1148 | 1148 | |
|
1149 | 1149 | |
|
1150 | 1150 | Empty revision range - display nothing: |
|
1151 | 1151 | $ hg log -G -r 1..0 |
|
1152 | 1152 | |
|
1153 | 1153 | $ cd .. |
|
1154 | 1154 | |
|
1155 | 1155 | #if no-outer-repo |
|
1156 | 1156 | |
|
1157 | 1157 | From outer space: |
|
1158 | 1158 | $ hg log -G -l1 repo |
|
1159 | 1159 | @ changeset: 34:fea3ac5810e0 |
|
1160 | 1160 | | tag: tip |
|
1161 | 1161 | ~ parent: 32:d06dffa21a31 |
|
1162 | 1162 | user: test |
|
1163 | 1163 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1164 | 1164 | summary: (34) head |
|
1165 | 1165 | |
|
1166 | 1166 | $ hg log -G -l1 repo/a |
|
1167 | 1167 | @ changeset: 34:fea3ac5810e0 |
|
1168 | 1168 | | tag: tip |
|
1169 | 1169 | ~ parent: 32:d06dffa21a31 |
|
1170 | 1170 | user: test |
|
1171 | 1171 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1172 | 1172 | summary: (34) head |
|
1173 | 1173 | |
|
1174 | 1174 | $ hg log -G -l1 repo/missing |
|
1175 | 1175 | |
|
1176 | 1176 | #endif |
|
1177 | 1177 | |
|
1178 | 1178 | File log with revs != cset revs: |
|
1179 | 1179 | $ hg init flog |
|
1180 | 1180 | $ cd flog |
|
1181 | 1181 | $ echo one >one |
|
1182 | 1182 | $ hg add one |
|
1183 | 1183 | $ hg commit -mone |
|
1184 | 1184 | $ echo two >two |
|
1185 | 1185 | $ hg add two |
|
1186 | 1186 | $ hg commit -mtwo |
|
1187 | 1187 | $ echo more >two |
|
1188 | 1188 | $ hg commit -mmore |
|
1189 | 1189 | $ hg log -G two |
|
1190 | 1190 | @ changeset: 2:12c28321755b |
|
1191 | 1191 | | tag: tip |
|
1192 | 1192 | | user: test |
|
1193 | 1193 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1194 | 1194 | | summary: more |
|
1195 | 1195 | | |
|
1196 | 1196 | o changeset: 1:5ac72c0599bf |
|
1197 | 1197 | | user: test |
|
1198 | 1198 | ~ date: Thu Jan 01 00:00:00 1970 +0000 |
|
1199 | 1199 | summary: two |
|
1200 | 1200 | |
|
1201 | 1201 | |
|
1202 | 1202 | Issue1896: File log with explicit style |
|
1203 | 1203 | $ hg log -G --style=default one |
|
1204 | 1204 | o changeset: 0:3d578b4a1f53 |
|
1205 | 1205 | user: test |
|
1206 | 1206 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1207 | 1207 | summary: one |
|
1208 | 1208 | |
|
1209 | 1209 | Issue2395: glog --style header and footer |
|
1210 | 1210 | $ hg log -G --style=xml one |
|
1211 | 1211 | <?xml version="1.0"?> |
|
1212 | 1212 | <log> |
|
1213 | 1213 | o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> |
|
1214 | 1214 | <author email="test">test</author> |
|
1215 | 1215 | <date>1970-01-01T00:00:00+00:00</date> |
|
1216 | 1216 | <msg xml:space="preserve">one</msg> |
|
1217 | 1217 | </logentry> |
|
1218 | 1218 | </log> |
|
1219 | 1219 | |
|
1220 | 1220 | $ cd .. |
|
1221 | 1221 | |
|
1222 | 1222 | Incoming and outgoing: |
|
1223 | 1223 | |
|
1224 | 1224 | $ hg clone -U -r31 repo repo2 |
|
1225 | 1225 | adding changesets |
|
1226 | 1226 | adding manifests |
|
1227 | 1227 | adding file changes |
|
1228 | 1228 | added 31 changesets with 31 changes to 1 files |
|
1229 | 1229 | new changesets e6eb3150255d:621d83e11f67 |
|
1230 | 1230 | $ cd repo2 |
|
1231 | 1231 | |
|
1232 | 1232 | $ hg incoming --graph ../repo |
|
1233 | 1233 | comparing with ../repo |
|
1234 | 1234 | searching for changes |
|
1235 | 1235 | o changeset: 34:fea3ac5810e0 |
|
1236 | 1236 | | tag: tip |
|
1237 | 1237 | | parent: 32:d06dffa21a31 |
|
1238 | 1238 | | user: test |
|
1239 | 1239 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1240 | 1240 | | summary: (34) head |
|
1241 | 1241 | | |
|
1242 | 1242 | | o changeset: 33:68608f5145f9 |
|
1243 | 1243 | | parent: 18:1aa84d96232a |
|
1244 | 1244 | | user: test |
|
1245 | 1245 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1246 | 1246 | | summary: (33) head |
|
1247 | 1247 | | |
|
1248 | 1248 | o changeset: 32:d06dffa21a31 |
|
1249 | 1249 | | parent: 27:886ed638191b |
|
1250 | 1250 | | parent: 31:621d83e11f67 |
|
1251 | 1251 | | user: test |
|
1252 | 1252 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1253 | 1253 | | summary: (32) expand |
|
1254 | 1254 | | |
|
1255 | 1255 | o changeset: 27:886ed638191b |
|
1256 | 1256 | parent: 21:d42a756af44d |
|
1257 | 1257 | user: test |
|
1258 | 1258 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1259 | 1259 | summary: (27) collapse |
|
1260 | 1260 | |
|
1261 | 1261 | $ cd .. |
|
1262 | 1262 | |
|
1263 | 1263 | $ hg -R repo outgoing --graph repo2 |
|
1264 | 1264 | comparing with repo2 |
|
1265 | 1265 | searching for changes |
|
1266 | 1266 | @ changeset: 34:fea3ac5810e0 |
|
1267 | 1267 | | tag: tip |
|
1268 | 1268 | | parent: 32:d06dffa21a31 |
|
1269 | 1269 | | user: test |
|
1270 | 1270 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1271 | 1271 | | summary: (34) head |
|
1272 | 1272 | | |
|
1273 | 1273 | | o changeset: 33:68608f5145f9 |
|
1274 | 1274 | | parent: 18:1aa84d96232a |
|
1275 | 1275 | | user: test |
|
1276 | 1276 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1277 | 1277 | | summary: (33) head |
|
1278 | 1278 | | |
|
1279 | 1279 | o changeset: 32:d06dffa21a31 |
|
1280 | 1280 | | parent: 27:886ed638191b |
|
1281 | 1281 | | parent: 31:621d83e11f67 |
|
1282 | 1282 | | user: test |
|
1283 | 1283 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1284 | 1284 | | summary: (32) expand |
|
1285 | 1285 | | |
|
1286 | 1286 | o changeset: 27:886ed638191b |
|
1287 | 1287 | parent: 21:d42a756af44d |
|
1288 | 1288 | user: test |
|
1289 | 1289 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1290 | 1290 | summary: (27) collapse |
|
1291 | 1291 | |
|
1292 | 1292 | |
|
1293 | 1293 | File + limit with revs != cset revs: |
|
1294 | 1294 | $ cd repo |
|
1295 | 1295 | $ touch b |
|
1296 | 1296 | $ hg ci -Aqm0 |
|
1297 | 1297 | $ hg log -G -l2 a |
|
1298 | 1298 | o changeset: 34:fea3ac5810e0 |
|
1299 | 1299 | | parent: 32:d06dffa21a31 |
|
1300 | 1300 | ~ user: test |
|
1301 | 1301 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1302 | 1302 | summary: (34) head |
|
1303 | 1303 | |
|
1304 | 1304 | o changeset: 33:68608f5145f9 |
|
1305 | 1305 | | parent: 18:1aa84d96232a |
|
1306 | 1306 | ~ user: test |
|
1307 | 1307 | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1308 | 1308 | summary: (33) head |
|
1309 | 1309 | |
|
1310 | 1310 | |
|
1311 | 1311 | File + limit + -ra:b, (b - a) < limit: |
|
1312 | 1312 | $ hg log -G -l3000 -r32:tip a |
|
1313 | 1313 | o changeset: 34:fea3ac5810e0 |
|
1314 | 1314 | | parent: 32:d06dffa21a31 |
|
1315 | 1315 | | user: test |
|
1316 | 1316 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1317 | 1317 | | summary: (34) head |
|
1318 | 1318 | | |
|
1319 | 1319 | | o changeset: 33:68608f5145f9 |
|
1320 | 1320 | | | parent: 18:1aa84d96232a |
|
1321 | 1321 | | ~ user: test |
|
1322 | 1322 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1323 | 1323 | | summary: (33) head |
|
1324 | 1324 | | |
|
1325 | 1325 | o changeset: 32:d06dffa21a31 |
|
1326 | 1326 | |\ parent: 27:886ed638191b |
|
1327 | 1327 | ~ ~ parent: 31:621d83e11f67 |
|
1328 | 1328 | user: test |
|
1329 | 1329 | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1330 | 1330 | summary: (32) expand |
|
1331 | 1331 | |
|
1332 | 1332 | |
|
1333 | 1333 | Point out a common and an uncommon unshown parent |
|
1334 | 1334 | |
|
1335 | 1335 | $ hg log -G -r 'rev(8) or rev(9)' |
|
1336 | 1336 | o changeset: 9:7010c0af0a35 |
|
1337 | 1337 | |\ parent: 7:b632bb1b1224 |
|
1338 | 1338 | | ~ parent: 8:7a0b11f71937 |
|
1339 | 1339 | | user: test |
|
1340 | 1340 | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1341 | 1341 | | summary: (9) expand |
|
1342 | 1342 | | |
|
1343 | 1343 | o changeset: 8:7a0b11f71937 |
|
1344 | 1344 | |\ parent: 0:e6eb3150255d |
|
1345 | 1345 | ~ ~ parent: 7:b632bb1b1224 |
|
1346 | 1346 | user: test |
|
1347 | 1347 | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1348 | 1348 | summary: (8) merge two known; one immediate left, one far right |
|
1349 | 1349 | |
|
1350 | 1350 | |
|
1351 | 1351 | File + limit + -ra:b, b < tip: |
|
1352 | 1352 | |
|
1353 | 1353 | $ hg log -G -l1 -r32:34 a |
|
1354 | 1354 | o changeset: 34:fea3ac5810e0 |
|
1355 | 1355 | | parent: 32:d06dffa21a31 |
|
1356 | 1356 | ~ user: test |
|
1357 | 1357 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1358 | 1358 | summary: (34) head |
|
1359 | 1359 | |
|
1360 | 1360 | |
|
1361 | 1361 | file(File) + limit + -ra:b, b < tip: |
|
1362 | 1362 | |
|
1363 | 1363 | $ hg log -G -l1 -r32:34 -r 'file("a")' |
|
1364 | 1364 | o changeset: 34:fea3ac5810e0 |
|
1365 | 1365 | | parent: 32:d06dffa21a31 |
|
1366 | 1366 | ~ user: test |
|
1367 | 1367 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1368 | 1368 | summary: (34) head |
|
1369 | 1369 | |
|
1370 | 1370 | |
|
1371 | 1371 | limit(file(File) and a::b), b < tip: |
|
1372 | 1372 | |
|
1373 | 1373 | $ hg log -G -r 'limit(file("a") and 32::34, 1)' |
|
1374 | 1374 | o changeset: 32:d06dffa21a31 |
|
1375 | 1375 | |\ parent: 27:886ed638191b |
|
1376 | 1376 | ~ ~ parent: 31:621d83e11f67 |
|
1377 | 1377 | user: test |
|
1378 | 1378 | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1379 | 1379 | summary: (32) expand |
|
1380 | 1380 | |
|
1381 | 1381 | |
|
1382 | 1382 | File + limit + -ra:b, b < tip: |
|
1383 | 1383 | |
|
1384 | 1384 | $ hg log -G -r 'limit(file("a") and 34::32, 1)' |
|
1385 | 1385 | |
|
1386 | 1386 | File + limit + -ra:b, b < tip, (b - a) < limit: |
|
1387 | 1387 | |
|
1388 | 1388 | $ hg log -G -l10 -r33:34 a |
|
1389 | 1389 | o changeset: 34:fea3ac5810e0 |
|
1390 | 1390 | | parent: 32:d06dffa21a31 |
|
1391 | 1391 | ~ user: test |
|
1392 | 1392 | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1393 | 1393 | summary: (34) head |
|
1394 | 1394 | |
|
1395 | 1395 | o changeset: 33:68608f5145f9 |
|
1396 | 1396 | | parent: 18:1aa84d96232a |
|
1397 | 1397 | ~ user: test |
|
1398 | 1398 | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1399 | 1399 | summary: (33) head |
|
1400 | 1400 | |
|
1401 | 1401 | |
|
1402 | 1402 | Do not crash or produce strange graphs if history is buggy |
|
1403 | 1403 | |
|
1404 | 1404 | $ hg branch branch |
|
1405 | 1405 | marked working directory as branch branch |
|
1406 | 1406 | (branches are permanent and global, did you want a bookmark?) |
|
1407 | 1407 | $ commit 36 "buggy merge: identical parents" 35 35 |
|
1408 | 1408 | $ hg log -G -l5 |
|
1409 | 1409 | @ changeset: 36:08a19a744424 |
|
1410 | 1410 | | branch: branch |
|
1411 | 1411 | | tag: tip |
|
1412 | 1412 | | parent: 35:9159c3644c5e |
|
1413 | 1413 | | parent: 35:9159c3644c5e |
|
1414 | 1414 | | user: test |
|
1415 | 1415 | | date: Thu Jan 01 00:00:36 1970 +0000 |
|
1416 | 1416 | | summary: (36) buggy merge: identical parents |
|
1417 | 1417 | | |
|
1418 | 1418 | o changeset: 35:9159c3644c5e |
|
1419 | 1419 | | user: test |
|
1420 | 1420 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1421 | 1421 | | summary: 0 |
|
1422 | 1422 | | |
|
1423 | 1423 | o changeset: 34:fea3ac5810e0 |
|
1424 | 1424 | | parent: 32:d06dffa21a31 |
|
1425 | 1425 | | user: test |
|
1426 | 1426 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1427 | 1427 | | summary: (34) head |
|
1428 | 1428 | | |
|
1429 | 1429 | | o changeset: 33:68608f5145f9 |
|
1430 | 1430 | | | parent: 18:1aa84d96232a |
|
1431 | 1431 | | ~ user: test |
|
1432 | 1432 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1433 | 1433 | | summary: (33) head |
|
1434 | 1434 | | |
|
1435 | 1435 | o changeset: 32:d06dffa21a31 |
|
1436 | 1436 | |\ parent: 27:886ed638191b |
|
1437 | 1437 | ~ ~ parent: 31:621d83e11f67 |
|
1438 | 1438 | user: test |
|
1439 | 1439 | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1440 | 1440 | summary: (32) expand |
|
1441 | 1441 | |
|
1442 | 1442 | |
|
1443 | 1443 | Test log -G options |
|
1444 | 1444 | |
|
1445 | 1445 | $ testlog() { |
|
1446 | 1446 | > hg log -G --print-revset "$@" |
|
1447 | 1447 | > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \ |
|
1448 | 1448 | > | sed 's/.*nodetag/nodetag/' > log.nodes |
|
1449 | 1449 | > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \ |
|
1450 | 1450 | > | sed 's/.*nodetag/nodetag/' > glog.nodes |
|
1451 | 1451 | > (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \ |
|
1452 | 1452 | > | grep '^[-+@ ]' || : |
|
1453 | 1453 | > } |
|
1454 | 1454 | |
|
1455 | 1455 | glog always reorders nodes which explains the difference with log |
|
1456 | 1456 | |
|
1457 | 1457 | $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 |
|
1458 | 1458 | ['27', '25', '21', '34', '32', '31'] |
|
1459 | 1459 | [] |
|
1460 | 1460 | <baseset- [21, 25, 27, 31, 32, 34]> |
|
1461 | 1461 | --- log.nodes * (glob) |
|
1462 | 1462 | +++ glog.nodes * (glob) |
|
1463 | 1463 | @@ -1,6 +1,6 @@ |
|
1464 | 1464 | -nodetag 27 |
|
1465 | 1465 | -nodetag 25 |
|
1466 | 1466 | -nodetag 21 |
|
1467 | 1467 | nodetag 34 |
|
1468 | 1468 | nodetag 32 |
|
1469 | 1469 | nodetag 31 |
|
1470 | 1470 | +nodetag 27 |
|
1471 | 1471 | +nodetag 25 |
|
1472 | 1472 | +nodetag 21 |
|
1473 | 1473 | $ testlog -u test -u not-a-user |
|
1474 | 1474 | [] |
|
1475 | 1475 | (or |
|
1476 | 1476 | (list |
|
1477 | 1477 | (func |
|
1478 | 1478 | (symbol 'user') |
|
1479 | 1479 | (string 'test')) |
|
1480 | 1480 | (func |
|
1481 | 1481 | (symbol 'user') |
|
1482 | 1482 | (string 'not-a-user')))) |
|
1483 | 1483 | <filteredset |
|
1484 | 1484 | <spanset- 0:37>, |
|
1485 | 1485 | <addset |
|
1486 | 1486 | <filteredset |
|
1487 | 1487 | <fullreposet+ 0:37>, |
|
1488 | 1488 | <user 'test'>>, |
|
1489 | 1489 | <filteredset |
|
1490 | 1490 | <fullreposet+ 0:37>, |
|
1491 | 1491 | <user 'not-a-user'>>>> |
|
1492 | 1492 | $ testlog -b not-a-branch |
|
1493 | 1493 | abort: unknown revision 'not-a-branch'! |
|
1494 | 1494 | abort: unknown revision 'not-a-branch'! |
|
1495 | 1495 | abort: unknown revision 'not-a-branch'! |
|
1496 | 1496 | $ testlog -b 35 -b 36 --only-branch branch |
|
1497 | 1497 | [] |
|
1498 | 1498 | (or |
|
1499 | 1499 | (list |
|
1500 | 1500 | (func |
|
1501 | 1501 | (symbol 'branch') |
|
1502 | 1502 | (string 'default')) |
|
1503 | 1503 | (or |
|
1504 | 1504 | (list |
|
1505 | 1505 | (func |
|
1506 | 1506 | (symbol 'branch') |
|
1507 | 1507 | (string 'branch')) |
|
1508 | 1508 | (func |
|
1509 | 1509 | (symbol 'branch') |
|
1510 | 1510 | (string 'branch')))))) |
|
1511 | 1511 | <filteredset |
|
1512 | 1512 | <spanset- 0:37>, |
|
1513 | 1513 | <addset |
|
1514 | 1514 | <filteredset |
|
1515 | 1515 | <fullreposet+ 0:37>, |
|
1516 | 1516 | <branch 'default'>>, |
|
1517 | 1517 | <addset |
|
1518 | 1518 | <filteredset |
|
1519 | 1519 | <fullreposet+ 0:37>, |
|
1520 | 1520 | <branch 'branch'>>, |
|
1521 | 1521 | <filteredset |
|
1522 | 1522 | <fullreposet+ 0:37>, |
|
1523 | 1523 | <branch 'branch'>>>>> |
|
1524 | 1524 | $ testlog -k expand -k merge |
|
1525 | 1525 | [] |
|
1526 | 1526 | (or |
|
1527 | 1527 | (list |
|
1528 | 1528 | (func |
|
1529 | 1529 | (symbol 'keyword') |
|
1530 | 1530 | (string 'expand')) |
|
1531 | 1531 | (func |
|
1532 | 1532 | (symbol 'keyword') |
|
1533 | 1533 | (string 'merge')))) |
|
1534 | 1534 | <filteredset |
|
1535 | 1535 | <spanset- 0:37>, |
|
1536 | 1536 | <addset |
|
1537 | 1537 | <filteredset |
|
1538 | 1538 | <fullreposet+ 0:37>, |
|
1539 | 1539 | <keyword 'expand'>>, |
|
1540 | 1540 | <filteredset |
|
1541 | 1541 | <fullreposet+ 0:37>, |
|
1542 | 1542 | <keyword 'merge'>>>> |
|
1543 | 1543 | $ testlog --only-merges |
|
1544 | 1544 | [] |
|
1545 | 1545 | (func |
|
1546 | 1546 | (symbol 'merge') |
|
1547 | 1547 | None) |
|
1548 | 1548 | <filteredset |
|
1549 | 1549 | <spanset- 0:37>, |
|
1550 | 1550 | <merge>> |
|
1551 | 1551 | $ testlog --no-merges |
|
1552 | 1552 | [] |
|
1553 | 1553 | (not |
|
1554 | 1554 | (func |
|
1555 | 1555 | (symbol 'merge') |
|
1556 | 1556 | None)) |
|
1557 | 1557 | <filteredset |
|
1558 | 1558 | <spanset- 0:37>, |
|
1559 | 1559 | <not |
|
1560 | 1560 | <filteredset |
|
1561 | 1561 | <spanset- 0:37>, |
|
1562 | 1562 | <merge>>>> |
|
1563 | 1563 | $ testlog --date '2 0 to 4 0' |
|
1564 | 1564 | [] |
|
1565 | 1565 | (func |
|
1566 | 1566 | (symbol 'date') |
|
1567 | 1567 | (string '2 0 to 4 0')) |
|
1568 | 1568 | <filteredset |
|
1569 | 1569 | <spanset- 0:37>, |
|
1570 | 1570 | <date '2 0 to 4 0'>> |
|
1571 | 1571 | $ hg log -G -d 'brace ) in a date' |
|
1572 | 1572 | hg: parse error: invalid date: 'brace ) in a date' |
|
1573 | 1573 | [255] |
|
1574 | 1574 | $ testlog --prune 31 --prune 32 |
|
1575 | 1575 | [] |
|
1576 | 1576 | (not |
|
1577 | 1577 | (or |
|
1578 | 1578 | (list |
|
1579 | 1579 | (func |
|
1580 | 1580 | (symbol 'ancestors') |
|
1581 | 1581 | (string '31')) |
|
1582 | 1582 | (func |
|
1583 | 1583 | (symbol 'ancestors') |
|
1584 | 1584 | (string '32'))))) |
|
1585 | 1585 | <filteredset |
|
1586 | 1586 | <spanset- 0:37>, |
|
1587 | 1587 | <not |
|
1588 | 1588 | <addset |
|
1589 | 1589 | <filteredset |
|
1590 | 1590 | <spanset- 0:37>, |
|
1591 | 1591 | <generatorsetdesc+>>, |
|
1592 | 1592 | <filteredset |
|
1593 | 1593 | <spanset- 0:37>, |
|
1594 | 1594 | <generatorsetdesc+>>>>> |
|
1595 | 1595 | |
|
1596 | 1596 | Dedicated repo for --follow and paths filtering. The g is crafted to |
|
1597 | 1597 | have 2 filelog topological heads in a linear changeset graph. |
|
1598 | 1598 | |
|
1599 | 1599 | $ cd .. |
|
1600 | 1600 | $ hg init follow |
|
1601 | 1601 | $ cd follow |
|
1602 | 1602 | $ testlog --follow |
|
1603 | 1603 | [] |
|
1604 | 1604 | [] |
|
1605 | 1605 | <baseset []> |
|
1606 | 1606 | $ testlog -rnull |
|
1607 | 1607 | ['null'] |
|
1608 | 1608 | [] |
|
1609 | 1609 | <baseset [-1]> |
|
1610 | 1610 | $ echo a > a |
|
1611 | 1611 | $ echo aa > aa |
|
1612 | 1612 | $ echo f > f |
|
1613 | 1613 | $ hg ci -Am "add a" a aa f |
|
1614 | 1614 | $ hg cp a b |
|
1615 | 1615 | $ hg cp f g |
|
1616 | 1616 | $ hg ci -m "copy a b" |
|
1617 | 1617 | $ mkdir dir |
|
1618 | 1618 | $ hg mv b dir |
|
1619 | 1619 | $ echo g >> g |
|
1620 | 1620 | $ echo f >> f |
|
1621 | 1621 | $ hg ci -m "mv b dir/b" |
|
1622 | 1622 | $ hg mv a b |
|
1623 | 1623 | $ hg cp -f f g |
|
1624 | 1624 | $ echo a > d |
|
1625 | 1625 | $ hg add d |
|
1626 | 1626 | $ hg ci -m "mv a b; add d" |
|
1627 | 1627 | $ hg mv dir/b e |
|
1628 | 1628 | $ hg ci -m "mv dir/b e" |
|
1629 | 1629 | $ hg log -G --template '({rev}) {desc|firstline}\n' |
|
1630 | 1630 | @ (4) mv dir/b e |
|
1631 | 1631 | | |
|
1632 | 1632 | o (3) mv a b; add d |
|
1633 | 1633 | | |
|
1634 | 1634 | o (2) mv b dir/b |
|
1635 | 1635 | | |
|
1636 | 1636 | o (1) copy a b |
|
1637 | 1637 | | |
|
1638 | 1638 | o (0) add a |
|
1639 | 1639 | |
|
1640 | 1640 | |
|
1641 | 1641 | $ testlog a |
|
1642 | 1642 | [] |
|
1643 | 1643 | (func |
|
1644 | 1644 | (symbol 'filelog') |
|
1645 | 1645 | (string 'a')) |
|
1646 | 1646 | <filteredset |
|
1647 | 1647 | <spanset- 0:5>, set([0])> |
|
1648 | 1648 | $ testlog a b |
|
1649 | 1649 | [] |
|
1650 | 1650 | (or |
|
1651 | 1651 | (list |
|
1652 | 1652 | (func |
|
1653 | 1653 | (symbol 'filelog') |
|
1654 | 1654 | (string 'a')) |
|
1655 | 1655 | (func |
|
1656 | 1656 | (symbol 'filelog') |
|
1657 | 1657 | (string 'b')))) |
|
1658 | 1658 | <filteredset |
|
1659 | 1659 | <spanset- 0:5>, |
|
1660 | 1660 | <addset |
|
1661 | 1661 | <baseset+ [0]>, |
|
1662 | 1662 | <baseset+ [1]>>> |
|
1663 | 1663 | |
|
1664 | 1664 | Test falling back to slow path for non-existing files |
|
1665 | 1665 | |
|
1666 | 1666 | $ testlog a c |
|
1667 | 1667 | [] |
|
1668 | 1668 | (func |
|
1669 | 1669 | (symbol '_matchfiles') |
|
1670 | 1670 | (list |
|
1671 | 1671 | (string 'r:') |
|
1672 | 1672 | (string 'd:relpath') |
|
1673 | 1673 | (string 'p:a') |
|
1674 | 1674 | (string 'p:c'))) |
|
1675 | 1675 | <filteredset |
|
1676 | 1676 | <spanset- 0:5>, |
|
1677 | 1677 | <matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=None>> |
|
1678 | 1678 | |
|
1679 | 1679 | Test multiple --include/--exclude/paths |
|
1680 | 1680 | |
|
1681 | 1681 | $ testlog --include a --include e --exclude b --exclude e a e |
|
1682 | 1682 | [] |
|
1683 | 1683 | (func |
|
1684 | 1684 | (symbol '_matchfiles') |
|
1685 | 1685 | (list |
|
1686 | 1686 | (string 'r:') |
|
1687 | 1687 | (string 'd:relpath') |
|
1688 | 1688 | (string 'p:a') |
|
1689 | 1689 | (string 'p:e') |
|
1690 | 1690 | (string 'i:a') |
|
1691 | 1691 | (string 'i:e') |
|
1692 | 1692 | (string 'x:b') |
|
1693 | 1693 | (string 'x:e'))) |
|
1694 | 1694 | <filteredset |
|
1695 | 1695 | <spanset- 0:5>, |
|
1696 | 1696 | <matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=None>> |
|
1697 | 1697 | |
|
1698 | 1698 | Test glob expansion of pats |
|
1699 | 1699 | |
|
1700 | 1700 | $ expandglobs=`$PYTHON -c "import mercurial.util; \ |
|
1701 | 1701 | > print(mercurial.util.expandglobs and 'true' or 'false')"` |
|
1702 | 1702 | $ if [ $expandglobs = "true" ]; then |
|
1703 | 1703 | > testlog 'a*'; |
|
1704 | 1704 | > else |
|
1705 | 1705 | > testlog a*; |
|
1706 | 1706 | > fi; |
|
1707 | 1707 | [] |
|
1708 | 1708 | (func |
|
1709 | 1709 | (symbol 'filelog') |
|
1710 | 1710 | (string 'aa')) |
|
1711 | 1711 | <filteredset |
|
1712 | 1712 | <spanset- 0:5>, set([0])> |
|
1713 | 1713 | |
|
1714 | 1714 | Test --follow on a non-existent directory |
|
1715 | 1715 | |
|
1716 | 1716 | $ testlog -f dir |
|
1717 | 1717 | abort: cannot follow file not in parent revision: "dir" |
|
1718 | 1718 | abort: cannot follow file not in parent revision: "dir" |
|
1719 | 1719 | abort: cannot follow file not in parent revision: "dir" |
|
1720 | 1720 | |
|
1721 | 1721 | Test --follow on a directory |
|
1722 | 1722 | |
|
1723 | 1723 | $ hg up -q '.^' |
|
1724 | 1724 | $ testlog -f dir |
|
1725 | 1725 | [] |
|
1726 | 1726 | (and |
|
1727 | 1727 | (func |
|
1728 | 1728 | (symbol 'ancestors') |
|
1729 | 1729 | (symbol '.')) |
|
1730 | 1730 | (func |
|
1731 | 1731 | (symbol '_matchfiles') |
|
1732 | 1732 | (list |
|
1733 | 1733 | (string 'r:') |
|
1734 | 1734 | (string 'd:relpath') |
|
1735 | 1735 | (string 'p:dir')))) |
|
1736 | 1736 | <filteredset |
|
1737 | 1737 | <filteredset |
|
1738 | 1738 | <spanset- 0:4>, |
|
1739 | 1739 | <generatorsetdesc+>>, |
|
1740 | 1740 | <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=None>> |
|
1741 | 1741 | $ hg up -q tip |
|
1742 | 1742 | |
|
1743 | 1743 | Test --follow on file not in parent revision |
|
1744 | 1744 | |
|
1745 | 1745 | $ testlog -f a |
|
1746 | 1746 | abort: cannot follow file not in parent revision: "a" |
|
1747 | 1747 | abort: cannot follow file not in parent revision: "a" |
|
1748 | 1748 | abort: cannot follow file not in parent revision: "a" |
|
1749 | 1749 | |
|
1750 | 1750 | Test --follow and patterns |
|
1751 | 1751 | |
|
1752 | 1752 | $ testlog -f 'glob:*' |
|
1753 | 1753 | [] |
|
1754 | 1754 | (and |
|
1755 | 1755 | (func |
|
1756 | 1756 | (symbol 'ancestors') |
|
1757 | 1757 | (symbol '.')) |
|
1758 | 1758 | (func |
|
1759 | 1759 | (symbol '_matchfiles') |
|
1760 | 1760 | (list |
|
1761 | 1761 | (string 'r:') |
|
1762 | 1762 | (string 'd:relpath') |
|
1763 | 1763 | (string 'p:glob:*')))) |
|
1764 | 1764 | <filteredset |
|
1765 | 1765 | <filteredset |
|
1766 | 1766 | <spanset- 0:5>, |
|
1767 | 1767 | <generatorsetdesc+>>, |
|
1768 | 1768 | <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=None>> |
|
1769 | 1769 | |
|
1770 | 1770 | Test --follow on a single rename |
|
1771 | 1771 | |
|
1772 | 1772 | $ hg up -q 2 |
|
1773 | 1773 | $ testlog -f a |
|
1774 | 1774 | [] |
|
1775 | 1775 | (func |
|
1776 | 1776 | (symbol 'follow') |
|
1777 | 1777 | (string 'a')) |
|
1778 | 1778 | <filteredset |
|
1779 | 1779 | <spanset- 0:3>, |
|
1780 | 1780 | <generatorsetdesc+>> |
|
1781 | 1781 | |
|
1782 | 1782 | Test --follow and multiple renames |
|
1783 | 1783 | |
|
1784 | 1784 | $ hg up -q tip |
|
1785 | 1785 | $ testlog -f e |
|
1786 | 1786 | [] |
|
1787 | 1787 | (func |
|
1788 | 1788 | (symbol 'follow') |
|
1789 | 1789 | (string 'e')) |
|
1790 | 1790 | <filteredset |
|
1791 | 1791 | <spanset- 0:5>, |
|
1792 | 1792 | <generatorsetdesc+>> |
|
1793 | 1793 | |
|
1794 | 1794 | Test --follow and multiple filelog heads |
|
1795 | 1795 | |
|
1796 | 1796 | $ hg up -q 2 |
|
1797 | 1797 | $ testlog -f g |
|
1798 | 1798 | [] |
|
1799 | 1799 | (func |
|
1800 | 1800 | (symbol 'follow') |
|
1801 | 1801 | (string 'g')) |
|
1802 | 1802 | <filteredset |
|
1803 | 1803 | <spanset- 0:3>, |
|
1804 | 1804 | <generatorsetdesc+>> |
|
1805 | 1805 | $ cat log.nodes |
|
1806 | 1806 | nodetag 2 |
|
1807 | 1807 | nodetag 1 |
|
1808 | 1808 | nodetag 0 |
|
1809 | 1809 | $ hg up -q tip |
|
1810 | 1810 | $ testlog -f g |
|
1811 | 1811 | [] |
|
1812 | 1812 | (func |
|
1813 | 1813 | (symbol 'follow') |
|
1814 | 1814 | (string 'g')) |
|
1815 | 1815 | <filteredset |
|
1816 | 1816 | <spanset- 0:5>, |
|
1817 | 1817 | <generatorsetdesc+>> |
|
1818 | 1818 | $ cat log.nodes |
|
1819 | 1819 | nodetag 3 |
|
1820 | 1820 | nodetag 2 |
|
1821 | 1821 | nodetag 0 |
|
1822 | 1822 | |
|
1823 | 1823 | Test --follow and multiple files |
|
1824 | 1824 | |
|
1825 | 1825 | $ testlog -f g e |
|
1826 | 1826 | [] |
|
1827 | 1827 | (or |
|
1828 | 1828 | (list |
|
1829 | 1829 | (func |
|
1830 | 1830 | (symbol 'follow') |
|
1831 | 1831 | (string 'g')) |
|
1832 | 1832 | (func |
|
1833 | 1833 | (symbol 'follow') |
|
1834 | 1834 | (string 'e')))) |
|
1835 | 1835 | <filteredset |
|
1836 | 1836 | <spanset- 0:5>, |
|
1837 | 1837 | <addset |
|
1838 | 1838 | <generatorsetdesc+>, |
|
1839 | 1839 | <generatorsetdesc+>>> |
|
1840 | 1840 | $ cat log.nodes |
|
1841 | 1841 | nodetag 4 |
|
1842 | 1842 | nodetag 3 |
|
1843 | 1843 | nodetag 2 |
|
1844 | 1844 | nodetag 1 |
|
1845 | 1845 | nodetag 0 |
|
1846 | 1846 | |
|
1847 | 1847 | Test --follow null parent |
|
1848 | 1848 | |
|
1849 | 1849 | $ hg up -q null |
|
1850 | 1850 | $ testlog -f |
|
1851 | 1851 | [] |
|
1852 | 1852 | [] |
|
1853 | 1853 | <baseset []> |
|
1854 | 1854 | |
|
1855 | 1855 | Test --follow-first |
|
1856 | 1856 | |
|
1857 | 1857 | $ hg up -q 3 |
|
1858 | 1858 | $ echo ee > e |
|
1859 | 1859 | $ hg ci -Am "add another e" e |
|
1860 | 1860 | created new head |
|
1861 | 1861 | $ hg merge --tool internal:other 4 |
|
1862 | 1862 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
1863 | 1863 | (branch merge, don't forget to commit) |
|
1864 | 1864 | $ echo merge > e |
|
1865 | 1865 | $ hg ci -m "merge 5 and 4" |
|
1866 | 1866 | $ testlog --follow-first |
|
1867 | 1867 | [] |
|
1868 | 1868 | (func |
|
1869 | 1869 | (symbol '_firstancestors') |
|
1870 | 1870 | (func |
|
1871 | 1871 | (symbol 'rev') |
|
1872 | 1872 | (symbol '6'))) |
|
1873 | 1873 | <filteredset |
|
1874 | 1874 | <spanset- 0:7>, |
|
1875 | 1875 | <generatorsetdesc+>> |
|
1876 | 1876 | |
|
1877 | 1877 | Cannot compare with log --follow-first FILE as it never worked |
|
1878 | 1878 | |
|
1879 | 1879 | $ hg log -G --print-revset --follow-first e |
|
1880 | 1880 | [] |
|
1881 | 1881 | (func |
|
1882 | 1882 | (symbol '_followfirst') |
|
1883 | 1883 | (string 'e')) |
|
1884 | 1884 | <filteredset |
|
1885 | 1885 | <spanset- 0:7>, |
|
1886 | 1886 | <generatorsetdesc+>> |
|
1887 | 1887 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
|
1888 | 1888 | @ 6 merge 5 and 4 |
|
1889 | 1889 | |\ |
|
1890 | 1890 | | ~ |
|
1891 | 1891 | o 5 add another e |
|
1892 | 1892 | | |
|
1893 | 1893 | ~ |
|
1894 | 1894 | |
|
1895 | 1895 | Test --copies |
|
1896 | 1896 | |
|
1897 | 1897 | $ hg log -G --copies --template "{rev} {desc|firstline} \ |
|
1898 | 1898 | > copies: {file_copies_switch}\n" |
|
1899 | 1899 | @ 6 merge 5 and 4 copies: |
|
1900 | 1900 | |\ |
|
1901 | 1901 | | o 5 add another e copies: |
|
1902 | 1902 | | | |
|
1903 | 1903 | o | 4 mv dir/b e copies: e (dir/b) |
|
1904 | 1904 | |/ |
|
1905 | 1905 | o 3 mv a b; add d copies: b (a)g (f) |
|
1906 | 1906 | | |
|
1907 | 1907 | o 2 mv b dir/b copies: dir/b (b) |
|
1908 | 1908 | | |
|
1909 | 1909 | o 1 copy a b copies: b (a)g (f) |
|
1910 | 1910 | | |
|
1911 | 1911 | o 0 add a copies: |
|
1912 | 1912 | |
|
1913 | 1913 | Test "set:..." and parent revision |
|
1914 | 1914 | |
|
1915 | 1915 | $ hg up -q 4 |
|
1916 | 1916 | $ testlog "set:copied()" |
|
1917 | 1917 | [] |
|
1918 | 1918 | (func |
|
1919 | 1919 | (symbol '_matchfiles') |
|
1920 | 1920 | (list |
|
1921 | 1921 | (string 'r:') |
|
1922 | 1922 | (string 'd:relpath') |
|
1923 | 1923 | (string 'p:set:copied()'))) |
|
1924 | 1924 | <filteredset |
|
1925 | 1925 | <spanset- 0:7>, |
|
1926 | 1926 | <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=None>> |
|
1927 | 1927 | $ testlog --include "set:copied()" |
|
1928 | 1928 | [] |
|
1929 | 1929 | (func |
|
1930 | 1930 | (symbol '_matchfiles') |
|
1931 | 1931 | (list |
|
1932 | 1932 | (string 'r:') |
|
1933 | 1933 | (string 'd:relpath') |
|
1934 | 1934 | (string 'i:set:copied()'))) |
|
1935 | 1935 | <filteredset |
|
1936 | 1936 | <spanset- 0:7>, |
|
1937 | 1937 | <matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=None>> |
|
1938 | 1938 | $ testlog -r "sort(file('set:copied()'), -rev)" |
|
1939 | 1939 | ["sort(file('set:copied()'), -rev)"] |
|
1940 | 1940 | [] |
|
1941 | 1941 | <baseset []> |
|
1942 | 1942 | |
|
1943 | 1943 | Test --removed |
|
1944 | 1944 | |
|
1945 | 1945 | $ testlog --removed |
|
1946 | 1946 | [] |
|
1947 | 1947 | [] |
|
1948 | 1948 | <spanset- 0:7> |
|
1949 | 1949 | $ testlog --removed a |
|
1950 | 1950 | [] |
|
1951 | 1951 | (func |
|
1952 | 1952 | (symbol '_matchfiles') |
|
1953 | 1953 | (list |
|
1954 | 1954 | (string 'r:') |
|
1955 | 1955 | (string 'd:relpath') |
|
1956 | 1956 | (string 'p:a'))) |
|
1957 | 1957 | <filteredset |
|
1958 | 1958 | <spanset- 0:7>, |
|
1959 | 1959 | <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> |
|
1960 | 1960 | $ testlog --removed --follow a |
|
1961 | 1961 | [] |
|
1962 | 1962 | (and |
|
1963 | 1963 | (func |
|
1964 | 1964 | (symbol 'ancestors') |
|
1965 | 1965 | (symbol '.')) |
|
1966 | 1966 | (func |
|
1967 | 1967 | (symbol '_matchfiles') |
|
1968 | 1968 | (list |
|
1969 | 1969 | (string 'r:') |
|
1970 | 1970 | (string 'd:relpath') |
|
1971 | 1971 | (string 'p:a')))) |
|
1972 | 1972 | <filteredset |
|
1973 | 1973 | <filteredset |
|
1974 | 1974 | <spanset- 0:5>, |
|
1975 | 1975 | <generatorsetdesc+>>, |
|
1976 | 1976 | <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> |
|
1977 | 1977 | |
|
1978 | 1978 | Test --patch and --stat with --follow and --follow-first |
|
1979 | 1979 | |
|
1980 | 1980 | $ hg up -q 3 |
|
1981 | 1981 | $ hg log -G --git --patch b |
|
1982 | 1982 | o changeset: 1:216d4c92cf98 |
|
1983 | 1983 | | user: test |
|
1984 | 1984 | ~ date: Thu Jan 01 00:00:00 1970 +0000 |
|
1985 | 1985 | summary: copy a b |
|
1986 | 1986 | |
|
1987 | 1987 | diff --git a/a b/b |
|
1988 | 1988 | copy from a |
|
1989 | 1989 | copy to b |
|
1990 | 1990 | |
|
1991 | 1991 | |
|
1992 | 1992 | $ hg log -G --git --stat b |
|
1993 | 1993 | o changeset: 1:216d4c92cf98 |
|
1994 | 1994 | | user: test |
|
1995 | 1995 | ~ date: Thu Jan 01 00:00:00 1970 +0000 |
|
1996 | 1996 | summary: copy a b |
|
1997 | 1997 | |
|
1998 | 1998 | b | 0 |
|
1999 | 1999 | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
2000 | 2000 | |
|
2001 | 2001 | |
|
2002 | 2002 | $ hg log -G --git --patch --follow b |
|
2003 | 2003 | o changeset: 1:216d4c92cf98 |
|
2004 | 2004 | | user: test |
|
2005 | 2005 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2006 | 2006 | | summary: copy a b |
|
2007 | 2007 | | |
|
2008 | 2008 | | diff --git a/a b/b |
|
2009 | 2009 | | copy from a |
|
2010 | 2010 | | copy to b |
|
2011 | 2011 | | |
|
2012 | 2012 | o changeset: 0:f8035bb17114 |
|
2013 | 2013 | user: test |
|
2014 | 2014 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2015 | 2015 | summary: add a |
|
2016 | 2016 | |
|
2017 | 2017 | diff --git a/a b/a |
|
2018 | 2018 | new file mode 100644 |
|
2019 | 2019 | --- /dev/null |
|
2020 | 2020 | +++ b/a |
|
2021 | 2021 | @@ -0,0 +1,1 @@ |
|
2022 | 2022 | +a |
|
2023 | 2023 | |
|
2024 | 2024 | |
|
2025 | 2025 | $ hg log -G --git --stat --follow b |
|
2026 | 2026 | o changeset: 1:216d4c92cf98 |
|
2027 | 2027 | | user: test |
|
2028 | 2028 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2029 | 2029 | | summary: copy a b |
|
2030 | 2030 | | |
|
2031 | 2031 | | b | 0 |
|
2032 | 2032 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
2033 | 2033 | | |
|
2034 | 2034 | o changeset: 0:f8035bb17114 |
|
2035 | 2035 | user: test |
|
2036 | 2036 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2037 | 2037 | summary: add a |
|
2038 | 2038 | |
|
2039 | 2039 | a | 1 + |
|
2040 | 2040 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
2041 | 2041 | |
|
2042 | 2042 | |
|
2043 | 2043 | $ hg up -q 6 |
|
2044 | 2044 | $ hg log -G --git --patch --follow-first e |
|
2045 | 2045 | @ changeset: 6:fc281d8ff18d |
|
2046 | 2046 | |\ tag: tip |
|
2047 | 2047 | | ~ parent: 5:99b31f1c2782 |
|
2048 | 2048 | | parent: 4:17d952250a9d |
|
2049 | 2049 | | user: test |
|
2050 | 2050 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2051 | 2051 | | summary: merge 5 and 4 |
|
2052 | 2052 | | |
|
2053 | 2053 | | diff --git a/e b/e |
|
2054 | 2054 | | --- a/e |
|
2055 | 2055 | | +++ b/e |
|
2056 | 2056 | | @@ -1,1 +1,1 @@ |
|
2057 | 2057 | | -ee |
|
2058 | 2058 | | +merge |
|
2059 | 2059 | | |
|
2060 | 2060 | o changeset: 5:99b31f1c2782 |
|
2061 | 2061 | | parent: 3:5918b8d165d1 |
|
2062 | 2062 | ~ user: test |
|
2063 | 2063 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2064 | 2064 | summary: add another e |
|
2065 | 2065 | |
|
2066 | 2066 | diff --git a/e b/e |
|
2067 | 2067 | new file mode 100644 |
|
2068 | 2068 | --- /dev/null |
|
2069 | 2069 | +++ b/e |
|
2070 | 2070 | @@ -0,0 +1,1 @@ |
|
2071 | 2071 | +ee |
|
2072 | 2072 | |
|
2073 | 2073 | |
|
2074 | 2074 | Test old-style --rev |
|
2075 | 2075 | |
|
2076 | 2076 | $ hg tag 'foo-bar' |
|
2077 | 2077 | $ testlog -r 'foo-bar' |
|
2078 | 2078 | ['foo-bar'] |
|
2079 | 2079 | [] |
|
2080 | 2080 | <baseset [6]> |
|
2081 | 2081 | |
|
2082 | 2082 | Test --follow and forward --rev |
|
2083 | 2083 | |
|
2084 | 2084 | $ hg up -q 6 |
|
2085 | 2085 | $ echo g > g |
|
2086 | 2086 | $ hg ci -Am 'add g' g |
|
2087 | 2087 | created new head |
|
2088 | 2088 | $ hg up -q 2 |
|
2089 | 2089 | $ hg log -G --template "{rev} {desc|firstline}\n" |
|
2090 | 2090 | o 8 add g |
|
2091 | 2091 | | |
|
2092 | 2092 | | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
2093 | 2093 | |/ |
|
2094 | 2094 | o 6 merge 5 and 4 |
|
2095 | 2095 | |\ |
|
2096 | 2096 | | o 5 add another e |
|
2097 | 2097 | | | |
|
2098 | 2098 | o | 4 mv dir/b e |
|
2099 | 2099 | |/ |
|
2100 | 2100 | o 3 mv a b; add d |
|
2101 | 2101 | | |
|
2102 | 2102 | @ 2 mv b dir/b |
|
2103 | 2103 | | |
|
2104 | 2104 | o 1 copy a b |
|
2105 | 2105 | | |
|
2106 | 2106 | o 0 add a |
|
2107 | 2107 | |
|
2108 | 2108 | $ hg archive -r 7 archive |
|
2109 | 2109 | $ grep changessincelatesttag archive/.hg_archival.txt |
|
2110 | 2110 | changessincelatesttag: 1 |
|
2111 | 2111 | $ rm -r archive |
|
2112 | 2112 | |
|
2113 | 2113 | changessincelatesttag with no prior tag |
|
2114 | 2114 | $ hg archive -r 4 archive |
|
2115 | 2115 | $ grep changessincelatesttag archive/.hg_archival.txt |
|
2116 | 2116 | changessincelatesttag: 5 |
|
2117 | 2117 | |
|
2118 | 2118 | $ hg export 'all()' |
|
2119 | 2119 | # HG changeset patch |
|
2120 | 2120 | # User test |
|
2121 | 2121 | # Date 0 0 |
|
2122 | 2122 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2123 | 2123 | # Node ID f8035bb17114da16215af3436ec5222428ace8ee |
|
2124 | 2124 | # Parent 0000000000000000000000000000000000000000 |
|
2125 | 2125 | add a |
|
2126 | 2126 | |
|
2127 | 2127 | diff -r 000000000000 -r f8035bb17114 a |
|
2128 | 2128 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2129 | 2129 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
2130 | 2130 | @@ -0,0 +1,1 @@ |
|
2131 | 2131 | +a |
|
2132 | 2132 | diff -r 000000000000 -r f8035bb17114 aa |
|
2133 | 2133 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2134 | 2134 | +++ b/aa Thu Jan 01 00:00:00 1970 +0000 |
|
2135 | 2135 | @@ -0,0 +1,1 @@ |
|
2136 | 2136 | +aa |
|
2137 | 2137 | diff -r 000000000000 -r f8035bb17114 f |
|
2138 | 2138 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2139 | 2139 | +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
|
2140 | 2140 | @@ -0,0 +1,1 @@ |
|
2141 | 2141 | +f |
|
2142 | 2142 | # HG changeset patch |
|
2143 | 2143 | # User test |
|
2144 | 2144 | # Date 0 0 |
|
2145 | 2145 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2146 | 2146 | # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92 |
|
2147 | 2147 | # Parent f8035bb17114da16215af3436ec5222428ace8ee |
|
2148 | 2148 | copy a b |
|
2149 | 2149 | |
|
2150 | 2150 | diff -r f8035bb17114 -r 216d4c92cf98 b |
|
2151 | 2151 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2152 | 2152 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
2153 | 2153 | @@ -0,0 +1,1 @@ |
|
2154 | 2154 | +a |
|
2155 | 2155 | diff -r f8035bb17114 -r 216d4c92cf98 g |
|
2156 | 2156 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2157 | 2157 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2158 | 2158 | @@ -0,0 +1,1 @@ |
|
2159 | 2159 | +f |
|
2160 | 2160 | # HG changeset patch |
|
2161 | 2161 | # User test |
|
2162 | 2162 | # Date 0 0 |
|
2163 | 2163 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2164 | 2164 | # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3 |
|
2165 | 2165 | # Parent 216d4c92cf98ff2b4641d508b76b529f3d424c92 |
|
2166 | 2166 | mv b dir/b |
|
2167 | 2167 | |
|
2168 | 2168 | diff -r 216d4c92cf98 -r bb573313a9e8 b |
|
2169 | 2169 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
2170 | 2170 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2171 | 2171 | @@ -1,1 +0,0 @@ |
|
2172 | 2172 | -a |
|
2173 | 2173 | diff -r 216d4c92cf98 -r bb573313a9e8 dir/b |
|
2174 | 2174 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2175 | 2175 | +++ b/dir/b Thu Jan 01 00:00:00 1970 +0000 |
|
2176 | 2176 | @@ -0,0 +1,1 @@ |
|
2177 | 2177 | +a |
|
2178 | 2178 | diff -r 216d4c92cf98 -r bb573313a9e8 f |
|
2179 | 2179 | --- a/f Thu Jan 01 00:00:00 1970 +0000 |
|
2180 | 2180 | +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
|
2181 | 2181 | @@ -1,1 +1,2 @@ |
|
2182 | 2182 | f |
|
2183 | 2183 | +f |
|
2184 | 2184 | diff -r 216d4c92cf98 -r bb573313a9e8 g |
|
2185 | 2185 | --- a/g Thu Jan 01 00:00:00 1970 +0000 |
|
2186 | 2186 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2187 | 2187 | @@ -1,1 +1,2 @@ |
|
2188 | 2188 | f |
|
2189 | 2189 | +g |
|
2190 | 2190 | # HG changeset patch |
|
2191 | 2191 | # User test |
|
2192 | 2192 | # Date 0 0 |
|
2193 | 2193 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2194 | 2194 | # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
|
2195 | 2195 | # Parent bb573313a9e8349099b6ea2b2fb1fc7f424446f3 |
|
2196 | 2196 | mv a b; add d |
|
2197 | 2197 | |
|
2198 | 2198 | diff -r bb573313a9e8 -r 5918b8d165d1 a |
|
2199 | 2199 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
2200 | 2200 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2201 | 2201 | @@ -1,1 +0,0 @@ |
|
2202 | 2202 | -a |
|
2203 | 2203 | diff -r bb573313a9e8 -r 5918b8d165d1 b |
|
2204 | 2204 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2205 | 2205 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
2206 | 2206 | @@ -0,0 +1,1 @@ |
|
2207 | 2207 | +a |
|
2208 | 2208 | diff -r bb573313a9e8 -r 5918b8d165d1 d |
|
2209 | 2209 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2210 | 2210 | +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
2211 | 2211 | @@ -0,0 +1,1 @@ |
|
2212 | 2212 | +a |
|
2213 | 2213 | diff -r bb573313a9e8 -r 5918b8d165d1 g |
|
2214 | 2214 | --- a/g Thu Jan 01 00:00:00 1970 +0000 |
|
2215 | 2215 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2216 | 2216 | @@ -1,2 +1,2 @@ |
|
2217 | 2217 | f |
|
2218 | 2218 | -g |
|
2219 | 2219 | +f |
|
2220 | 2220 | # HG changeset patch |
|
2221 | 2221 | # User test |
|
2222 | 2222 | # Date 0 0 |
|
2223 | 2223 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2224 | 2224 | # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
|
2225 | 2225 | # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
|
2226 | 2226 | mv dir/b e |
|
2227 | 2227 | |
|
2228 | 2228 | diff -r 5918b8d165d1 -r 17d952250a9d dir/b |
|
2229 | 2229 | --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
|
2230 | 2230 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2231 | 2231 | @@ -1,1 +0,0 @@ |
|
2232 | 2232 | -a |
|
2233 | 2233 | diff -r 5918b8d165d1 -r 17d952250a9d e |
|
2234 | 2234 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2235 | 2235 | +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
2236 | 2236 | @@ -0,0 +1,1 @@ |
|
2237 | 2237 | +a |
|
2238 | 2238 | # HG changeset patch |
|
2239 | 2239 | # User test |
|
2240 | 2240 | # Date 0 0 |
|
2241 | 2241 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2242 | 2242 | # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b |
|
2243 | 2243 | # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
|
2244 | 2244 | add another e |
|
2245 | 2245 | |
|
2246 | 2246 | diff -r 5918b8d165d1 -r 99b31f1c2782 e |
|
2247 | 2247 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2248 | 2248 | +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
2249 | 2249 | @@ -0,0 +1,1 @@ |
|
2250 | 2250 | +ee |
|
2251 | 2251 | # HG changeset patch |
|
2252 | 2252 | # User test |
|
2253 | 2253 | # Date 0 0 |
|
2254 | 2254 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2255 | 2255 | # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
|
2256 | 2256 | # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
|
2257 | 2257 | # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
|
2258 | 2258 | merge 5 and 4 |
|
2259 | 2259 | |
|
2260 | 2260 | diff -r 99b31f1c2782 -r fc281d8ff18d dir/b |
|
2261 | 2261 | --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
|
2262 | 2262 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2263 | 2263 | @@ -1,1 +0,0 @@ |
|
2264 | 2264 | -a |
|
2265 | 2265 | diff -r 99b31f1c2782 -r fc281d8ff18d e |
|
2266 | 2266 | --- a/e Thu Jan 01 00:00:00 1970 +0000 |
|
2267 | 2267 | +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
2268 | 2268 | @@ -1,1 +1,1 @@ |
|
2269 | 2269 | -ee |
|
2270 | 2270 | +merge |
|
2271 | 2271 | # HG changeset patch |
|
2272 | 2272 | # User test |
|
2273 | 2273 | # Date 0 0 |
|
2274 | 2274 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2275 | 2275 | # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd |
|
2276 | 2276 | # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
|
2277 | 2277 | Added tag foo-bar for changeset fc281d8ff18d |
|
2278 | 2278 | |
|
2279 | 2279 | diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags |
|
2280 | 2280 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2281 | 2281 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2282 | 2282 | @@ -0,0 +1,1 @@ |
|
2283 | 2283 | +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar |
|
2284 | 2284 | # HG changeset patch |
|
2285 | 2285 | # User test |
|
2286 | 2286 | # Date 0 0 |
|
2287 | 2287 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2288 | 2288 | # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 |
|
2289 | 2289 | # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
|
2290 | 2290 | add g |
|
2291 | 2291 | |
|
2292 | 2292 | diff -r fc281d8ff18d -r 24c2e826ddeb g |
|
2293 | 2293 | --- a/g Thu Jan 01 00:00:00 1970 +0000 |
|
2294 | 2294 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2295 | 2295 | @@ -1,2 +1,1 @@ |
|
2296 | 2296 | -f |
|
2297 | 2297 | -f |
|
2298 | 2298 | +g |
|
2299 | 2299 | $ testlog --follow -r6 -r8 -r5 -r7 -r4 |
|
2300 | 2300 | ['reverse(::(((6) or (8)) or ((5) or ((7) or (4)))))'] |
|
2301 | 2301 | [] |
|
2302 | 2302 | <generatorsetdesc-> |
|
2303 | 2303 | |
|
2304 | 2304 | Test --follow-first and forward --rev |
|
2305 | 2305 | |
|
2306 | 2306 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 |
|
2307 | ['6', '8', '5', '7', '4'] | |
|
2308 | (func | |
|
2309 | (symbol '_firstdescendants') | |
|
2310 | (func | |
|
2311 | (symbol 'rev') | |
|
2312 | (symbol '6'))) | |
|
2313 | <filteredset | |
|
2314 | <baseset- [4, 5, 6, 7, 8]>, | |
|
2315 | <generatorsetasc+>> | |
|
2316 | --- log.nodes * (glob) | |
|
2317 | +++ glog.nodes * (glob) | |
|
2318 | @@ -1,3 +1,3 @@ | |
|
2319 | -nodetag 6 | |
|
2320 | nodetag 8 | |
|
2321 | nodetag 7 | |
|
2322 | +nodetag 6 | |
|
2307 | ['reverse(_firstancestors((((6) or (8)) or ((5) or ((7) or (4))))))'] | |
|
2308 | [] | |
|
2309 | <generatorsetdesc-> | |
|
2323 | 2310 | |
|
2324 | 2311 | Test --follow and backward --rev |
|
2325 | 2312 | |
|
2326 | 2313 | $ testlog --follow -r6 -r5 -r7 -r8 -r4 |
|
2327 | 2314 | ['reverse(::(((6) or (5)) or ((7) or ((8) or (4)))))'] |
|
2328 | 2315 | [] |
|
2329 | 2316 | <generatorsetdesc-> |
|
2330 | 2317 | |
|
2331 | 2318 | Test --follow-first and backward --rev |
|
2332 | 2319 | |
|
2333 | 2320 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 |
|
2334 | ['6', '5', '7', '8', '4'] | |
|
2335 | (func | |
|
2336 | (symbol '_firstancestors') | |
|
2337 | (func | |
|
2338 | (symbol 'rev') | |
|
2339 | (symbol '6'))) | |
|
2340 | <filteredset | |
|
2341 | <baseset- [4, 5, 6, 7, 8]>, | |
|
2342 | <generatorsetdesc+>> | |
|
2321 | ['reverse(_firstancestors((((6) or (5)) or ((7) or ((8) or (4))))))'] | |
|
2322 | [] | |
|
2323 | <generatorsetdesc-> | |
|
2343 | 2324 | |
|
2344 | 2325 | Test --follow with --rev of graphlog extension |
|
2345 | 2326 | |
|
2346 | 2327 | $ hg --config extensions.graphlog= glog -qfr1 |
|
2347 | 2328 | o 1:216d4c92cf98 |
|
2348 | 2329 | | |
|
2349 | 2330 | o 0:f8035bb17114 |
|
2350 | 2331 | |
|
2351 | 2332 | |
|
2352 | 2333 | Test subdir |
|
2353 | 2334 | |
|
2354 | 2335 | $ hg up -q 3 |
|
2355 | 2336 | $ cd dir |
|
2356 | 2337 | $ testlog . |
|
2357 | 2338 | [] |
|
2358 | 2339 | (func |
|
2359 | 2340 | (symbol '_matchfiles') |
|
2360 | 2341 | (list |
|
2361 | 2342 | (string 'r:') |
|
2362 | 2343 | (string 'd:relpath') |
|
2363 | 2344 | (string 'p:.'))) |
|
2364 | 2345 | <filteredset |
|
2365 | 2346 | <spanset- 0:9>, |
|
2366 | 2347 | <matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=None>> |
|
2367 | 2348 | $ testlog ../b |
|
2368 | 2349 | [] |
|
2369 | 2350 | (func |
|
2370 | 2351 | (symbol 'filelog') |
|
2371 | 2352 | (string '../b')) |
|
2372 | 2353 | <filteredset |
|
2373 | 2354 | <spanset- 0:9>, set([1])> |
|
2374 | 2355 | $ testlog -f ../b |
|
2375 | 2356 | [] |
|
2376 | 2357 | (func |
|
2377 | 2358 | (symbol 'follow') |
|
2378 | 2359 | (string 'b')) |
|
2379 | 2360 | <filteredset |
|
2380 | 2361 | <spanset- 0:4>, |
|
2381 | 2362 | <generatorsetdesc+>> |
|
2382 | 2363 | $ cd .. |
|
2383 | 2364 | |
|
2384 | 2365 | Test --hidden |
|
2385 | 2366 | (enable obsolete) |
|
2386 | 2367 | |
|
2387 | 2368 | $ cat >> $HGRCPATH << EOF |
|
2388 | 2369 | > [experimental] |
|
2389 | 2370 | > evolution.createmarkers=True |
|
2390 | 2371 | > EOF |
|
2391 | 2372 | |
|
2392 | 2373 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2393 | 2374 | obsoleted 1 changesets |
|
2394 | 2375 | $ testlog |
|
2395 | 2376 | [] |
|
2396 | 2377 | [] |
|
2397 | 2378 | <spanset- 0:9> |
|
2398 | 2379 | $ testlog --hidden |
|
2399 | 2380 | [] |
|
2400 | 2381 | [] |
|
2401 | 2382 | <spanset- 0:9> |
|
2402 | 2383 | $ hg log -G --template '{rev} {desc}\n' |
|
2403 | 2384 | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
2404 | 2385 | | |
|
2405 | 2386 | o 6 merge 5 and 4 |
|
2406 | 2387 | |\ |
|
2407 | 2388 | | o 5 add another e |
|
2408 | 2389 | | | |
|
2409 | 2390 | o | 4 mv dir/b e |
|
2410 | 2391 | |/ |
|
2411 | 2392 | @ 3 mv a b; add d |
|
2412 | 2393 | | |
|
2413 | 2394 | o 2 mv b dir/b |
|
2414 | 2395 | | |
|
2415 | 2396 | o 1 copy a b |
|
2416 | 2397 | | |
|
2417 | 2398 | o 0 add a |
|
2418 | 2399 | |
|
2419 | 2400 | |
|
2420 | 2401 | A template without trailing newline should do something sane |
|
2421 | 2402 | |
|
2422 | 2403 | $ hg log -G -r ::2 --template '{rev} {desc}' |
|
2423 | 2404 | o 2 mv b dir/b |
|
2424 | 2405 | | |
|
2425 | 2406 | o 1 copy a b |
|
2426 | 2407 | | |
|
2427 | 2408 | o 0 add a |
|
2428 | 2409 | |
|
2429 | 2410 | |
|
2430 | 2411 | Extra newlines must be preserved |
|
2431 | 2412 | |
|
2432 | 2413 | $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n' |
|
2433 | 2414 | o |
|
2434 | 2415 | | 2 mv b dir/b |
|
2435 | 2416 | | |
|
2436 | 2417 | o |
|
2437 | 2418 | | 1 copy a b |
|
2438 | 2419 | | |
|
2439 | 2420 | o |
|
2440 | 2421 | 0 add a |
|
2441 | 2422 | |
|
2442 | 2423 | |
|
2443 | 2424 | The almost-empty template should do something sane too ... |
|
2444 | 2425 | |
|
2445 | 2426 | $ hg log -G -r ::2 --template '\n' |
|
2446 | 2427 | o |
|
2447 | 2428 | | |
|
2448 | 2429 | o |
|
2449 | 2430 | | |
|
2450 | 2431 | o |
|
2451 | 2432 | |
|
2452 | 2433 | |
|
2453 | 2434 | issue3772 |
|
2454 | 2435 | |
|
2455 | 2436 | $ hg log -G -r :null |
|
2456 | 2437 | o changeset: 0:f8035bb17114 |
|
2457 | 2438 | | user: test |
|
2458 | 2439 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2459 | 2440 | | summary: add a |
|
2460 | 2441 | | |
|
2461 | 2442 | o changeset: -1:000000000000 |
|
2462 | 2443 | user: |
|
2463 | 2444 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2464 | 2445 | |
|
2465 | 2446 | $ hg log -G -r null:null |
|
2466 | 2447 | o changeset: -1:000000000000 |
|
2467 | 2448 | user: |
|
2468 | 2449 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2469 | 2450 | |
|
2470 | 2451 | |
|
2471 | 2452 | should not draw line down to null due to the magic of fullreposet |
|
2472 | 2453 | |
|
2473 | 2454 | $ hg log -G -r 'all()' | tail -6 |
|
2474 | 2455 | | |
|
2475 | 2456 | o changeset: 0:f8035bb17114 |
|
2476 | 2457 | user: test |
|
2477 | 2458 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2478 | 2459 | summary: add a |
|
2479 | 2460 | |
|
2480 | 2461 | |
|
2481 | 2462 | $ hg log -G -r 'branch(default)' | tail -6 |
|
2482 | 2463 | | |
|
2483 | 2464 | o changeset: 0:f8035bb17114 |
|
2484 | 2465 | user: test |
|
2485 | 2466 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2486 | 2467 | summary: add a |
|
2487 | 2468 | |
|
2488 | 2469 | |
|
2489 | 2470 | working-directory revision |
|
2490 | 2471 | |
|
2491 | 2472 | $ hg log -G -qr '. + wdir()' |
|
2492 | 2473 | o 2147483647:ffffffffffff |
|
2493 | 2474 | | |
|
2494 | 2475 | @ 3:5918b8d165d1 |
|
2495 | 2476 | | |
|
2496 | 2477 | ~ |
|
2497 | 2478 | |
|
2498 | 2479 | node template with changeset_printer: |
|
2499 | 2480 | |
|
2500 | 2481 | $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"' |
|
2501 | 2482 | 7 7:02dbb8e276b8 |
|
2502 | 2483 | | |
|
2503 | 2484 | 6 6:fc281d8ff18d |
|
2504 | 2485 | |\ |
|
2505 | 2486 | | ~ |
|
2506 | 2487 | 5 5:99b31f1c2782 |
|
2507 | 2488 | | |
|
2508 | 2489 | ~ |
|
2509 | 2490 | |
|
2510 | 2491 | node template with changeset_templater (shared cache variable): |
|
2511 | 2492 | |
|
2512 | 2493 | $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ |
|
2513 | 2494 | > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' |
|
2514 | 2495 | o 7 foo-bar+1 |
|
2515 | 2496 | | |
|
2516 | 2497 | # 6 foo-bar+0 |
|
2517 | 2498 | |\ |
|
2518 | 2499 | | ~ |
|
2519 | 2500 | o 5 null+5 |
|
2520 | 2501 | | |
|
2521 | 2502 | ~ |
|
2522 | 2503 | |
|
2523 | 2504 | label() should just work in node template: |
|
2524 | 2505 | |
|
2525 | 2506 | $ hg log -Gqr 7 --config extensions.color= --color=debug \ |
|
2526 | 2507 | > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' |
|
2527 | 2508 | [branch.default|7] [log.node|7:02dbb8e276b8] |
|
2528 | 2509 | | |
|
2529 | 2510 | ~ |
|
2530 | 2511 | |
|
2531 | 2512 | $ cd .. |
|
2532 | 2513 | |
|
2533 | 2514 | change graph edge styling |
|
2534 | 2515 | |
|
2535 | 2516 | $ cd repo |
|
2536 | 2517 | $ cat << EOF >> $HGRCPATH |
|
2537 | 2518 | > [experimental] |
|
2538 | 2519 | > graphstyle.parent = | |
|
2539 | 2520 | > graphstyle.grandparent = : |
|
2540 | 2521 | > graphstyle.missing = |
|
2541 | 2522 | > EOF |
|
2542 | 2523 | $ hg log -G -r 'file("a")' -m |
|
2543 | 2524 | @ changeset: 36:08a19a744424 |
|
2544 | 2525 | : branch: branch |
|
2545 | 2526 | : tag: tip |
|
2546 | 2527 | : parent: 35:9159c3644c5e |
|
2547 | 2528 | : parent: 35:9159c3644c5e |
|
2548 | 2529 | : user: test |
|
2549 | 2530 | : date: Thu Jan 01 00:00:36 1970 +0000 |
|
2550 | 2531 | : summary: (36) buggy merge: identical parents |
|
2551 | 2532 | : |
|
2552 | 2533 | o changeset: 32:d06dffa21a31 |
|
2553 | 2534 | |\ parent: 27:886ed638191b |
|
2554 | 2535 | | : parent: 31:621d83e11f67 |
|
2555 | 2536 | | : user: test |
|
2556 | 2537 | | : date: Thu Jan 01 00:00:32 1970 +0000 |
|
2557 | 2538 | | : summary: (32) expand |
|
2558 | 2539 | | : |
|
2559 | 2540 | o : changeset: 31:621d83e11f67 |
|
2560 | 2541 | |\: parent: 21:d42a756af44d |
|
2561 | 2542 | | : parent: 30:6e11cd4b648f |
|
2562 | 2543 | | : user: test |
|
2563 | 2544 | | : date: Thu Jan 01 00:00:31 1970 +0000 |
|
2564 | 2545 | | : summary: (31) expand |
|
2565 | 2546 | | : |
|
2566 | 2547 | o : changeset: 30:6e11cd4b648f |
|
2567 | 2548 | |\ \ parent: 28:44ecd0b9ae99 |
|
2568 | 2549 | | ~ : parent: 29:cd9bb2be7593 |
|
2569 | 2550 | | : user: test |
|
2570 | 2551 | | : date: Thu Jan 01 00:00:30 1970 +0000 |
|
2571 | 2552 | | : summary: (30) expand |
|
2572 | 2553 | | / |
|
2573 | 2554 | o : changeset: 28:44ecd0b9ae99 |
|
2574 | 2555 | |\ \ parent: 1:6db2ef61d156 |
|
2575 | 2556 | | ~ : parent: 26:7f25b6c2f0b9 |
|
2576 | 2557 | | : user: test |
|
2577 | 2558 | | : date: Thu Jan 01 00:00:28 1970 +0000 |
|
2578 | 2559 | | : summary: (28) merge zero known |
|
2579 | 2560 | | / |
|
2580 | 2561 | o : changeset: 26:7f25b6c2f0b9 |
|
2581 | 2562 | |\ \ parent: 18:1aa84d96232a |
|
2582 | 2563 | | | : parent: 25:91da8ed57247 |
|
2583 | 2564 | | | : user: test |
|
2584 | 2565 | | | : date: Thu Jan 01 00:00:26 1970 +0000 |
|
2585 | 2566 | | | : summary: (26) merge one known; far right |
|
2586 | 2567 | | | : |
|
2587 | 2568 | | o : changeset: 25:91da8ed57247 |
|
2588 | 2569 | | |\: parent: 21:d42a756af44d |
|
2589 | 2570 | | | : parent: 24:a9c19a3d96b7 |
|
2590 | 2571 | | | : user: test |
|
2591 | 2572 | | | : date: Thu Jan 01 00:00:25 1970 +0000 |
|
2592 | 2573 | | | : summary: (25) merge one known; far left |
|
2593 | 2574 | | | : |
|
2594 | 2575 | | o : changeset: 24:a9c19a3d96b7 |
|
2595 | 2576 | | |\ \ parent: 0:e6eb3150255d |
|
2596 | 2577 | | | ~ : parent: 23:a01cddf0766d |
|
2597 | 2578 | | | : user: test |
|
2598 | 2579 | | | : date: Thu Jan 01 00:00:24 1970 +0000 |
|
2599 | 2580 | | | : summary: (24) merge one known; immediate right |
|
2600 | 2581 | | | / |
|
2601 | 2582 | | o : changeset: 23:a01cddf0766d |
|
2602 | 2583 | | |\ \ parent: 1:6db2ef61d156 |
|
2603 | 2584 | | | ~ : parent: 22:e0d9cccacb5d |
|
2604 | 2585 | | | : user: test |
|
2605 | 2586 | | | : date: Thu Jan 01 00:00:23 1970 +0000 |
|
2606 | 2587 | | | : summary: (23) merge one known; immediate left |
|
2607 | 2588 | | | / |
|
2608 | 2589 | | o : changeset: 22:e0d9cccacb5d |
|
2609 | 2590 | |/:/ parent: 18:1aa84d96232a |
|
2610 | 2591 | | : parent: 21:d42a756af44d |
|
2611 | 2592 | | : user: test |
|
2612 | 2593 | | : date: Thu Jan 01 00:00:22 1970 +0000 |
|
2613 | 2594 | | : summary: (22) merge two known; one far left, one far right |
|
2614 | 2595 | | : |
|
2615 | 2596 | | o changeset: 21:d42a756af44d |
|
2616 | 2597 | | |\ parent: 19:31ddc2c1573b |
|
2617 | 2598 | | | | parent: 20:d30ed6450e32 |
|
2618 | 2599 | | | | user: test |
|
2619 | 2600 | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
2620 | 2601 | | | | summary: (21) expand |
|
2621 | 2602 | | | | |
|
2622 | 2603 | +---o changeset: 20:d30ed6450e32 |
|
2623 | 2604 | | | | parent: 0:e6eb3150255d |
|
2624 | 2605 | | | ~ parent: 18:1aa84d96232a |
|
2625 | 2606 | | | user: test |
|
2626 | 2607 | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
2627 | 2608 | | | summary: (20) merge two known; two far right |
|
2628 | 2609 | | | |
|
2629 | 2610 | | o changeset: 19:31ddc2c1573b |
|
2630 | 2611 | | |\ parent: 15:1dda3f72782d |
|
2631 | 2612 | | | | parent: 17:44765d7c06e0 |
|
2632 | 2613 | | | | user: test |
|
2633 | 2614 | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
2634 | 2615 | | | | summary: (19) expand |
|
2635 | 2616 | | | | |
|
2636 | 2617 | o | | changeset: 18:1aa84d96232a |
|
2637 | 2618 | |\| | parent: 1:6db2ef61d156 |
|
2638 | 2619 | ~ | | parent: 15:1dda3f72782d |
|
2639 | 2620 | | | user: test |
|
2640 | 2621 | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
2641 | 2622 | | | summary: (18) merge two known; two far left |
|
2642 | 2623 | / / |
|
2643 | 2624 | | o changeset: 17:44765d7c06e0 |
|
2644 | 2625 | | |\ parent: 12:86b91144a6e9 |
|
2645 | 2626 | | | | parent: 16:3677d192927d |
|
2646 | 2627 | | | | user: test |
|
2647 | 2628 | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
2648 | 2629 | | | | summary: (17) expand |
|
2649 | 2630 | | | | |
|
2650 | 2631 | | | o changeset: 16:3677d192927d |
|
2651 | 2632 | | | |\ parent: 0:e6eb3150255d |
|
2652 | 2633 | | | ~ ~ parent: 1:6db2ef61d156 |
|
2653 | 2634 | | | user: test |
|
2654 | 2635 | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
2655 | 2636 | | | summary: (16) merge two known; one immediate right, one near right |
|
2656 | 2637 | | | |
|
2657 | 2638 | o | changeset: 15:1dda3f72782d |
|
2658 | 2639 | |\ \ parent: 13:22d8966a97e3 |
|
2659 | 2640 | | | | parent: 14:8eac370358ef |
|
2660 | 2641 | | | | user: test |
|
2661 | 2642 | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
2662 | 2643 | | | | summary: (15) expand |
|
2663 | 2644 | | | | |
|
2664 | 2645 | | o | changeset: 14:8eac370358ef |
|
2665 | 2646 | | |\| parent: 0:e6eb3150255d |
|
2666 | 2647 | | ~ | parent: 12:86b91144a6e9 |
|
2667 | 2648 | | | user: test |
|
2668 | 2649 | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
2669 | 2650 | | | summary: (14) merge two known; one immediate right, one far right |
|
2670 | 2651 | | / |
|
2671 | 2652 | o | changeset: 13:22d8966a97e3 |
|
2672 | 2653 | |\ \ parent: 9:7010c0af0a35 |
|
2673 | 2654 | | | | parent: 11:832d76e6bdf2 |
|
2674 | 2655 | | | | user: test |
|
2675 | 2656 | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
2676 | 2657 | | | | summary: (13) expand |
|
2677 | 2658 | | | | |
|
2678 | 2659 | +---o changeset: 12:86b91144a6e9 |
|
2679 | 2660 | | | | parent: 1:6db2ef61d156 |
|
2680 | 2661 | | | ~ parent: 9:7010c0af0a35 |
|
2681 | 2662 | | | user: test |
|
2682 | 2663 | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
2683 | 2664 | | | summary: (12) merge two known; one immediate right, one far left |
|
2684 | 2665 | | | |
|
2685 | 2666 | | o changeset: 11:832d76e6bdf2 |
|
2686 | 2667 | | |\ parent: 6:b105a072e251 |
|
2687 | 2668 | | | | parent: 10:74c64d036d72 |
|
2688 | 2669 | | | | user: test |
|
2689 | 2670 | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
2690 | 2671 | | | | summary: (11) expand |
|
2691 | 2672 | | | | |
|
2692 | 2673 | | | o changeset: 10:74c64d036d72 |
|
2693 | 2674 | | |/| parent: 0:e6eb3150255d |
|
2694 | 2675 | | | ~ parent: 6:b105a072e251 |
|
2695 | 2676 | | | user: test |
|
2696 | 2677 | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
2697 | 2678 | | | summary: (10) merge two known; one immediate left, one near right |
|
2698 | 2679 | | | |
|
2699 | 2680 | o | changeset: 9:7010c0af0a35 |
|
2700 | 2681 | |\ \ parent: 7:b632bb1b1224 |
|
2701 | 2682 | | | | parent: 8:7a0b11f71937 |
|
2702 | 2683 | | | | user: test |
|
2703 | 2684 | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
2704 | 2685 | | | | summary: (9) expand |
|
2705 | 2686 | | | | |
|
2706 | 2687 | | o | changeset: 8:7a0b11f71937 |
|
2707 | 2688 | |/| | parent: 0:e6eb3150255d |
|
2708 | 2689 | | ~ | parent: 7:b632bb1b1224 |
|
2709 | 2690 | | | user: test |
|
2710 | 2691 | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
2711 | 2692 | | | summary: (8) merge two known; one immediate left, one far right |
|
2712 | 2693 | | / |
|
2713 | 2694 | o | changeset: 7:b632bb1b1224 |
|
2714 | 2695 | |\ \ parent: 2:3d9a33b8d1e1 |
|
2715 | 2696 | | ~ | parent: 5:4409d547b708 |
|
2716 | 2697 | | | user: test |
|
2717 | 2698 | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
2718 | 2699 | | | summary: (7) expand |
|
2719 | 2700 | | / |
|
2720 | 2701 | | o changeset: 6:b105a072e251 |
|
2721 | 2702 | |/| parent: 2:3d9a33b8d1e1 |
|
2722 | 2703 | | ~ parent: 5:4409d547b708 |
|
2723 | 2704 | | user: test |
|
2724 | 2705 | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
2725 | 2706 | | summary: (6) merge two known; one immediate left, one far left |
|
2726 | 2707 | | |
|
2727 | 2708 | o changeset: 5:4409d547b708 |
|
2728 | 2709 | |\ parent: 3:27eef8ed80b4 |
|
2729 | 2710 | | ~ parent: 4:26a8bac39d9f |
|
2730 | 2711 | | user: test |
|
2731 | 2712 | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
2732 | 2713 | | summary: (5) expand |
|
2733 | 2714 | | |
|
2734 | 2715 | o changeset: 4:26a8bac39d9f |
|
2735 | 2716 | |\ parent: 1:6db2ef61d156 |
|
2736 | 2717 | ~ ~ parent: 3:27eef8ed80b4 |
|
2737 | 2718 | user: test |
|
2738 | 2719 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
2739 | 2720 | summary: (4) merge two known; one immediate left, one immediate right |
|
2740 | 2721 | |
|
2741 | 2722 | |
|
2742 | 2723 | Setting HGPLAIN ignores graphmod styling: |
|
2743 | 2724 | |
|
2744 | 2725 | $ HGPLAIN=1 hg log -G -r 'file("a")' -m |
|
2745 | 2726 | @ changeset: 36:08a19a744424 |
|
2746 | 2727 | | branch: branch |
|
2747 | 2728 | | tag: tip |
|
2748 | 2729 | | parent: 35:9159c3644c5e |
|
2749 | 2730 | | parent: 35:9159c3644c5e |
|
2750 | 2731 | | user: test |
|
2751 | 2732 | | date: Thu Jan 01 00:00:36 1970 +0000 |
|
2752 | 2733 | | summary: (36) buggy merge: identical parents |
|
2753 | 2734 | | |
|
2754 | 2735 | o changeset: 32:d06dffa21a31 |
|
2755 | 2736 | |\ parent: 27:886ed638191b |
|
2756 | 2737 | | | parent: 31:621d83e11f67 |
|
2757 | 2738 | | | user: test |
|
2758 | 2739 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
2759 | 2740 | | | summary: (32) expand |
|
2760 | 2741 | | | |
|
2761 | 2742 | o | changeset: 31:621d83e11f67 |
|
2762 | 2743 | |\| parent: 21:d42a756af44d |
|
2763 | 2744 | | | parent: 30:6e11cd4b648f |
|
2764 | 2745 | | | user: test |
|
2765 | 2746 | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
2766 | 2747 | | | summary: (31) expand |
|
2767 | 2748 | | | |
|
2768 | 2749 | o | changeset: 30:6e11cd4b648f |
|
2769 | 2750 | |\ \ parent: 28:44ecd0b9ae99 |
|
2770 | 2751 | | | | parent: 29:cd9bb2be7593 |
|
2771 | 2752 | | | | user: test |
|
2772 | 2753 | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
2773 | 2754 | | | | summary: (30) expand |
|
2774 | 2755 | | | | |
|
2775 | 2756 | o | | changeset: 28:44ecd0b9ae99 |
|
2776 | 2757 | |\ \ \ parent: 1:6db2ef61d156 |
|
2777 | 2758 | | | | | parent: 26:7f25b6c2f0b9 |
|
2778 | 2759 | | | | | user: test |
|
2779 | 2760 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
2780 | 2761 | | | | | summary: (28) merge zero known |
|
2781 | 2762 | | | | | |
|
2782 | 2763 | o | | | changeset: 26:7f25b6c2f0b9 |
|
2783 | 2764 | |\ \ \ \ parent: 18:1aa84d96232a |
|
2784 | 2765 | | | | | | parent: 25:91da8ed57247 |
|
2785 | 2766 | | | | | | user: test |
|
2786 | 2767 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
2787 | 2768 | | | | | | summary: (26) merge one known; far right |
|
2788 | 2769 | | | | | | |
|
2789 | 2770 | | o-----+ changeset: 25:91da8ed57247 |
|
2790 | 2771 | | | | | | parent: 21:d42a756af44d |
|
2791 | 2772 | | | | | | parent: 24:a9c19a3d96b7 |
|
2792 | 2773 | | | | | | user: test |
|
2793 | 2774 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
2794 | 2775 | | | | | | summary: (25) merge one known; far left |
|
2795 | 2776 | | | | | | |
|
2796 | 2777 | | o | | | changeset: 24:a9c19a3d96b7 |
|
2797 | 2778 | | |\ \ \ \ parent: 0:e6eb3150255d |
|
2798 | 2779 | | | | | | | parent: 23:a01cddf0766d |
|
2799 | 2780 | | | | | | | user: test |
|
2800 | 2781 | | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
2801 | 2782 | | | | | | | summary: (24) merge one known; immediate right |
|
2802 | 2783 | | | | | | | |
|
2803 | 2784 | | o---+ | | changeset: 23:a01cddf0766d |
|
2804 | 2785 | | | | | | | parent: 1:6db2ef61d156 |
|
2805 | 2786 | | | | | | | parent: 22:e0d9cccacb5d |
|
2806 | 2787 | | | | | | | user: test |
|
2807 | 2788 | | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
2808 | 2789 | | | | | | | summary: (23) merge one known; immediate left |
|
2809 | 2790 | | | | | | | |
|
2810 | 2791 | | o-------+ changeset: 22:e0d9cccacb5d |
|
2811 | 2792 | | | | | | | parent: 18:1aa84d96232a |
|
2812 | 2793 | |/ / / / / parent: 21:d42a756af44d |
|
2813 | 2794 | | | | | | user: test |
|
2814 | 2795 | | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
2815 | 2796 | | | | | | summary: (22) merge two known; one far left, one far right |
|
2816 | 2797 | | | | | | |
|
2817 | 2798 | | | | | o changeset: 21:d42a756af44d |
|
2818 | 2799 | | | | | |\ parent: 19:31ddc2c1573b |
|
2819 | 2800 | | | | | | | parent: 20:d30ed6450e32 |
|
2820 | 2801 | | | | | | | user: test |
|
2821 | 2802 | | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
2822 | 2803 | | | | | | | summary: (21) expand |
|
2823 | 2804 | | | | | | | |
|
2824 | 2805 | +-+-------o changeset: 20:d30ed6450e32 |
|
2825 | 2806 | | | | | | parent: 0:e6eb3150255d |
|
2826 | 2807 | | | | | | parent: 18:1aa84d96232a |
|
2827 | 2808 | | | | | | user: test |
|
2828 | 2809 | | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
2829 | 2810 | | | | | | summary: (20) merge two known; two far right |
|
2830 | 2811 | | | | | | |
|
2831 | 2812 | | | | | o changeset: 19:31ddc2c1573b |
|
2832 | 2813 | | | | | |\ parent: 15:1dda3f72782d |
|
2833 | 2814 | | | | | | | parent: 17:44765d7c06e0 |
|
2834 | 2815 | | | | | | | user: test |
|
2835 | 2816 | | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
2836 | 2817 | | | | | | | summary: (19) expand |
|
2837 | 2818 | | | | | | | |
|
2838 | 2819 | o---+---+ | changeset: 18:1aa84d96232a |
|
2839 | 2820 | | | | | | parent: 1:6db2ef61d156 |
|
2840 | 2821 | / / / / / parent: 15:1dda3f72782d |
|
2841 | 2822 | | | | | | user: test |
|
2842 | 2823 | | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
2843 | 2824 | | | | | | summary: (18) merge two known; two far left |
|
2844 | 2825 | | | | | | |
|
2845 | 2826 | | | | | o changeset: 17:44765d7c06e0 |
|
2846 | 2827 | | | | | |\ parent: 12:86b91144a6e9 |
|
2847 | 2828 | | | | | | | parent: 16:3677d192927d |
|
2848 | 2829 | | | | | | | user: test |
|
2849 | 2830 | | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
2850 | 2831 | | | | | | | summary: (17) expand |
|
2851 | 2832 | | | | | | | |
|
2852 | 2833 | +-+-------o changeset: 16:3677d192927d |
|
2853 | 2834 | | | | | | parent: 0:e6eb3150255d |
|
2854 | 2835 | | | | | | parent: 1:6db2ef61d156 |
|
2855 | 2836 | | | | | | user: test |
|
2856 | 2837 | | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
2857 | 2838 | | | | | | summary: (16) merge two known; one immediate right, one near right |
|
2858 | 2839 | | | | | | |
|
2859 | 2840 | | | | o | changeset: 15:1dda3f72782d |
|
2860 | 2841 | | | | |\ \ parent: 13:22d8966a97e3 |
|
2861 | 2842 | | | | | | | parent: 14:8eac370358ef |
|
2862 | 2843 | | | | | | | user: test |
|
2863 | 2844 | | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
2864 | 2845 | | | | | | | summary: (15) expand |
|
2865 | 2846 | | | | | | | |
|
2866 | 2847 | +-------o | changeset: 14:8eac370358ef |
|
2867 | 2848 | | | | | |/ parent: 0:e6eb3150255d |
|
2868 | 2849 | | | | | | parent: 12:86b91144a6e9 |
|
2869 | 2850 | | | | | | user: test |
|
2870 | 2851 | | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
2871 | 2852 | | | | | | summary: (14) merge two known; one immediate right, one far right |
|
2872 | 2853 | | | | | | |
|
2873 | 2854 | | | | o | changeset: 13:22d8966a97e3 |
|
2874 | 2855 | | | | |\ \ parent: 9:7010c0af0a35 |
|
2875 | 2856 | | | | | | | parent: 11:832d76e6bdf2 |
|
2876 | 2857 | | | | | | | user: test |
|
2877 | 2858 | | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
2878 | 2859 | | | | | | | summary: (13) expand |
|
2879 | 2860 | | | | | | | |
|
2880 | 2861 | | +---+---o changeset: 12:86b91144a6e9 |
|
2881 | 2862 | | | | | | parent: 1:6db2ef61d156 |
|
2882 | 2863 | | | | | | parent: 9:7010c0af0a35 |
|
2883 | 2864 | | | | | | user: test |
|
2884 | 2865 | | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
2885 | 2866 | | | | | | summary: (12) merge two known; one immediate right, one far left |
|
2886 | 2867 | | | | | | |
|
2887 | 2868 | | | | | o changeset: 11:832d76e6bdf2 |
|
2888 | 2869 | | | | | |\ parent: 6:b105a072e251 |
|
2889 | 2870 | | | | | | | parent: 10:74c64d036d72 |
|
2890 | 2871 | | | | | | | user: test |
|
2891 | 2872 | | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
2892 | 2873 | | | | | | | summary: (11) expand |
|
2893 | 2874 | | | | | | | |
|
2894 | 2875 | +---------o changeset: 10:74c64d036d72 |
|
2895 | 2876 | | | | | |/ parent: 0:e6eb3150255d |
|
2896 | 2877 | | | | | | parent: 6:b105a072e251 |
|
2897 | 2878 | | | | | | user: test |
|
2898 | 2879 | | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
2899 | 2880 | | | | | | summary: (10) merge two known; one immediate left, one near right |
|
2900 | 2881 | | | | | | |
|
2901 | 2882 | | | | o | changeset: 9:7010c0af0a35 |
|
2902 | 2883 | | | | |\ \ parent: 7:b632bb1b1224 |
|
2903 | 2884 | | | | | | | parent: 8:7a0b11f71937 |
|
2904 | 2885 | | | | | | | user: test |
|
2905 | 2886 | | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
2906 | 2887 | | | | | | | summary: (9) expand |
|
2907 | 2888 | | | | | | | |
|
2908 | 2889 | +-------o | changeset: 8:7a0b11f71937 |
|
2909 | 2890 | | | | |/ / parent: 0:e6eb3150255d |
|
2910 | 2891 | | | | | | parent: 7:b632bb1b1224 |
|
2911 | 2892 | | | | | | user: test |
|
2912 | 2893 | | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
2913 | 2894 | | | | | | summary: (8) merge two known; one immediate left, one far right |
|
2914 | 2895 | | | | | | |
|
2915 | 2896 | | | | o | changeset: 7:b632bb1b1224 |
|
2916 | 2897 | | | | |\ \ parent: 2:3d9a33b8d1e1 |
|
2917 | 2898 | | | | | | | parent: 5:4409d547b708 |
|
2918 | 2899 | | | | | | | user: test |
|
2919 | 2900 | | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
2920 | 2901 | | | | | | | summary: (7) expand |
|
2921 | 2902 | | | | | | | |
|
2922 | 2903 | | | | +---o changeset: 6:b105a072e251 |
|
2923 | 2904 | | | | | |/ parent: 2:3d9a33b8d1e1 |
|
2924 | 2905 | | | | | | parent: 5:4409d547b708 |
|
2925 | 2906 | | | | | | user: test |
|
2926 | 2907 | | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
2927 | 2908 | | | | | | summary: (6) merge two known; one immediate left, one far left |
|
2928 | 2909 | | | | | | |
|
2929 | 2910 | | | | o | changeset: 5:4409d547b708 |
|
2930 | 2911 | | | | |\ \ parent: 3:27eef8ed80b4 |
|
2931 | 2912 | | | | | | | parent: 4:26a8bac39d9f |
|
2932 | 2913 | | | | | | | user: test |
|
2933 | 2914 | | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
2934 | 2915 | | | | | | | summary: (5) expand |
|
2935 | 2916 | | | | | | | |
|
2936 | 2917 | | +---o | | changeset: 4:26a8bac39d9f |
|
2937 | 2918 | | | | |/ / parent: 1:6db2ef61d156 |
|
2938 | 2919 | | | | | | parent: 3:27eef8ed80b4 |
|
2939 | 2920 | | | | | | user: test |
|
2940 | 2921 | | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
2941 | 2922 | | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
2942 | 2923 | | | | | | |
|
2943 | 2924 | |
|
2944 | 2925 | .. unless HGPLAINEXCEPT=graph is set: |
|
2945 | 2926 | |
|
2946 | 2927 | $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m |
|
2947 | 2928 | @ changeset: 36:08a19a744424 |
|
2948 | 2929 | : branch: branch |
|
2949 | 2930 | : tag: tip |
|
2950 | 2931 | : parent: 35:9159c3644c5e |
|
2951 | 2932 | : parent: 35:9159c3644c5e |
|
2952 | 2933 | : user: test |
|
2953 | 2934 | : date: Thu Jan 01 00:00:36 1970 +0000 |
|
2954 | 2935 | : summary: (36) buggy merge: identical parents |
|
2955 | 2936 | : |
|
2956 | 2937 | o changeset: 32:d06dffa21a31 |
|
2957 | 2938 | |\ parent: 27:886ed638191b |
|
2958 | 2939 | | : parent: 31:621d83e11f67 |
|
2959 | 2940 | | : user: test |
|
2960 | 2941 | | : date: Thu Jan 01 00:00:32 1970 +0000 |
|
2961 | 2942 | | : summary: (32) expand |
|
2962 | 2943 | | : |
|
2963 | 2944 | o : changeset: 31:621d83e11f67 |
|
2964 | 2945 | |\: parent: 21:d42a756af44d |
|
2965 | 2946 | | : parent: 30:6e11cd4b648f |
|
2966 | 2947 | | : user: test |
|
2967 | 2948 | | : date: Thu Jan 01 00:00:31 1970 +0000 |
|
2968 | 2949 | | : summary: (31) expand |
|
2969 | 2950 | | : |
|
2970 | 2951 | o : changeset: 30:6e11cd4b648f |
|
2971 | 2952 | |\ \ parent: 28:44ecd0b9ae99 |
|
2972 | 2953 | | ~ : parent: 29:cd9bb2be7593 |
|
2973 | 2954 | | : user: test |
|
2974 | 2955 | | : date: Thu Jan 01 00:00:30 1970 +0000 |
|
2975 | 2956 | | : summary: (30) expand |
|
2976 | 2957 | | / |
|
2977 | 2958 | o : changeset: 28:44ecd0b9ae99 |
|
2978 | 2959 | |\ \ parent: 1:6db2ef61d156 |
|
2979 | 2960 | | ~ : parent: 26:7f25b6c2f0b9 |
|
2980 | 2961 | | : user: test |
|
2981 | 2962 | | : date: Thu Jan 01 00:00:28 1970 +0000 |
|
2982 | 2963 | | : summary: (28) merge zero known |
|
2983 | 2964 | | / |
|
2984 | 2965 | o : changeset: 26:7f25b6c2f0b9 |
|
2985 | 2966 | |\ \ parent: 18:1aa84d96232a |
|
2986 | 2967 | | | : parent: 25:91da8ed57247 |
|
2987 | 2968 | | | : user: test |
|
2988 | 2969 | | | : date: Thu Jan 01 00:00:26 1970 +0000 |
|
2989 | 2970 | | | : summary: (26) merge one known; far right |
|
2990 | 2971 | | | : |
|
2991 | 2972 | | o : changeset: 25:91da8ed57247 |
|
2992 | 2973 | | |\: parent: 21:d42a756af44d |
|
2993 | 2974 | | | : parent: 24:a9c19a3d96b7 |
|
2994 | 2975 | | | : user: test |
|
2995 | 2976 | | | : date: Thu Jan 01 00:00:25 1970 +0000 |
|
2996 | 2977 | | | : summary: (25) merge one known; far left |
|
2997 | 2978 | | | : |
|
2998 | 2979 | | o : changeset: 24:a9c19a3d96b7 |
|
2999 | 2980 | | |\ \ parent: 0:e6eb3150255d |
|
3000 | 2981 | | | ~ : parent: 23:a01cddf0766d |
|
3001 | 2982 | | | : user: test |
|
3002 | 2983 | | | : date: Thu Jan 01 00:00:24 1970 +0000 |
|
3003 | 2984 | | | : summary: (24) merge one known; immediate right |
|
3004 | 2985 | | | / |
|
3005 | 2986 | | o : changeset: 23:a01cddf0766d |
|
3006 | 2987 | | |\ \ parent: 1:6db2ef61d156 |
|
3007 | 2988 | | | ~ : parent: 22:e0d9cccacb5d |
|
3008 | 2989 | | | : user: test |
|
3009 | 2990 | | | : date: Thu Jan 01 00:00:23 1970 +0000 |
|
3010 | 2991 | | | : summary: (23) merge one known; immediate left |
|
3011 | 2992 | | | / |
|
3012 | 2993 | | o : changeset: 22:e0d9cccacb5d |
|
3013 | 2994 | |/:/ parent: 18:1aa84d96232a |
|
3014 | 2995 | | : parent: 21:d42a756af44d |
|
3015 | 2996 | | : user: test |
|
3016 | 2997 | | : date: Thu Jan 01 00:00:22 1970 +0000 |
|
3017 | 2998 | | : summary: (22) merge two known; one far left, one far right |
|
3018 | 2999 | | : |
|
3019 | 3000 | | o changeset: 21:d42a756af44d |
|
3020 | 3001 | | |\ parent: 19:31ddc2c1573b |
|
3021 | 3002 | | | | parent: 20:d30ed6450e32 |
|
3022 | 3003 | | | | user: test |
|
3023 | 3004 | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
3024 | 3005 | | | | summary: (21) expand |
|
3025 | 3006 | | | | |
|
3026 | 3007 | +---o changeset: 20:d30ed6450e32 |
|
3027 | 3008 | | | | parent: 0:e6eb3150255d |
|
3028 | 3009 | | | ~ parent: 18:1aa84d96232a |
|
3029 | 3010 | | | user: test |
|
3030 | 3011 | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
3031 | 3012 | | | summary: (20) merge two known; two far right |
|
3032 | 3013 | | | |
|
3033 | 3014 | | o changeset: 19:31ddc2c1573b |
|
3034 | 3015 | | |\ parent: 15:1dda3f72782d |
|
3035 | 3016 | | | | parent: 17:44765d7c06e0 |
|
3036 | 3017 | | | | user: test |
|
3037 | 3018 | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
3038 | 3019 | | | | summary: (19) expand |
|
3039 | 3020 | | | | |
|
3040 | 3021 | o | | changeset: 18:1aa84d96232a |
|
3041 | 3022 | |\| | parent: 1:6db2ef61d156 |
|
3042 | 3023 | ~ | | parent: 15:1dda3f72782d |
|
3043 | 3024 | | | user: test |
|
3044 | 3025 | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
3045 | 3026 | | | summary: (18) merge two known; two far left |
|
3046 | 3027 | / / |
|
3047 | 3028 | | o changeset: 17:44765d7c06e0 |
|
3048 | 3029 | | |\ parent: 12:86b91144a6e9 |
|
3049 | 3030 | | | | parent: 16:3677d192927d |
|
3050 | 3031 | | | | user: test |
|
3051 | 3032 | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
3052 | 3033 | | | | summary: (17) expand |
|
3053 | 3034 | | | | |
|
3054 | 3035 | | | o changeset: 16:3677d192927d |
|
3055 | 3036 | | | |\ parent: 0:e6eb3150255d |
|
3056 | 3037 | | | ~ ~ parent: 1:6db2ef61d156 |
|
3057 | 3038 | | | user: test |
|
3058 | 3039 | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
3059 | 3040 | | | summary: (16) merge two known; one immediate right, one near right |
|
3060 | 3041 | | | |
|
3061 | 3042 | o | changeset: 15:1dda3f72782d |
|
3062 | 3043 | |\ \ parent: 13:22d8966a97e3 |
|
3063 | 3044 | | | | parent: 14:8eac370358ef |
|
3064 | 3045 | | | | user: test |
|
3065 | 3046 | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
3066 | 3047 | | | | summary: (15) expand |
|
3067 | 3048 | | | | |
|
3068 | 3049 | | o | changeset: 14:8eac370358ef |
|
3069 | 3050 | | |\| parent: 0:e6eb3150255d |
|
3070 | 3051 | | ~ | parent: 12:86b91144a6e9 |
|
3071 | 3052 | | | user: test |
|
3072 | 3053 | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
3073 | 3054 | | | summary: (14) merge two known; one immediate right, one far right |
|
3074 | 3055 | | / |
|
3075 | 3056 | o | changeset: 13:22d8966a97e3 |
|
3076 | 3057 | |\ \ parent: 9:7010c0af0a35 |
|
3077 | 3058 | | | | parent: 11:832d76e6bdf2 |
|
3078 | 3059 | | | | user: test |
|
3079 | 3060 | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
3080 | 3061 | | | | summary: (13) expand |
|
3081 | 3062 | | | | |
|
3082 | 3063 | +---o changeset: 12:86b91144a6e9 |
|
3083 | 3064 | | | | parent: 1:6db2ef61d156 |
|
3084 | 3065 | | | ~ parent: 9:7010c0af0a35 |
|
3085 | 3066 | | | user: test |
|
3086 | 3067 | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
3087 | 3068 | | | summary: (12) merge two known; one immediate right, one far left |
|
3088 | 3069 | | | |
|
3089 | 3070 | | o changeset: 11:832d76e6bdf2 |
|
3090 | 3071 | | |\ parent: 6:b105a072e251 |
|
3091 | 3072 | | | | parent: 10:74c64d036d72 |
|
3092 | 3073 | | | | user: test |
|
3093 | 3074 | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
3094 | 3075 | | | | summary: (11) expand |
|
3095 | 3076 | | | | |
|
3096 | 3077 | | | o changeset: 10:74c64d036d72 |
|
3097 | 3078 | | |/| parent: 0:e6eb3150255d |
|
3098 | 3079 | | | ~ parent: 6:b105a072e251 |
|
3099 | 3080 | | | user: test |
|
3100 | 3081 | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
3101 | 3082 | | | summary: (10) merge two known; one immediate left, one near right |
|
3102 | 3083 | | | |
|
3103 | 3084 | o | changeset: 9:7010c0af0a35 |
|
3104 | 3085 | |\ \ parent: 7:b632bb1b1224 |
|
3105 | 3086 | | | | parent: 8:7a0b11f71937 |
|
3106 | 3087 | | | | user: test |
|
3107 | 3088 | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
3108 | 3089 | | | | summary: (9) expand |
|
3109 | 3090 | | | | |
|
3110 | 3091 | | o | changeset: 8:7a0b11f71937 |
|
3111 | 3092 | |/| | parent: 0:e6eb3150255d |
|
3112 | 3093 | | ~ | parent: 7:b632bb1b1224 |
|
3113 | 3094 | | | user: test |
|
3114 | 3095 | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
3115 | 3096 | | | summary: (8) merge two known; one immediate left, one far right |
|
3116 | 3097 | | / |
|
3117 | 3098 | o | changeset: 7:b632bb1b1224 |
|
3118 | 3099 | |\ \ parent: 2:3d9a33b8d1e1 |
|
3119 | 3100 | | ~ | parent: 5:4409d547b708 |
|
3120 | 3101 | | | user: test |
|
3121 | 3102 | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
3122 | 3103 | | | summary: (7) expand |
|
3123 | 3104 | | / |
|
3124 | 3105 | | o changeset: 6:b105a072e251 |
|
3125 | 3106 | |/| parent: 2:3d9a33b8d1e1 |
|
3126 | 3107 | | ~ parent: 5:4409d547b708 |
|
3127 | 3108 | | user: test |
|
3128 | 3109 | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
3129 | 3110 | | summary: (6) merge two known; one immediate left, one far left |
|
3130 | 3111 | | |
|
3131 | 3112 | o changeset: 5:4409d547b708 |
|
3132 | 3113 | |\ parent: 3:27eef8ed80b4 |
|
3133 | 3114 | | ~ parent: 4:26a8bac39d9f |
|
3134 | 3115 | | user: test |
|
3135 | 3116 | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
3136 | 3117 | | summary: (5) expand |
|
3137 | 3118 | | |
|
3138 | 3119 | o changeset: 4:26a8bac39d9f |
|
3139 | 3120 | |\ parent: 1:6db2ef61d156 |
|
3140 | 3121 | ~ ~ parent: 3:27eef8ed80b4 |
|
3141 | 3122 | user: test |
|
3142 | 3123 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
3143 | 3124 | summary: (4) merge two known; one immediate left, one immediate right |
|
3144 | 3125 | |
|
3145 | 3126 | Draw only part of a grandparent line differently with "<N><char>"; only the |
|
3146 | 3127 | last N lines (for positive N) or everything but the first N lines (for |
|
3147 | 3128 | negative N) along the current node use the style, the rest of the edge uses |
|
3148 | 3129 | the parent edge styling. |
|
3149 | 3130 | |
|
3150 | 3131 | Last 3 lines: |
|
3151 | 3132 | |
|
3152 | 3133 | $ cat << EOF >> $HGRCPATH |
|
3153 | 3134 | > [experimental] |
|
3154 | 3135 | > graphstyle.parent = ! |
|
3155 | 3136 | > graphstyle.grandparent = 3. |
|
3156 | 3137 | > graphstyle.missing = |
|
3157 | 3138 | > EOF |
|
3158 | 3139 | $ hg log -G -r '36:18 & file("a")' -m |
|
3159 | 3140 | @ changeset: 36:08a19a744424 |
|
3160 | 3141 | ! branch: branch |
|
3161 | 3142 | ! tag: tip |
|
3162 | 3143 | ! parent: 35:9159c3644c5e |
|
3163 | 3144 | ! parent: 35:9159c3644c5e |
|
3164 | 3145 | ! user: test |
|
3165 | 3146 | . date: Thu Jan 01 00:00:36 1970 +0000 |
|
3166 | 3147 | . summary: (36) buggy merge: identical parents |
|
3167 | 3148 | . |
|
3168 | 3149 | o changeset: 32:d06dffa21a31 |
|
3169 | 3150 | !\ parent: 27:886ed638191b |
|
3170 | 3151 | ! ! parent: 31:621d83e11f67 |
|
3171 | 3152 | ! ! user: test |
|
3172 | 3153 | ! . date: Thu Jan 01 00:00:32 1970 +0000 |
|
3173 | 3154 | ! . summary: (32) expand |
|
3174 | 3155 | ! . |
|
3175 | 3156 | o ! changeset: 31:621d83e11f67 |
|
3176 | 3157 | !\! parent: 21:d42a756af44d |
|
3177 | 3158 | ! ! parent: 30:6e11cd4b648f |
|
3178 | 3159 | ! ! user: test |
|
3179 | 3160 | ! ! date: Thu Jan 01 00:00:31 1970 +0000 |
|
3180 | 3161 | ! ! summary: (31) expand |
|
3181 | 3162 | ! ! |
|
3182 | 3163 | o ! changeset: 30:6e11cd4b648f |
|
3183 | 3164 | !\ \ parent: 28:44ecd0b9ae99 |
|
3184 | 3165 | ! ~ ! parent: 29:cd9bb2be7593 |
|
3185 | 3166 | ! ! user: test |
|
3186 | 3167 | ! ! date: Thu Jan 01 00:00:30 1970 +0000 |
|
3187 | 3168 | ! ! summary: (30) expand |
|
3188 | 3169 | ! / |
|
3189 | 3170 | o ! changeset: 28:44ecd0b9ae99 |
|
3190 | 3171 | !\ \ parent: 1:6db2ef61d156 |
|
3191 | 3172 | ! ~ ! parent: 26:7f25b6c2f0b9 |
|
3192 | 3173 | ! ! user: test |
|
3193 | 3174 | ! ! date: Thu Jan 01 00:00:28 1970 +0000 |
|
3194 | 3175 | ! ! summary: (28) merge zero known |
|
3195 | 3176 | ! / |
|
3196 | 3177 | o ! changeset: 26:7f25b6c2f0b9 |
|
3197 | 3178 | !\ \ parent: 18:1aa84d96232a |
|
3198 | 3179 | ! ! ! parent: 25:91da8ed57247 |
|
3199 | 3180 | ! ! ! user: test |
|
3200 | 3181 | ! ! ! date: Thu Jan 01 00:00:26 1970 +0000 |
|
3201 | 3182 | ! ! ! summary: (26) merge one known; far right |
|
3202 | 3183 | ! ! ! |
|
3203 | 3184 | ! o ! changeset: 25:91da8ed57247 |
|
3204 | 3185 | ! !\! parent: 21:d42a756af44d |
|
3205 | 3186 | ! ! ! parent: 24:a9c19a3d96b7 |
|
3206 | 3187 | ! ! ! user: test |
|
3207 | 3188 | ! ! ! date: Thu Jan 01 00:00:25 1970 +0000 |
|
3208 | 3189 | ! ! ! summary: (25) merge one known; far left |
|
3209 | 3190 | ! ! ! |
|
3210 | 3191 | ! o ! changeset: 24:a9c19a3d96b7 |
|
3211 | 3192 | ! !\ \ parent: 0:e6eb3150255d |
|
3212 | 3193 | ! ! ~ ! parent: 23:a01cddf0766d |
|
3213 | 3194 | ! ! ! user: test |
|
3214 | 3195 | ! ! ! date: Thu Jan 01 00:00:24 1970 +0000 |
|
3215 | 3196 | ! ! ! summary: (24) merge one known; immediate right |
|
3216 | 3197 | ! ! / |
|
3217 | 3198 | ! o ! changeset: 23:a01cddf0766d |
|
3218 | 3199 | ! !\ \ parent: 1:6db2ef61d156 |
|
3219 | 3200 | ! ! ~ ! parent: 22:e0d9cccacb5d |
|
3220 | 3201 | ! ! ! user: test |
|
3221 | 3202 | ! ! ! date: Thu Jan 01 00:00:23 1970 +0000 |
|
3222 | 3203 | ! ! ! summary: (23) merge one known; immediate left |
|
3223 | 3204 | ! ! / |
|
3224 | 3205 | ! o ! changeset: 22:e0d9cccacb5d |
|
3225 | 3206 | !/!/ parent: 18:1aa84d96232a |
|
3226 | 3207 | ! ! parent: 21:d42a756af44d |
|
3227 | 3208 | ! ! user: test |
|
3228 | 3209 | ! ! date: Thu Jan 01 00:00:22 1970 +0000 |
|
3229 | 3210 | ! ! summary: (22) merge two known; one far left, one far right |
|
3230 | 3211 | ! ! |
|
3231 | 3212 | ! o changeset: 21:d42a756af44d |
|
3232 | 3213 | ! !\ parent: 19:31ddc2c1573b |
|
3233 | 3214 | ! ! ! parent: 20:d30ed6450e32 |
|
3234 | 3215 | ! ! ! user: test |
|
3235 | 3216 | ! ! ! date: Thu Jan 01 00:00:21 1970 +0000 |
|
3236 | 3217 | ! ! ! summary: (21) expand |
|
3237 | 3218 | ! ! ! |
|
3238 | 3219 | +---o changeset: 20:d30ed6450e32 |
|
3239 | 3220 | ! ! | parent: 0:e6eb3150255d |
|
3240 | 3221 | ! ! ~ parent: 18:1aa84d96232a |
|
3241 | 3222 | ! ! user: test |
|
3242 | 3223 | ! ! date: Thu Jan 01 00:00:20 1970 +0000 |
|
3243 | 3224 | ! ! summary: (20) merge two known; two far right |
|
3244 | 3225 | ! ! |
|
3245 | 3226 | ! o changeset: 19:31ddc2c1573b |
|
3246 | 3227 | ! |\ parent: 15:1dda3f72782d |
|
3247 | 3228 | ! ~ ~ parent: 17:44765d7c06e0 |
|
3248 | 3229 | ! user: test |
|
3249 | 3230 | ! date: Thu Jan 01 00:00:19 1970 +0000 |
|
3250 | 3231 | ! summary: (19) expand |
|
3251 | 3232 | ! |
|
3252 | 3233 | o changeset: 18:1aa84d96232a |
|
3253 | 3234 | |\ parent: 1:6db2ef61d156 |
|
3254 | 3235 | ~ ~ parent: 15:1dda3f72782d |
|
3255 | 3236 | user: test |
|
3256 | 3237 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
3257 | 3238 | summary: (18) merge two known; two far left |
|
3258 | 3239 | |
|
3259 | 3240 | All but the first 3 lines: |
|
3260 | 3241 | |
|
3261 | 3242 | $ cat << EOF >> $HGRCPATH |
|
3262 | 3243 | > [experimental] |
|
3263 | 3244 | > graphstyle.parent = ! |
|
3264 | 3245 | > graphstyle.grandparent = -3. |
|
3265 | 3246 | > graphstyle.missing = |
|
3266 | 3247 | > EOF |
|
3267 | 3248 | $ hg log -G -r '36:18 & file("a")' -m |
|
3268 | 3249 | @ changeset: 36:08a19a744424 |
|
3269 | 3250 | ! branch: branch |
|
3270 | 3251 | ! tag: tip |
|
3271 | 3252 | . parent: 35:9159c3644c5e |
|
3272 | 3253 | . parent: 35:9159c3644c5e |
|
3273 | 3254 | . user: test |
|
3274 | 3255 | . date: Thu Jan 01 00:00:36 1970 +0000 |
|
3275 | 3256 | . summary: (36) buggy merge: identical parents |
|
3276 | 3257 | . |
|
3277 | 3258 | o changeset: 32:d06dffa21a31 |
|
3278 | 3259 | !\ parent: 27:886ed638191b |
|
3279 | 3260 | ! ! parent: 31:621d83e11f67 |
|
3280 | 3261 | ! . user: test |
|
3281 | 3262 | ! . date: Thu Jan 01 00:00:32 1970 +0000 |
|
3282 | 3263 | ! . summary: (32) expand |
|
3283 | 3264 | ! . |
|
3284 | 3265 | o ! changeset: 31:621d83e11f67 |
|
3285 | 3266 | !\! parent: 21:d42a756af44d |
|
3286 | 3267 | ! ! parent: 30:6e11cd4b648f |
|
3287 | 3268 | ! ! user: test |
|
3288 | 3269 | ! ! date: Thu Jan 01 00:00:31 1970 +0000 |
|
3289 | 3270 | ! ! summary: (31) expand |
|
3290 | 3271 | ! ! |
|
3291 | 3272 | o ! changeset: 30:6e11cd4b648f |
|
3292 | 3273 | !\ \ parent: 28:44ecd0b9ae99 |
|
3293 | 3274 | ! ~ ! parent: 29:cd9bb2be7593 |
|
3294 | 3275 | ! ! user: test |
|
3295 | 3276 | ! ! date: Thu Jan 01 00:00:30 1970 +0000 |
|
3296 | 3277 | ! ! summary: (30) expand |
|
3297 | 3278 | ! / |
|
3298 | 3279 | o ! changeset: 28:44ecd0b9ae99 |
|
3299 | 3280 | !\ \ parent: 1:6db2ef61d156 |
|
3300 | 3281 | ! ~ ! parent: 26:7f25b6c2f0b9 |
|
3301 | 3282 | ! ! user: test |
|
3302 | 3283 | ! ! date: Thu Jan 01 00:00:28 1970 +0000 |
|
3303 | 3284 | ! ! summary: (28) merge zero known |
|
3304 | 3285 | ! / |
|
3305 | 3286 | o ! changeset: 26:7f25b6c2f0b9 |
|
3306 | 3287 | !\ \ parent: 18:1aa84d96232a |
|
3307 | 3288 | ! ! ! parent: 25:91da8ed57247 |
|
3308 | 3289 | ! ! ! user: test |
|
3309 | 3290 | ! ! ! date: Thu Jan 01 00:00:26 1970 +0000 |
|
3310 | 3291 | ! ! ! summary: (26) merge one known; far right |
|
3311 | 3292 | ! ! ! |
|
3312 | 3293 | ! o ! changeset: 25:91da8ed57247 |
|
3313 | 3294 | ! !\! parent: 21:d42a756af44d |
|
3314 | 3295 | ! ! ! parent: 24:a9c19a3d96b7 |
|
3315 | 3296 | ! ! ! user: test |
|
3316 | 3297 | ! ! ! date: Thu Jan 01 00:00:25 1970 +0000 |
|
3317 | 3298 | ! ! ! summary: (25) merge one known; far left |
|
3318 | 3299 | ! ! ! |
|
3319 | 3300 | ! o ! changeset: 24:a9c19a3d96b7 |
|
3320 | 3301 | ! !\ \ parent: 0:e6eb3150255d |
|
3321 | 3302 | ! ! ~ ! parent: 23:a01cddf0766d |
|
3322 | 3303 | ! ! ! user: test |
|
3323 | 3304 | ! ! ! date: Thu Jan 01 00:00:24 1970 +0000 |
|
3324 | 3305 | ! ! ! summary: (24) merge one known; immediate right |
|
3325 | 3306 | ! ! / |
|
3326 | 3307 | ! o ! changeset: 23:a01cddf0766d |
|
3327 | 3308 | ! !\ \ parent: 1:6db2ef61d156 |
|
3328 | 3309 | ! ! ~ ! parent: 22:e0d9cccacb5d |
|
3329 | 3310 | ! ! ! user: test |
|
3330 | 3311 | ! ! ! date: Thu Jan 01 00:00:23 1970 +0000 |
|
3331 | 3312 | ! ! ! summary: (23) merge one known; immediate left |
|
3332 | 3313 | ! ! / |
|
3333 | 3314 | ! o ! changeset: 22:e0d9cccacb5d |
|
3334 | 3315 | !/!/ parent: 18:1aa84d96232a |
|
3335 | 3316 | ! ! parent: 21:d42a756af44d |
|
3336 | 3317 | ! ! user: test |
|
3337 | 3318 | ! ! date: Thu Jan 01 00:00:22 1970 +0000 |
|
3338 | 3319 | ! ! summary: (22) merge two known; one far left, one far right |
|
3339 | 3320 | ! ! |
|
3340 | 3321 | ! o changeset: 21:d42a756af44d |
|
3341 | 3322 | ! !\ parent: 19:31ddc2c1573b |
|
3342 | 3323 | ! ! ! parent: 20:d30ed6450e32 |
|
3343 | 3324 | ! ! ! user: test |
|
3344 | 3325 | ! ! ! date: Thu Jan 01 00:00:21 1970 +0000 |
|
3345 | 3326 | ! ! ! summary: (21) expand |
|
3346 | 3327 | ! ! ! |
|
3347 | 3328 | +---o changeset: 20:d30ed6450e32 |
|
3348 | 3329 | ! ! | parent: 0:e6eb3150255d |
|
3349 | 3330 | ! ! ~ parent: 18:1aa84d96232a |
|
3350 | 3331 | ! ! user: test |
|
3351 | 3332 | ! ! date: Thu Jan 01 00:00:20 1970 +0000 |
|
3352 | 3333 | ! ! summary: (20) merge two known; two far right |
|
3353 | 3334 | ! ! |
|
3354 | 3335 | ! o changeset: 19:31ddc2c1573b |
|
3355 | 3336 | ! |\ parent: 15:1dda3f72782d |
|
3356 | 3337 | ! ~ ~ parent: 17:44765d7c06e0 |
|
3357 | 3338 | ! user: test |
|
3358 | 3339 | ! date: Thu Jan 01 00:00:19 1970 +0000 |
|
3359 | 3340 | ! summary: (19) expand |
|
3360 | 3341 | ! |
|
3361 | 3342 | o changeset: 18:1aa84d96232a |
|
3362 | 3343 | |\ parent: 1:6db2ef61d156 |
|
3363 | 3344 | ~ ~ parent: 15:1dda3f72782d |
|
3364 | 3345 | user: test |
|
3365 | 3346 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
3366 | 3347 | summary: (18) merge two known; two far left |
|
3367 | 3348 | |
|
3368 | 3349 | $ cd .. |
|
3369 | 3350 | |
|
3370 | 3351 | Change graph shorten, test better with graphstyle.missing not none |
|
3371 | 3352 | |
|
3372 | 3353 | $ cd repo |
|
3373 | 3354 | $ cat << EOF >> $HGRCPATH |
|
3374 | 3355 | > [experimental] |
|
3375 | 3356 | > graphstyle.parent = | |
|
3376 | 3357 | > graphstyle.grandparent = : |
|
3377 | 3358 | > graphstyle.missing = ' |
|
3378 | 3359 | > graphshorten = true |
|
3379 | 3360 | > EOF |
|
3380 | 3361 | $ hg log -G -r 'file("a")' -m -T '{rev} {desc}' |
|
3381 | 3362 | @ 36 (36) buggy merge: identical parents |
|
3382 | 3363 | o 32 (32) expand |
|
3383 | 3364 | |\ |
|
3384 | 3365 | o : 31 (31) expand |
|
3385 | 3366 | |\: |
|
3386 | 3367 | o : 30 (30) expand |
|
3387 | 3368 | |\ \ |
|
3388 | 3369 | o \ \ 28 (28) merge zero known |
|
3389 | 3370 | |\ \ \ |
|
3390 | 3371 | o \ \ \ 26 (26) merge one known; far right |
|
3391 | 3372 | |\ \ \ \ |
|
3392 | 3373 | | o-----+ 25 (25) merge one known; far left |
|
3393 | 3374 | | o ' ' : 24 (24) merge one known; immediate right |
|
3394 | 3375 | | |\ \ \ \ |
|
3395 | 3376 | | o---+ ' : 23 (23) merge one known; immediate left |
|
3396 | 3377 | | o-------+ 22 (22) merge two known; one far left, one far right |
|
3397 | 3378 | |/ / / / / |
|
3398 | 3379 | | ' ' ' o 21 (21) expand |
|
3399 | 3380 | | ' ' ' |\ |
|
3400 | 3381 | +-+-------o 20 (20) merge two known; two far right |
|
3401 | 3382 | | ' ' ' o 19 (19) expand |
|
3402 | 3383 | | ' ' ' |\ |
|
3403 | 3384 | o---+---+ | 18 (18) merge two known; two far left |
|
3404 | 3385 | / / / / / |
|
3405 | 3386 | ' ' ' | o 17 (17) expand |
|
3406 | 3387 | ' ' ' | |\ |
|
3407 | 3388 | +-+-------o 16 (16) merge two known; one immediate right, one near right |
|
3408 | 3389 | ' ' ' o | 15 (15) expand |
|
3409 | 3390 | ' ' ' |\ \ |
|
3410 | 3391 | +-------o | 14 (14) merge two known; one immediate right, one far right |
|
3411 | 3392 | ' ' ' | |/ |
|
3412 | 3393 | ' ' ' o | 13 (13) expand |
|
3413 | 3394 | ' ' ' |\ \ |
|
3414 | 3395 | ' +---+---o 12 (12) merge two known; one immediate right, one far left |
|
3415 | 3396 | ' ' ' | o 11 (11) expand |
|
3416 | 3397 | ' ' ' | |\ |
|
3417 | 3398 | +---------o 10 (10) merge two known; one immediate left, one near right |
|
3418 | 3399 | ' ' ' | |/ |
|
3419 | 3400 | ' ' ' o | 9 (9) expand |
|
3420 | 3401 | ' ' ' |\ \ |
|
3421 | 3402 | +-------o | 8 (8) merge two known; one immediate left, one far right |
|
3422 | 3403 | ' ' ' |/ / |
|
3423 | 3404 | ' ' ' o | 7 (7) expand |
|
3424 | 3405 | ' ' ' |\ \ |
|
3425 | 3406 | ' ' ' +---o 6 (6) merge two known; one immediate left, one far left |
|
3426 | 3407 | ' ' ' | '/ |
|
3427 | 3408 | ' ' ' o ' 5 (5) expand |
|
3428 | 3409 | ' ' ' |\ \ |
|
3429 | 3410 | ' +---o ' ' 4 (4) merge two known; one immediate left, one immediate right |
|
3430 | 3411 | ' ' ' '/ / |
|
3431 | 3412 | |
|
3432 | 3413 | behavior with newlines |
|
3433 | 3414 | |
|
3434 | 3415 | $ hg log -G -r ::2 -T '{rev} {desc}' |
|
3435 | 3416 | o 2 (2) collapse |
|
3436 | 3417 | o 1 (1) collapse |
|
3437 | 3418 | o 0 (0) root |
|
3438 | 3419 | |
|
3439 | 3420 | $ hg log -G -r ::2 -T '{rev} {desc}\n' |
|
3440 | 3421 | o 2 (2) collapse |
|
3441 | 3422 | o 1 (1) collapse |
|
3442 | 3423 | o 0 (0) root |
|
3443 | 3424 | |
|
3444 | 3425 | $ hg log -G -r ::2 -T '{rev} {desc}\n\n' |
|
3445 | 3426 | o 2 (2) collapse |
|
3446 | 3427 | | |
|
3447 | 3428 | o 1 (1) collapse |
|
3448 | 3429 | | |
|
3449 | 3430 | o 0 (0) root |
|
3450 | 3431 | |
|
3451 | 3432 | |
|
3452 | 3433 | $ hg log -G -r ::2 -T '\n{rev} {desc}' |
|
3453 | 3434 | o |
|
3454 | 3435 | | 2 (2) collapse |
|
3455 | 3436 | o |
|
3456 | 3437 | | 1 (1) collapse |
|
3457 | 3438 | o |
|
3458 | 3439 | 0 (0) root |
|
3459 | 3440 | |
|
3460 | 3441 | $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n' |
|
3461 | 3442 | o 2 (2) collapse |
|
3462 | 3443 | | |
|
3463 | 3444 | | |
|
3464 | 3445 | o 1 (1) collapse |
|
3465 | 3446 | | |
|
3466 | 3447 | | |
|
3467 | 3448 | o 0 (0) root |
|
3468 | 3449 | |
|
3469 | 3450 | |
|
3470 | 3451 | $ cd .. |
|
3471 | 3452 | |
|
3472 | 3453 | When inserting extra line nodes to handle more than 2 parents, ensure that |
|
3473 | 3454 | the right node styles are used (issue5174): |
|
3474 | 3455 | |
|
3475 | 3456 | $ hg init repo-issue5174 |
|
3476 | 3457 | $ cd repo-issue5174 |
|
3477 | 3458 | $ echo a > f0 |
|
3478 | 3459 | $ hg ci -Aqm 0 |
|
3479 | 3460 | $ echo a > f1 |
|
3480 | 3461 | $ hg ci -Aqm 1 |
|
3481 | 3462 | $ echo a > f2 |
|
3482 | 3463 | $ hg ci -Aqm 2 |
|
3483 | 3464 | $ hg co ".^" |
|
3484 | 3465 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
3485 | 3466 | $ echo a > f3 |
|
3486 | 3467 | $ hg ci -Aqm 3 |
|
3487 | 3468 | $ hg co ".^^" |
|
3488 | 3469 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3489 | 3470 | $ echo a > f4 |
|
3490 | 3471 | $ hg ci -Aqm 4 |
|
3491 | 3472 | $ hg merge -r 2 |
|
3492 | 3473 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3493 | 3474 | (branch merge, don't forget to commit) |
|
3494 | 3475 | $ hg ci -qm 5 |
|
3495 | 3476 | $ hg merge -r 3 |
|
3496 | 3477 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3497 | 3478 | (branch merge, don't forget to commit) |
|
3498 | 3479 | $ hg ci -qm 6 |
|
3499 | 3480 | $ hg log -G -r '0 | 1 | 2 | 6' |
|
3500 | 3481 | @ changeset: 6:851fe89689ad |
|
3501 | 3482 | :\ tag: tip |
|
3502 | 3483 | : : parent: 5:4f1e3cf15f5d |
|
3503 | 3484 | : : parent: 3:b74ba7084d2d |
|
3504 | 3485 | : : user: test |
|
3505 | 3486 | : : date: Thu Jan 01 00:00:00 1970 +0000 |
|
3506 | 3487 | : : summary: 6 |
|
3507 | 3488 | : : |
|
3508 | 3489 | : \ |
|
3509 | 3490 | : :\ |
|
3510 | 3491 | : o : changeset: 2:3e6599df4cce |
|
3511 | 3492 | : :/ user: test |
|
3512 | 3493 | : : date: Thu Jan 01 00:00:00 1970 +0000 |
|
3513 | 3494 | : : summary: 2 |
|
3514 | 3495 | : : |
|
3515 | 3496 | : o changeset: 1:bd9a55143933 |
|
3516 | 3497 | :/ user: test |
|
3517 | 3498 | : date: Thu Jan 01 00:00:00 1970 +0000 |
|
3518 | 3499 | : summary: 1 |
|
3519 | 3500 | : |
|
3520 | 3501 | o changeset: 0:870a5edc339c |
|
3521 | 3502 | user: test |
|
3522 | 3503 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
3523 | 3504 | summary: 0 |
|
3524 | 3505 | |
|
3525 | 3506 | |
|
3526 | 3507 | $ cd .. |
|
3527 | 3508 | |
|
3528 | 3509 | Multiple roots (issue5440): |
|
3529 | 3510 | |
|
3530 | 3511 | $ hg init multiroots |
|
3531 | 3512 | $ cd multiroots |
|
3532 | 3513 | $ cat <<EOF > .hg/hgrc |
|
3533 | 3514 | > [ui] |
|
3534 | 3515 | > logtemplate = '{rev} {desc}\n\n' |
|
3535 | 3516 | > EOF |
|
3536 | 3517 | |
|
3537 | 3518 | $ touch foo |
|
3538 | 3519 | $ hg ci -Aqm foo |
|
3539 | 3520 | $ hg co -q null |
|
3540 | 3521 | $ touch bar |
|
3541 | 3522 | $ hg ci -Aqm bar |
|
3542 | 3523 | |
|
3543 | 3524 | $ hg log -Gr null: |
|
3544 | 3525 | @ 1 bar |
|
3545 | 3526 | | |
|
3546 | 3527 | | o 0 foo |
|
3547 | 3528 | |/ |
|
3548 | 3529 | o -1 |
|
3549 | 3530 | |
|
3550 | 3531 | $ hg log -Gr null+0 |
|
3551 | 3532 | o 0 foo |
|
3552 | 3533 | | |
|
3553 | 3534 | o -1 |
|
3554 | 3535 | |
|
3555 | 3536 | $ hg log -Gr null+1 |
|
3556 | 3537 | @ 1 bar |
|
3557 | 3538 | | |
|
3558 | 3539 | o -1 |
|
3559 | 3540 | |
|
3560 | 3541 | |
|
3561 | 3542 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now