Show More
@@ -1,2621 +1,2627 b'' | |||
|
1 | 1 | # cmdutil.py - help for command processing in 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 node import hex, nullid, nullrev, short |
|
9 | 9 | from i18n import _ |
|
10 | 10 | import os, sys, errno, re, tempfile |
|
11 | 11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies |
|
12 | 12 | import match as matchmod |
|
13 | 13 | import context, repair, graphmod, revset, phases, obsolete, pathutil |
|
14 | 14 | import changelog |
|
15 | 15 | import bookmarks |
|
16 | 16 | import lock as lockmod |
|
17 | 17 | |
|
18 | 18 | def parsealiases(cmd): |
|
19 | 19 | return cmd.lstrip("^").split("|") |
|
20 | 20 | |
|
21 | 21 | def findpossible(cmd, table, strict=False): |
|
22 | 22 | """ |
|
23 | 23 | Return cmd -> (aliases, command table entry) |
|
24 | 24 | for each matching command. |
|
25 | 25 | Return debug commands (or their aliases) only if no normal command matches. |
|
26 | 26 | """ |
|
27 | 27 | choice = {} |
|
28 | 28 | debugchoice = {} |
|
29 | 29 | |
|
30 | 30 | if cmd in table: |
|
31 | 31 | # short-circuit exact matches, "log" alias beats "^log|history" |
|
32 | 32 | keys = [cmd] |
|
33 | 33 | else: |
|
34 | 34 | keys = table.keys() |
|
35 | 35 | |
|
36 | 36 | for e in keys: |
|
37 | 37 | aliases = parsealiases(e) |
|
38 | 38 | found = None |
|
39 | 39 | if cmd in aliases: |
|
40 | 40 | found = cmd |
|
41 | 41 | elif not strict: |
|
42 | 42 | for a in aliases: |
|
43 | 43 | if a.startswith(cmd): |
|
44 | 44 | found = a |
|
45 | 45 | break |
|
46 | 46 | if found is not None: |
|
47 | 47 | if aliases[0].startswith("debug") or found.startswith("debug"): |
|
48 | 48 | debugchoice[found] = (aliases, table[e]) |
|
49 | 49 | else: |
|
50 | 50 | choice[found] = (aliases, table[e]) |
|
51 | 51 | |
|
52 | 52 | if not choice and debugchoice: |
|
53 | 53 | choice = debugchoice |
|
54 | 54 | |
|
55 | 55 | return choice |
|
56 | 56 | |
|
57 | 57 | def findcmd(cmd, table, strict=True): |
|
58 | 58 | """Return (aliases, command table entry) for command string.""" |
|
59 | 59 | choice = findpossible(cmd, table, strict) |
|
60 | 60 | |
|
61 | 61 | if cmd in choice: |
|
62 | 62 | return choice[cmd] |
|
63 | 63 | |
|
64 | 64 | if len(choice) > 1: |
|
65 | 65 | clist = choice.keys() |
|
66 | 66 | clist.sort() |
|
67 | 67 | raise error.AmbiguousCommand(cmd, clist) |
|
68 | 68 | |
|
69 | 69 | if choice: |
|
70 | 70 | return choice.values()[0] |
|
71 | 71 | |
|
72 | 72 | raise error.UnknownCommand(cmd) |
|
73 | 73 | |
|
74 | 74 | def findrepo(p): |
|
75 | 75 | while not os.path.isdir(os.path.join(p, ".hg")): |
|
76 | 76 | oldp, p = p, os.path.dirname(p) |
|
77 | 77 | if p == oldp: |
|
78 | 78 | return None |
|
79 | 79 | |
|
80 | 80 | return p |
|
81 | 81 | |
|
82 | 82 | def bailifchanged(repo): |
|
83 | 83 | if repo.dirstate.p2() != nullid: |
|
84 | 84 | raise util.Abort(_('outstanding uncommitted merge')) |
|
85 | 85 | modified, added, removed, deleted = repo.status()[:4] |
|
86 | 86 | if modified or added or removed or deleted: |
|
87 | 87 | raise util.Abort(_('uncommitted changes')) |
|
88 | 88 | ctx = repo[None] |
|
89 | 89 | for s in sorted(ctx.substate): |
|
90 | 90 | if ctx.sub(s).dirty(): |
|
91 | 91 | raise util.Abort(_("uncommitted changes in subrepo %s") % s) |
|
92 | 92 | |
|
93 | 93 | def logmessage(ui, opts): |
|
94 | 94 | """ get the log message according to -m and -l option """ |
|
95 | 95 | message = opts.get('message') |
|
96 | 96 | logfile = opts.get('logfile') |
|
97 | 97 | |
|
98 | 98 | if message and logfile: |
|
99 | 99 | raise util.Abort(_('options --message and --logfile are mutually ' |
|
100 | 100 | 'exclusive')) |
|
101 | 101 | if not message and logfile: |
|
102 | 102 | try: |
|
103 | 103 | if logfile == '-': |
|
104 | 104 | message = ui.fin.read() |
|
105 | 105 | else: |
|
106 | 106 | message = '\n'.join(util.readfile(logfile).splitlines()) |
|
107 | 107 | except IOError, inst: |
|
108 | 108 | raise util.Abort(_("can't read commit message '%s': %s") % |
|
109 | 109 | (logfile, inst.strerror)) |
|
110 | 110 | return message |
|
111 | 111 | |
|
112 | 112 | def getcommiteditor(edit=False, finishdesc=None, extramsg=None, **opts): |
|
113 | 113 | """get appropriate commit message editor according to '--edit' option |
|
114 | 114 | |
|
115 | 115 | 'finishdesc' is a function to be called with edited commit message |
|
116 | 116 | (= 'description' of the new changeset) just after editing, but |
|
117 | 117 | before checking empty-ness. It should return actual text to be |
|
118 | 118 | stored into history. This allows to change description before |
|
119 | 119 | storing. |
|
120 | 120 | |
|
121 | 121 | 'extramsg' is a extra message to be shown in the editor instead of |
|
122 | 122 | 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL |
|
123 | 123 | is automatically added. |
|
124 | 124 | |
|
125 | 125 | 'getcommiteditor' returns 'commitforceeditor' regardless of |
|
126 | 126 | 'edit', if one of 'finishdesc' or 'extramsg' is specified, because |
|
127 | 127 | they are specific for usage in MQ. |
|
128 | 128 | """ |
|
129 | 129 | if edit or finishdesc or extramsg: |
|
130 | 130 | return lambda r, c, s: commitforceeditor(r, c, s, |
|
131 | 131 | finishdesc=finishdesc, |
|
132 | 132 | extramsg=extramsg) |
|
133 | 133 | else: |
|
134 | 134 | return commiteditor |
|
135 | 135 | |
|
136 | 136 | def loglimit(opts): |
|
137 | 137 | """get the log limit according to option -l/--limit""" |
|
138 | 138 | limit = opts.get('limit') |
|
139 | 139 | if limit: |
|
140 | 140 | try: |
|
141 | 141 | limit = int(limit) |
|
142 | 142 | except ValueError: |
|
143 | 143 | raise util.Abort(_('limit must be a positive integer')) |
|
144 | 144 | if limit <= 0: |
|
145 | 145 | raise util.Abort(_('limit must be positive')) |
|
146 | 146 | else: |
|
147 | 147 | limit = None |
|
148 | 148 | return limit |
|
149 | 149 | |
|
150 | 150 | def makefilename(repo, pat, node, desc=None, |
|
151 | 151 | total=None, seqno=None, revwidth=None, pathname=None): |
|
152 | 152 | node_expander = { |
|
153 | 153 | 'H': lambda: hex(node), |
|
154 | 154 | 'R': lambda: str(repo.changelog.rev(node)), |
|
155 | 155 | 'h': lambda: short(node), |
|
156 | 156 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) |
|
157 | 157 | } |
|
158 | 158 | expander = { |
|
159 | 159 | '%': lambda: '%', |
|
160 | 160 | 'b': lambda: os.path.basename(repo.root), |
|
161 | 161 | } |
|
162 | 162 | |
|
163 | 163 | try: |
|
164 | 164 | if node: |
|
165 | 165 | expander.update(node_expander) |
|
166 | 166 | if node: |
|
167 | 167 | expander['r'] = (lambda: |
|
168 | 168 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) |
|
169 | 169 | if total is not None: |
|
170 | 170 | expander['N'] = lambda: str(total) |
|
171 | 171 | if seqno is not None: |
|
172 | 172 | expander['n'] = lambda: str(seqno) |
|
173 | 173 | if total is not None and seqno is not None: |
|
174 | 174 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) |
|
175 | 175 | if pathname is not None: |
|
176 | 176 | expander['s'] = lambda: os.path.basename(pathname) |
|
177 | 177 | expander['d'] = lambda: os.path.dirname(pathname) or '.' |
|
178 | 178 | expander['p'] = lambda: pathname |
|
179 | 179 | |
|
180 | 180 | newname = [] |
|
181 | 181 | patlen = len(pat) |
|
182 | 182 | i = 0 |
|
183 | 183 | while i < patlen: |
|
184 | 184 | c = pat[i] |
|
185 | 185 | if c == '%': |
|
186 | 186 | i += 1 |
|
187 | 187 | c = pat[i] |
|
188 | 188 | c = expander[c]() |
|
189 | 189 | newname.append(c) |
|
190 | 190 | i += 1 |
|
191 | 191 | return ''.join(newname) |
|
192 | 192 | except KeyError, inst: |
|
193 | 193 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % |
|
194 | 194 | inst.args[0]) |
|
195 | 195 | |
|
196 | 196 | def makefileobj(repo, pat, node=None, desc=None, total=None, |
|
197 | 197 | seqno=None, revwidth=None, mode='wb', modemap=None, |
|
198 | 198 | pathname=None): |
|
199 | 199 | |
|
200 | 200 | writable = mode not in ('r', 'rb') |
|
201 | 201 | |
|
202 | 202 | if not pat or pat == '-': |
|
203 | 203 | fp = writable and repo.ui.fout or repo.ui.fin |
|
204 | 204 | if util.safehasattr(fp, 'fileno'): |
|
205 | 205 | return os.fdopen(os.dup(fp.fileno()), mode) |
|
206 | 206 | else: |
|
207 | 207 | # if this fp can't be duped properly, return |
|
208 | 208 | # a dummy object that can be closed |
|
209 | 209 | class wrappedfileobj(object): |
|
210 | 210 | noop = lambda x: None |
|
211 | 211 | def __init__(self, f): |
|
212 | 212 | self.f = f |
|
213 | 213 | def __getattr__(self, attr): |
|
214 | 214 | if attr == 'close': |
|
215 | 215 | return self.noop |
|
216 | 216 | else: |
|
217 | 217 | return getattr(self.f, attr) |
|
218 | 218 | |
|
219 | 219 | return wrappedfileobj(fp) |
|
220 | 220 | if util.safehasattr(pat, 'write') and writable: |
|
221 | 221 | return pat |
|
222 | 222 | if util.safehasattr(pat, 'read') and 'r' in mode: |
|
223 | 223 | return pat |
|
224 | 224 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) |
|
225 | 225 | if modemap is not None: |
|
226 | 226 | mode = modemap.get(fn, mode) |
|
227 | 227 | if mode == 'wb': |
|
228 | 228 | modemap[fn] = 'ab' |
|
229 | 229 | return open(fn, mode) |
|
230 | 230 | |
|
231 | 231 | def openrevlog(repo, cmd, file_, opts): |
|
232 | 232 | """opens the changelog, manifest, a filelog or a given revlog""" |
|
233 | 233 | cl = opts['changelog'] |
|
234 | 234 | mf = opts['manifest'] |
|
235 | 235 | msg = None |
|
236 | 236 | if cl and mf: |
|
237 | 237 | msg = _('cannot specify --changelog and --manifest at the same time') |
|
238 | 238 | elif cl or mf: |
|
239 | 239 | if file_: |
|
240 | 240 | msg = _('cannot specify filename with --changelog or --manifest') |
|
241 | 241 | elif not repo: |
|
242 | 242 | msg = _('cannot specify --changelog or --manifest ' |
|
243 | 243 | 'without a repository') |
|
244 | 244 | if msg: |
|
245 | 245 | raise util.Abort(msg) |
|
246 | 246 | |
|
247 | 247 | r = None |
|
248 | 248 | if repo: |
|
249 | 249 | if cl: |
|
250 | 250 | r = repo.unfiltered().changelog |
|
251 | 251 | elif mf: |
|
252 | 252 | r = repo.manifest |
|
253 | 253 | elif file_: |
|
254 | 254 | filelog = repo.file(file_) |
|
255 | 255 | if len(filelog): |
|
256 | 256 | r = filelog |
|
257 | 257 | if not r: |
|
258 | 258 | if not file_: |
|
259 | 259 | raise error.CommandError(cmd, _('invalid arguments')) |
|
260 | 260 | if not os.path.isfile(file_): |
|
261 | 261 | raise util.Abort(_("revlog '%s' not found") % file_) |
|
262 | 262 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), |
|
263 | 263 | file_[:-2] + ".i") |
|
264 | 264 | return r |
|
265 | 265 | |
|
266 | 266 | def copy(ui, repo, pats, opts, rename=False): |
|
267 | 267 | # called with the repo lock held |
|
268 | 268 | # |
|
269 | 269 | # hgsep => pathname that uses "/" to separate directories |
|
270 | 270 | # ossep => pathname that uses os.sep to separate directories |
|
271 | 271 | cwd = repo.getcwd() |
|
272 | 272 | targets = {} |
|
273 | 273 | after = opts.get("after") |
|
274 | 274 | dryrun = opts.get("dry_run") |
|
275 | 275 | wctx = repo[None] |
|
276 | 276 | |
|
277 | 277 | def walkpat(pat): |
|
278 | 278 | srcs = [] |
|
279 | 279 | badstates = after and '?' or '?r' |
|
280 | 280 | m = scmutil.match(repo[None], [pat], opts, globbed=True) |
|
281 | 281 | for abs in repo.walk(m): |
|
282 | 282 | state = repo.dirstate[abs] |
|
283 | 283 | rel = m.rel(abs) |
|
284 | 284 | exact = m.exact(abs) |
|
285 | 285 | if state in badstates: |
|
286 | 286 | if exact and state == '?': |
|
287 | 287 | ui.warn(_('%s: not copying - file is not managed\n') % rel) |
|
288 | 288 | if exact and state == 'r': |
|
289 | 289 | ui.warn(_('%s: not copying - file has been marked for' |
|
290 | 290 | ' remove\n') % rel) |
|
291 | 291 | continue |
|
292 | 292 | # abs: hgsep |
|
293 | 293 | # rel: ossep |
|
294 | 294 | srcs.append((abs, rel, exact)) |
|
295 | 295 | return srcs |
|
296 | 296 | |
|
297 | 297 | # abssrc: hgsep |
|
298 | 298 | # relsrc: ossep |
|
299 | 299 | # otarget: ossep |
|
300 | 300 | def copyfile(abssrc, relsrc, otarget, exact): |
|
301 | 301 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) |
|
302 | 302 | if '/' in abstarget: |
|
303 | 303 | # We cannot normalize abstarget itself, this would prevent |
|
304 | 304 | # case only renames, like a => A. |
|
305 | 305 | abspath, absname = abstarget.rsplit('/', 1) |
|
306 | 306 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname |
|
307 | 307 | reltarget = repo.pathto(abstarget, cwd) |
|
308 | 308 | target = repo.wjoin(abstarget) |
|
309 | 309 | src = repo.wjoin(abssrc) |
|
310 | 310 | state = repo.dirstate[abstarget] |
|
311 | 311 | |
|
312 | 312 | scmutil.checkportable(ui, abstarget) |
|
313 | 313 | |
|
314 | 314 | # check for collisions |
|
315 | 315 | prevsrc = targets.get(abstarget) |
|
316 | 316 | if prevsrc is not None: |
|
317 | 317 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
318 | 318 | (reltarget, repo.pathto(abssrc, cwd), |
|
319 | 319 | repo.pathto(prevsrc, cwd))) |
|
320 | 320 | return |
|
321 | 321 | |
|
322 | 322 | # check for overwrites |
|
323 | 323 | exists = os.path.lexists(target) |
|
324 | 324 | samefile = False |
|
325 | 325 | if exists and abssrc != abstarget: |
|
326 | 326 | if (repo.dirstate.normalize(abssrc) == |
|
327 | 327 | repo.dirstate.normalize(abstarget)): |
|
328 | 328 | if not rename: |
|
329 | 329 | ui.warn(_("%s: can't copy - same file\n") % reltarget) |
|
330 | 330 | return |
|
331 | 331 | exists = False |
|
332 | 332 | samefile = True |
|
333 | 333 | |
|
334 | 334 | if not after and exists or after and state in 'mn': |
|
335 | 335 | if not opts['force']: |
|
336 | 336 | ui.warn(_('%s: not overwriting - file exists\n') % |
|
337 | 337 | reltarget) |
|
338 | 338 | return |
|
339 | 339 | |
|
340 | 340 | if after: |
|
341 | 341 | if not exists: |
|
342 | 342 | if rename: |
|
343 | 343 | ui.warn(_('%s: not recording move - %s does not exist\n') % |
|
344 | 344 | (relsrc, reltarget)) |
|
345 | 345 | else: |
|
346 | 346 | ui.warn(_('%s: not recording copy - %s does not exist\n') % |
|
347 | 347 | (relsrc, reltarget)) |
|
348 | 348 | return |
|
349 | 349 | elif not dryrun: |
|
350 | 350 | try: |
|
351 | 351 | if exists: |
|
352 | 352 | os.unlink(target) |
|
353 | 353 | targetdir = os.path.dirname(target) or '.' |
|
354 | 354 | if not os.path.isdir(targetdir): |
|
355 | 355 | os.makedirs(targetdir) |
|
356 | 356 | if samefile: |
|
357 | 357 | tmp = target + "~hgrename" |
|
358 | 358 | os.rename(src, tmp) |
|
359 | 359 | os.rename(tmp, target) |
|
360 | 360 | else: |
|
361 | 361 | util.copyfile(src, target) |
|
362 | 362 | srcexists = True |
|
363 | 363 | except IOError, inst: |
|
364 | 364 | if inst.errno == errno.ENOENT: |
|
365 | 365 | ui.warn(_('%s: deleted in working copy\n') % relsrc) |
|
366 | 366 | srcexists = False |
|
367 | 367 | else: |
|
368 | 368 | ui.warn(_('%s: cannot copy - %s\n') % |
|
369 | 369 | (relsrc, inst.strerror)) |
|
370 | 370 | return True # report a failure |
|
371 | 371 | |
|
372 | 372 | if ui.verbose or not exact: |
|
373 | 373 | if rename: |
|
374 | 374 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
|
375 | 375 | else: |
|
376 | 376 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
377 | 377 | |
|
378 | 378 | targets[abstarget] = abssrc |
|
379 | 379 | |
|
380 | 380 | # fix up dirstate |
|
381 | 381 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, |
|
382 | 382 | dryrun=dryrun, cwd=cwd) |
|
383 | 383 | if rename and not dryrun: |
|
384 | 384 | if not after and srcexists and not samefile: |
|
385 | 385 | util.unlinkpath(repo.wjoin(abssrc)) |
|
386 | 386 | wctx.forget([abssrc]) |
|
387 | 387 | |
|
388 | 388 | # pat: ossep |
|
389 | 389 | # dest ossep |
|
390 | 390 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
391 | 391 | # return: function that takes hgsep and returns ossep |
|
392 | 392 | def targetpathfn(pat, dest, srcs): |
|
393 | 393 | if os.path.isdir(pat): |
|
394 | 394 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
395 | 395 | abspfx = util.localpath(abspfx) |
|
396 | 396 | if destdirexists: |
|
397 | 397 | striplen = len(os.path.split(abspfx)[0]) |
|
398 | 398 | else: |
|
399 | 399 | striplen = len(abspfx) |
|
400 | 400 | if striplen: |
|
401 | 401 | striplen += len(os.sep) |
|
402 | 402 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) |
|
403 | 403 | elif destdirexists: |
|
404 | 404 | res = lambda p: os.path.join(dest, |
|
405 | 405 | os.path.basename(util.localpath(p))) |
|
406 | 406 | else: |
|
407 | 407 | res = lambda p: dest |
|
408 | 408 | return res |
|
409 | 409 | |
|
410 | 410 | # pat: ossep |
|
411 | 411 | # dest ossep |
|
412 | 412 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
413 | 413 | # return: function that takes hgsep and returns ossep |
|
414 | 414 | def targetpathafterfn(pat, dest, srcs): |
|
415 | 415 | if matchmod.patkind(pat): |
|
416 | 416 | # a mercurial pattern |
|
417 | 417 | res = lambda p: os.path.join(dest, |
|
418 | 418 | os.path.basename(util.localpath(p))) |
|
419 | 419 | else: |
|
420 | 420 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
421 | 421 | if len(abspfx) < len(srcs[0][0]): |
|
422 | 422 | # A directory. Either the target path contains the last |
|
423 | 423 | # component of the source path or it does not. |
|
424 | 424 | def evalpath(striplen): |
|
425 | 425 | score = 0 |
|
426 | 426 | for s in srcs: |
|
427 | 427 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) |
|
428 | 428 | if os.path.lexists(t): |
|
429 | 429 | score += 1 |
|
430 | 430 | return score |
|
431 | 431 | |
|
432 | 432 | abspfx = util.localpath(abspfx) |
|
433 | 433 | striplen = len(abspfx) |
|
434 | 434 | if striplen: |
|
435 | 435 | striplen += len(os.sep) |
|
436 | 436 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): |
|
437 | 437 | score = evalpath(striplen) |
|
438 | 438 | striplen1 = len(os.path.split(abspfx)[0]) |
|
439 | 439 | if striplen1: |
|
440 | 440 | striplen1 += len(os.sep) |
|
441 | 441 | if evalpath(striplen1) > score: |
|
442 | 442 | striplen = striplen1 |
|
443 | 443 | res = lambda p: os.path.join(dest, |
|
444 | 444 | util.localpath(p)[striplen:]) |
|
445 | 445 | else: |
|
446 | 446 | # a file |
|
447 | 447 | if destdirexists: |
|
448 | 448 | res = lambda p: os.path.join(dest, |
|
449 | 449 | os.path.basename(util.localpath(p))) |
|
450 | 450 | else: |
|
451 | 451 | res = lambda p: dest |
|
452 | 452 | return res |
|
453 | 453 | |
|
454 | 454 | |
|
455 | 455 | pats = scmutil.expandpats(pats) |
|
456 | 456 | if not pats: |
|
457 | 457 | raise util.Abort(_('no source or destination specified')) |
|
458 | 458 | if len(pats) == 1: |
|
459 | 459 | raise util.Abort(_('no destination specified')) |
|
460 | 460 | dest = pats.pop() |
|
461 | 461 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) |
|
462 | 462 | if not destdirexists: |
|
463 | 463 | if len(pats) > 1 or matchmod.patkind(pats[0]): |
|
464 | 464 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
465 | 465 | 'existing directory')) |
|
466 | 466 | if util.endswithsep(dest): |
|
467 | 467 | raise util.Abort(_('destination %s is not a directory') % dest) |
|
468 | 468 | |
|
469 | 469 | tfn = targetpathfn |
|
470 | 470 | if after: |
|
471 | 471 | tfn = targetpathafterfn |
|
472 | 472 | copylist = [] |
|
473 | 473 | for pat in pats: |
|
474 | 474 | srcs = walkpat(pat) |
|
475 | 475 | if not srcs: |
|
476 | 476 | continue |
|
477 | 477 | copylist.append((tfn(pat, dest, srcs), srcs)) |
|
478 | 478 | if not copylist: |
|
479 | 479 | raise util.Abort(_('no files to copy')) |
|
480 | 480 | |
|
481 | 481 | errors = 0 |
|
482 | 482 | for targetpath, srcs in copylist: |
|
483 | 483 | for abssrc, relsrc, exact in srcs: |
|
484 | 484 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): |
|
485 | 485 | errors += 1 |
|
486 | 486 | |
|
487 | 487 | if errors: |
|
488 | 488 | ui.warn(_('(consider using --after)\n')) |
|
489 | 489 | |
|
490 | 490 | return errors != 0 |
|
491 | 491 | |
|
492 | 492 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, |
|
493 | 493 | runargs=None, appendpid=False): |
|
494 | 494 | '''Run a command as a service.''' |
|
495 | 495 | |
|
496 | 496 | def writepid(pid): |
|
497 | 497 | if opts['pid_file']: |
|
498 | 498 | mode = appendpid and 'a' or 'w' |
|
499 | 499 | fp = open(opts['pid_file'], mode) |
|
500 | 500 | fp.write(str(pid) + '\n') |
|
501 | 501 | fp.close() |
|
502 | 502 | |
|
503 | 503 | if opts['daemon'] and not opts['daemon_pipefds']: |
|
504 | 504 | # Signal child process startup with file removal |
|
505 | 505 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') |
|
506 | 506 | os.close(lockfd) |
|
507 | 507 | try: |
|
508 | 508 | if not runargs: |
|
509 | 509 | runargs = util.hgcmd() + sys.argv[1:] |
|
510 | 510 | runargs.append('--daemon-pipefds=%s' % lockpath) |
|
511 | 511 | # Don't pass --cwd to the child process, because we've already |
|
512 | 512 | # changed directory. |
|
513 | 513 | for i in xrange(1, len(runargs)): |
|
514 | 514 | if runargs[i].startswith('--cwd='): |
|
515 | 515 | del runargs[i] |
|
516 | 516 | break |
|
517 | 517 | elif runargs[i].startswith('--cwd'): |
|
518 | 518 | del runargs[i:i + 2] |
|
519 | 519 | break |
|
520 | 520 | def condfn(): |
|
521 | 521 | return not os.path.exists(lockpath) |
|
522 | 522 | pid = util.rundetached(runargs, condfn) |
|
523 | 523 | if pid < 0: |
|
524 | 524 | raise util.Abort(_('child process failed to start')) |
|
525 | 525 | writepid(pid) |
|
526 | 526 | finally: |
|
527 | 527 | try: |
|
528 | 528 | os.unlink(lockpath) |
|
529 | 529 | except OSError, e: |
|
530 | 530 | if e.errno != errno.ENOENT: |
|
531 | 531 | raise |
|
532 | 532 | if parentfn: |
|
533 | 533 | return parentfn(pid) |
|
534 | 534 | else: |
|
535 | 535 | return |
|
536 | 536 | |
|
537 | 537 | if initfn: |
|
538 | 538 | initfn() |
|
539 | 539 | |
|
540 | 540 | if not opts['daemon']: |
|
541 | 541 | writepid(os.getpid()) |
|
542 | 542 | |
|
543 | 543 | if opts['daemon_pipefds']: |
|
544 | 544 | lockpath = opts['daemon_pipefds'] |
|
545 | 545 | try: |
|
546 | 546 | os.setsid() |
|
547 | 547 | except AttributeError: |
|
548 | 548 | pass |
|
549 | 549 | os.unlink(lockpath) |
|
550 | 550 | util.hidewindow() |
|
551 | 551 | sys.stdout.flush() |
|
552 | 552 | sys.stderr.flush() |
|
553 | 553 | |
|
554 | 554 | nullfd = os.open(os.devnull, os.O_RDWR) |
|
555 | 555 | logfilefd = nullfd |
|
556 | 556 | if logfile: |
|
557 | 557 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) |
|
558 | 558 | os.dup2(nullfd, 0) |
|
559 | 559 | os.dup2(logfilefd, 1) |
|
560 | 560 | os.dup2(logfilefd, 2) |
|
561 | 561 | if nullfd not in (0, 1, 2): |
|
562 | 562 | os.close(nullfd) |
|
563 | 563 | if logfile and logfilefd not in (0, 1, 2): |
|
564 | 564 | os.close(logfilefd) |
|
565 | 565 | |
|
566 | 566 | if runfn: |
|
567 | 567 | return runfn() |
|
568 | 568 | |
|
569 | 569 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): |
|
570 | 570 | """Utility function used by commands.import to import a single patch |
|
571 | 571 | |
|
572 | 572 | This function is explicitly defined here to help the evolve extension to |
|
573 | 573 | wrap this part of the import logic. |
|
574 | 574 | |
|
575 | 575 | The API is currently a bit ugly because it a simple code translation from |
|
576 | 576 | the import command. Feel free to make it better. |
|
577 | 577 | |
|
578 | 578 | :hunk: a patch (as a binary string) |
|
579 | 579 | :parents: nodes that will be parent of the created commit |
|
580 | 580 | :opts: the full dict of option passed to the import command |
|
581 | 581 | :msgs: list to save commit message to. |
|
582 | 582 | (used in case we need to save it when failing) |
|
583 | 583 | :updatefunc: a function that update a repo to a given node |
|
584 | 584 | updatefunc(<repo>, <node>) |
|
585 | 585 | """ |
|
586 | 586 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
587 | 587 | patch.extract(ui, hunk) |
|
588 | 588 | |
|
589 | 589 | editor = getcommiteditor(**opts) |
|
590 | 590 | update = not opts.get('bypass') |
|
591 | 591 | strip = opts["strip"] |
|
592 | 592 | sim = float(opts.get('similarity') or 0) |
|
593 | 593 | if not tmpname: |
|
594 | 594 | return (None, None, False) |
|
595 | 595 | msg = _('applied to working directory') |
|
596 | 596 | |
|
597 | 597 | rejects = False |
|
598 | 598 | |
|
599 | 599 | try: |
|
600 | 600 | cmdline_message = logmessage(ui, opts) |
|
601 | 601 | if cmdline_message: |
|
602 | 602 | # pickup the cmdline msg |
|
603 | 603 | message = cmdline_message |
|
604 | 604 | elif message: |
|
605 | 605 | # pickup the patch msg |
|
606 | 606 | message = message.strip() |
|
607 | 607 | else: |
|
608 | 608 | # launch the editor |
|
609 | 609 | message = None |
|
610 | 610 | ui.debug('message:\n%s\n' % message) |
|
611 | 611 | |
|
612 | 612 | if len(parents) == 1: |
|
613 | 613 | parents.append(repo[nullid]) |
|
614 | 614 | if opts.get('exact'): |
|
615 | 615 | if not nodeid or not p1: |
|
616 | 616 | raise util.Abort(_('not a Mercurial patch')) |
|
617 | 617 | p1 = repo[p1] |
|
618 | 618 | p2 = repo[p2 or nullid] |
|
619 | 619 | elif p2: |
|
620 | 620 | try: |
|
621 | 621 | p1 = repo[p1] |
|
622 | 622 | p2 = repo[p2] |
|
623 | 623 | # Without any options, consider p2 only if the |
|
624 | 624 | # patch is being applied on top of the recorded |
|
625 | 625 | # first parent. |
|
626 | 626 | if p1 != parents[0]: |
|
627 | 627 | p1 = parents[0] |
|
628 | 628 | p2 = repo[nullid] |
|
629 | 629 | except error.RepoError: |
|
630 | 630 | p1, p2 = parents |
|
631 | 631 | else: |
|
632 | 632 | p1, p2 = parents |
|
633 | 633 | |
|
634 | 634 | n = None |
|
635 | 635 | if update: |
|
636 | 636 | if p1 != parents[0]: |
|
637 | 637 | updatefunc(repo, p1.node()) |
|
638 | 638 | if p2 != parents[1]: |
|
639 | 639 | repo.setparents(p1.node(), p2.node()) |
|
640 | 640 | |
|
641 | 641 | if opts.get('exact') or opts.get('import_branch'): |
|
642 | 642 | repo.dirstate.setbranch(branch or 'default') |
|
643 | 643 | |
|
644 | 644 | partial = opts.get('partial', False) |
|
645 | 645 | files = set() |
|
646 | 646 | try: |
|
647 | 647 | patch.patch(ui, repo, tmpname, strip=strip, files=files, |
|
648 | 648 | eolmode=None, similarity=sim / 100.0) |
|
649 | 649 | except patch.PatchError, e: |
|
650 | 650 | if not partial: |
|
651 | 651 | raise util.Abort(str(e)) |
|
652 | 652 | if partial: |
|
653 | 653 | rejects = True |
|
654 | 654 | |
|
655 | 655 | files = list(files) |
|
656 | 656 | if opts.get('no_commit'): |
|
657 | 657 | if message: |
|
658 | 658 | msgs.append(message) |
|
659 | 659 | else: |
|
660 | 660 | if opts.get('exact') or p2: |
|
661 | 661 | # If you got here, you either use --force and know what |
|
662 | 662 | # you are doing or used --exact or a merge patch while |
|
663 | 663 | # being updated to its first parent. |
|
664 | 664 | m = None |
|
665 | 665 | else: |
|
666 | 666 | m = scmutil.matchfiles(repo, files or []) |
|
667 | 667 | n = repo.commit(message, opts.get('user') or user, |
|
668 | 668 | opts.get('date') or date, match=m, |
|
669 | 669 | editor=editor, force=partial) |
|
670 | 670 | else: |
|
671 | 671 | if opts.get('exact') or opts.get('import_branch'): |
|
672 | 672 | branch = branch or 'default' |
|
673 | 673 | else: |
|
674 | 674 | branch = p1.branch() |
|
675 | 675 | store = patch.filestore() |
|
676 | 676 | try: |
|
677 | 677 | files = set() |
|
678 | 678 | try: |
|
679 | 679 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, |
|
680 | 680 | files, eolmode=None) |
|
681 | 681 | except patch.PatchError, e: |
|
682 | 682 | raise util.Abort(str(e)) |
|
683 | 683 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
684 | 684 | message, |
|
685 | 685 | opts.get('user') or user, |
|
686 | 686 | opts.get('date') or date, |
|
687 | 687 | branch, files, store, |
|
688 | 688 | editor=getcommiteditor()) |
|
689 | 689 | n = memctx.commit() |
|
690 | 690 | finally: |
|
691 | 691 | store.close() |
|
692 | 692 | if opts.get('exact') and hex(n) != nodeid: |
|
693 | 693 | raise util.Abort(_('patch is damaged or loses information')) |
|
694 | 694 | if n: |
|
695 | 695 | # i18n: refers to a short changeset id |
|
696 | 696 | msg = _('created %s') % short(n) |
|
697 | 697 | return (msg, n, rejects) |
|
698 | 698 | finally: |
|
699 | 699 | os.unlink(tmpname) |
|
700 | 700 | |
|
701 | 701 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, |
|
702 | 702 | opts=None): |
|
703 | 703 | '''export changesets as hg patches.''' |
|
704 | 704 | |
|
705 | 705 | total = len(revs) |
|
706 | 706 | revwidth = max([len(str(rev)) for rev in revs]) |
|
707 | 707 | filemode = {} |
|
708 | 708 | |
|
709 | 709 | def single(rev, seqno, fp): |
|
710 | 710 | ctx = repo[rev] |
|
711 | 711 | node = ctx.node() |
|
712 | 712 | parents = [p.node() for p in ctx.parents() if p] |
|
713 | 713 | branch = ctx.branch() |
|
714 | 714 | if switch_parent: |
|
715 | 715 | parents.reverse() |
|
716 | 716 | prev = (parents and parents[0]) or nullid |
|
717 | 717 | |
|
718 | 718 | shouldclose = False |
|
719 | 719 | if not fp and len(template) > 0: |
|
720 | 720 | desc_lines = ctx.description().rstrip().split('\n') |
|
721 | 721 | desc = desc_lines[0] #Commit always has a first line. |
|
722 | 722 | fp = makefileobj(repo, template, node, desc=desc, total=total, |
|
723 | 723 | seqno=seqno, revwidth=revwidth, mode='wb', |
|
724 | 724 | modemap=filemode) |
|
725 | 725 | if fp != template: |
|
726 | 726 | shouldclose = True |
|
727 | 727 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): |
|
728 | 728 | repo.ui.note("%s\n" % fp.name) |
|
729 | 729 | |
|
730 | 730 | if not fp: |
|
731 | 731 | write = repo.ui.write |
|
732 | 732 | else: |
|
733 | 733 | def write(s, **kw): |
|
734 | 734 | fp.write(s) |
|
735 | 735 | |
|
736 | 736 | |
|
737 | 737 | write("# HG changeset patch\n") |
|
738 | 738 | write("# User %s\n" % ctx.user()) |
|
739 | 739 | write("# Date %d %d\n" % ctx.date()) |
|
740 | 740 | write("# %s\n" % util.datestr(ctx.date())) |
|
741 | 741 | if branch and branch != 'default': |
|
742 | 742 | write("# Branch %s\n" % branch) |
|
743 | 743 | write("# Node ID %s\n" % hex(node)) |
|
744 | 744 | write("# Parent %s\n" % hex(prev)) |
|
745 | 745 | if len(parents) > 1: |
|
746 | 746 | write("# Parent %s\n" % hex(parents[1])) |
|
747 | 747 | write(ctx.description().rstrip()) |
|
748 | 748 | write("\n\n") |
|
749 | 749 | |
|
750 | 750 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): |
|
751 | 751 | write(chunk, label=label) |
|
752 | 752 | |
|
753 | 753 | if shouldclose: |
|
754 | 754 | fp.close() |
|
755 | 755 | |
|
756 | 756 | for seqno, rev in enumerate(revs): |
|
757 | 757 | single(rev, seqno + 1, fp) |
|
758 | 758 | |
|
759 | 759 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, |
|
760 | 760 | changes=None, stat=False, fp=None, prefix='', |
|
761 | 761 | listsubrepos=False): |
|
762 | 762 | '''show diff or diffstat.''' |
|
763 | 763 | if fp is None: |
|
764 | 764 | write = ui.write |
|
765 | 765 | else: |
|
766 | 766 | def write(s, **kw): |
|
767 | 767 | fp.write(s) |
|
768 | 768 | |
|
769 | 769 | if stat: |
|
770 | 770 | diffopts = diffopts.copy(context=0) |
|
771 | 771 | width = 80 |
|
772 | 772 | if not ui.plain(): |
|
773 | 773 | width = ui.termwidth() |
|
774 | 774 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, |
|
775 | 775 | prefix=prefix) |
|
776 | 776 | for chunk, label in patch.diffstatui(util.iterlines(chunks), |
|
777 | 777 | width=width, |
|
778 | 778 | git=diffopts.git): |
|
779 | 779 | write(chunk, label=label) |
|
780 | 780 | else: |
|
781 | 781 | for chunk, label in patch.diffui(repo, node1, node2, match, |
|
782 | 782 | changes, diffopts, prefix=prefix): |
|
783 | 783 | write(chunk, label=label) |
|
784 | 784 | |
|
785 | 785 | if listsubrepos: |
|
786 | 786 | ctx1 = repo[node1] |
|
787 | 787 | ctx2 = repo[node2] |
|
788 | 788 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
789 | 789 | tempnode2 = node2 |
|
790 | 790 | try: |
|
791 | 791 | if node2 is not None: |
|
792 | 792 | tempnode2 = ctx2.substate[subpath][1] |
|
793 | 793 | except KeyError: |
|
794 | 794 | # A subrepo that existed in node1 was deleted between node1 and |
|
795 | 795 | # node2 (inclusive). Thus, ctx2's substate won't contain that |
|
796 | 796 | # subpath. The best we can do is to ignore it. |
|
797 | 797 | tempnode2 = None |
|
798 | 798 | submatch = matchmod.narrowmatcher(subpath, match) |
|
799 | 799 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, |
|
800 | 800 | stat=stat, fp=fp, prefix=prefix) |
|
801 | 801 | |
|
802 | 802 | class changeset_printer(object): |
|
803 | 803 | '''show changeset information when templating not requested.''' |
|
804 | 804 | |
|
805 | 805 | def __init__(self, ui, repo, patch, diffopts, buffered): |
|
806 | 806 | self.ui = ui |
|
807 | 807 | self.repo = repo |
|
808 | 808 | self.buffered = buffered |
|
809 | 809 | self.patch = patch |
|
810 | 810 | self.diffopts = diffopts |
|
811 | 811 | self.header = {} |
|
812 | 812 | self.hunk = {} |
|
813 | 813 | self.lastheader = None |
|
814 | 814 | self.footer = None |
|
815 | 815 | |
|
816 | 816 | def flush(self, rev): |
|
817 | 817 | if rev in self.header: |
|
818 | 818 | h = self.header[rev] |
|
819 | 819 | if h != self.lastheader: |
|
820 | 820 | self.lastheader = h |
|
821 | 821 | self.ui.write(h) |
|
822 | 822 | del self.header[rev] |
|
823 | 823 | if rev in self.hunk: |
|
824 | 824 | self.ui.write(self.hunk[rev]) |
|
825 | 825 | del self.hunk[rev] |
|
826 | 826 | return 1 |
|
827 | 827 | return 0 |
|
828 | 828 | |
|
829 | 829 | def close(self): |
|
830 | 830 | if self.footer: |
|
831 | 831 | self.ui.write(self.footer) |
|
832 | 832 | |
|
833 | 833 | def show(self, ctx, copies=None, matchfn=None, **props): |
|
834 | 834 | if self.buffered: |
|
835 | 835 | self.ui.pushbuffer() |
|
836 | 836 | self._show(ctx, copies, matchfn, props) |
|
837 | 837 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) |
|
838 | 838 | else: |
|
839 | 839 | self._show(ctx, copies, matchfn, props) |
|
840 | 840 | |
|
841 | 841 | def _show(self, ctx, copies, matchfn, props): |
|
842 | 842 | '''show a single changeset or file revision''' |
|
843 | 843 | changenode = ctx.node() |
|
844 | 844 | rev = ctx.rev() |
|
845 | 845 | |
|
846 | 846 | if self.ui.quiet: |
|
847 | 847 | self.ui.write("%d:%s\n" % (rev, short(changenode)), |
|
848 | 848 | label='log.node') |
|
849 | 849 | return |
|
850 | 850 | |
|
851 | 851 | log = self.repo.changelog |
|
852 | 852 | date = util.datestr(ctx.date()) |
|
853 | 853 | |
|
854 | 854 | hexfunc = self.ui.debugflag and hex or short |
|
855 | 855 | |
|
856 | 856 | parents = [(p, hexfunc(log.node(p))) |
|
857 | 857 | for p in self._meaningful_parentrevs(log, rev)] |
|
858 | 858 | |
|
859 | 859 | # i18n: column positioning for "hg log" |
|
860 | 860 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), |
|
861 | 861 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
862 | 862 | |
|
863 | 863 | branch = ctx.branch() |
|
864 | 864 | # don't show the default branch name |
|
865 | 865 | if branch != 'default': |
|
866 | 866 | # i18n: column positioning for "hg log" |
|
867 | 867 | self.ui.write(_("branch: %s\n") % branch, |
|
868 | 868 | label='log.branch') |
|
869 | 869 | for bookmark in self.repo.nodebookmarks(changenode): |
|
870 | 870 | # i18n: column positioning for "hg log" |
|
871 | 871 | self.ui.write(_("bookmark: %s\n") % bookmark, |
|
872 | 872 | label='log.bookmark') |
|
873 | 873 | for tag in self.repo.nodetags(changenode): |
|
874 | 874 | # i18n: column positioning for "hg log" |
|
875 | 875 | self.ui.write(_("tag: %s\n") % tag, |
|
876 | 876 | label='log.tag') |
|
877 | 877 | if self.ui.debugflag and ctx.phase(): |
|
878 | 878 | # i18n: column positioning for "hg log" |
|
879 | 879 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
|
880 | 880 | label='log.phase') |
|
881 | 881 | for parent in parents: |
|
882 | 882 | # i18n: column positioning for "hg log" |
|
883 | 883 | self.ui.write(_("parent: %d:%s\n") % parent, |
|
884 | 884 | label='log.parent changeset.%s' % ctx.phasestr()) |
|
885 | 885 | |
|
886 | 886 | if self.ui.debugflag: |
|
887 | 887 | mnode = ctx.manifestnode() |
|
888 | 888 | # i18n: column positioning for "hg log" |
|
889 | 889 | self.ui.write(_("manifest: %d:%s\n") % |
|
890 | 890 | (self.repo.manifest.rev(mnode), hex(mnode)), |
|
891 | 891 | label='ui.debug log.manifest') |
|
892 | 892 | # i18n: column positioning for "hg log" |
|
893 | 893 | self.ui.write(_("user: %s\n") % ctx.user(), |
|
894 | 894 | label='log.user') |
|
895 | 895 | # i18n: column positioning for "hg log" |
|
896 | 896 | self.ui.write(_("date: %s\n") % date, |
|
897 | 897 | label='log.date') |
|
898 | 898 | |
|
899 | 899 | if self.ui.debugflag: |
|
900 | 900 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] |
|
901 | 901 | for key, value in zip([# i18n: column positioning for "hg log" |
|
902 | 902 | _("files:"), |
|
903 | 903 | # i18n: column positioning for "hg log" |
|
904 | 904 | _("files+:"), |
|
905 | 905 | # i18n: column positioning for "hg log" |
|
906 | 906 | _("files-:")], files): |
|
907 | 907 | if value: |
|
908 | 908 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), |
|
909 | 909 | label='ui.debug log.files') |
|
910 | 910 | elif ctx.files() and self.ui.verbose: |
|
911 | 911 | # i18n: column positioning for "hg log" |
|
912 | 912 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), |
|
913 | 913 | label='ui.note log.files') |
|
914 | 914 | if copies and self.ui.verbose: |
|
915 | 915 | copies = ['%s (%s)' % c for c in copies] |
|
916 | 916 | # i18n: column positioning for "hg log" |
|
917 | 917 | self.ui.write(_("copies: %s\n") % ' '.join(copies), |
|
918 | 918 | label='ui.note log.copies') |
|
919 | 919 | |
|
920 | 920 | extra = ctx.extra() |
|
921 | 921 | if extra and self.ui.debugflag: |
|
922 | 922 | for key, value in sorted(extra.items()): |
|
923 | 923 | # i18n: column positioning for "hg log" |
|
924 | 924 | self.ui.write(_("extra: %s=%s\n") |
|
925 | 925 | % (key, value.encode('string_escape')), |
|
926 | 926 | label='ui.debug log.extra') |
|
927 | 927 | |
|
928 | 928 | description = ctx.description().strip() |
|
929 | 929 | if description: |
|
930 | 930 | if self.ui.verbose: |
|
931 | 931 | self.ui.write(_("description:\n"), |
|
932 | 932 | label='ui.note log.description') |
|
933 | 933 | self.ui.write(description, |
|
934 | 934 | label='ui.note log.description') |
|
935 | 935 | self.ui.write("\n\n") |
|
936 | 936 | else: |
|
937 | 937 | # i18n: column positioning for "hg log" |
|
938 | 938 | self.ui.write(_("summary: %s\n") % |
|
939 | 939 | description.splitlines()[0], |
|
940 | 940 | label='log.summary') |
|
941 | 941 | self.ui.write("\n") |
|
942 | 942 | |
|
943 | 943 | self.showpatch(changenode, matchfn) |
|
944 | 944 | |
|
945 | 945 | def showpatch(self, node, matchfn): |
|
946 | 946 | if not matchfn: |
|
947 | 947 | matchfn = self.patch |
|
948 | 948 | if matchfn: |
|
949 | 949 | stat = self.diffopts.get('stat') |
|
950 | 950 | diff = self.diffopts.get('patch') |
|
951 | 951 | diffopts = patch.diffopts(self.ui, self.diffopts) |
|
952 | 952 | prev = self.repo.changelog.parents(node)[0] |
|
953 | 953 | if stat: |
|
954 | 954 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
955 | 955 | match=matchfn, stat=True) |
|
956 | 956 | if diff: |
|
957 | 957 | if stat: |
|
958 | 958 | self.ui.write("\n") |
|
959 | 959 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
960 | 960 | match=matchfn, stat=False) |
|
961 | 961 | self.ui.write("\n") |
|
962 | 962 | |
|
963 | 963 | def _meaningful_parentrevs(self, log, rev): |
|
964 | 964 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
965 | 965 | |
|
966 | 966 | For merges (two non-nullrev revisions) both parents are meaningful. |
|
967 | 967 | Otherwise the first parent revision is considered meaningful if it |
|
968 | 968 | is not the preceding revision. |
|
969 | 969 | """ |
|
970 | 970 | parents = log.parentrevs(rev) |
|
971 | 971 | if not self.ui.debugflag and parents[1] == nullrev: |
|
972 | 972 | if parents[0] >= rev - 1: |
|
973 | 973 | parents = [] |
|
974 | 974 | else: |
|
975 | 975 | parents = [parents[0]] |
|
976 | 976 | return parents |
|
977 | 977 | |
|
978 | 978 | |
|
979 | 979 | class changeset_templater(changeset_printer): |
|
980 | 980 | '''format changeset information.''' |
|
981 | 981 | |
|
982 | 982 | def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered): |
|
983 | 983 | changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) |
|
984 | 984 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) |
|
985 | 985 | defaulttempl = { |
|
986 | 986 | 'parent': '{rev}:{node|formatnode} ', |
|
987 | 987 | 'manifest': '{rev}:{node|formatnode}', |
|
988 | 988 | 'file_copy': '{name} ({source})', |
|
989 | 989 | 'extra': '{key}={value|stringescape}' |
|
990 | 990 | } |
|
991 | 991 | # filecopy is preserved for compatibility reasons |
|
992 | 992 | defaulttempl['filecopy'] = defaulttempl['file_copy'] |
|
993 | 993 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, |
|
994 | 994 | cache=defaulttempl) |
|
995 | 995 | if tmpl: |
|
996 | 996 | self.t.cache['changeset'] = tmpl |
|
997 | 997 | |
|
998 | 998 | self.cache = {} |
|
999 | 999 | |
|
1000 | 1000 | def _meaningful_parentrevs(self, ctx): |
|
1001 | 1001 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
1002 | 1002 | """ |
|
1003 | 1003 | parents = ctx.parents() |
|
1004 | 1004 | if len(parents) > 1: |
|
1005 | 1005 | return parents |
|
1006 | 1006 | if self.ui.debugflag: |
|
1007 | 1007 | return [parents[0], self.repo['null']] |
|
1008 | 1008 | if parents[0].rev() >= ctx.rev() - 1: |
|
1009 | 1009 | return [] |
|
1010 | 1010 | return parents |
|
1011 | 1011 | |
|
1012 | 1012 | def _show(self, ctx, copies, matchfn, props): |
|
1013 | 1013 | '''show a single changeset or file revision''' |
|
1014 | 1014 | |
|
1015 | 1015 | showlist = templatekw.showlist |
|
1016 | 1016 | |
|
1017 | 1017 | # showparents() behaviour depends on ui trace level which |
|
1018 | 1018 | # causes unexpected behaviours at templating level and makes |
|
1019 | 1019 | # it harder to extract it in a standalone function. Its |
|
1020 | 1020 | # behaviour cannot be changed so leave it here for now. |
|
1021 | 1021 | def showparents(**args): |
|
1022 | 1022 | ctx = args['ctx'] |
|
1023 | 1023 | parents = [[('rev', p.rev()), ('node', p.hex())] |
|
1024 | 1024 | for p in self._meaningful_parentrevs(ctx)] |
|
1025 | 1025 | return showlist('parent', parents, **args) |
|
1026 | 1026 | |
|
1027 | 1027 | props = props.copy() |
|
1028 | 1028 | props.update(templatekw.keywords) |
|
1029 | 1029 | props['parents'] = showparents |
|
1030 | 1030 | props['templ'] = self.t |
|
1031 | 1031 | props['ctx'] = ctx |
|
1032 | 1032 | props['repo'] = self.repo |
|
1033 | 1033 | props['revcache'] = {'copies': copies} |
|
1034 | 1034 | props['cache'] = self.cache |
|
1035 | 1035 | |
|
1036 | 1036 | # find correct templates for current mode |
|
1037 | 1037 | |
|
1038 | 1038 | tmplmodes = [ |
|
1039 | 1039 | (True, None), |
|
1040 | 1040 | (self.ui.verbose, 'verbose'), |
|
1041 | 1041 | (self.ui.quiet, 'quiet'), |
|
1042 | 1042 | (self.ui.debugflag, 'debug'), |
|
1043 | 1043 | ] |
|
1044 | 1044 | |
|
1045 | 1045 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} |
|
1046 | 1046 | for mode, postfix in tmplmodes: |
|
1047 | 1047 | for type in types: |
|
1048 | 1048 | cur = postfix and ('%s_%s' % (type, postfix)) or type |
|
1049 | 1049 | if mode and cur in self.t: |
|
1050 | 1050 | types[type] = cur |
|
1051 | 1051 | |
|
1052 | 1052 | try: |
|
1053 | 1053 | |
|
1054 | 1054 | # write header |
|
1055 | 1055 | if types['header']: |
|
1056 | 1056 | h = templater.stringify(self.t(types['header'], **props)) |
|
1057 | 1057 | if self.buffered: |
|
1058 | 1058 | self.header[ctx.rev()] = h |
|
1059 | 1059 | else: |
|
1060 | 1060 | if self.lastheader != h: |
|
1061 | 1061 | self.lastheader = h |
|
1062 | 1062 | self.ui.write(h) |
|
1063 | 1063 | |
|
1064 | 1064 | # write changeset metadata, then patch if requested |
|
1065 | 1065 | key = types['changeset'] |
|
1066 | 1066 | self.ui.write(templater.stringify(self.t(key, **props))) |
|
1067 | 1067 | self.showpatch(ctx.node(), matchfn) |
|
1068 | 1068 | |
|
1069 | 1069 | if types['footer']: |
|
1070 | 1070 | if not self.footer: |
|
1071 | 1071 | self.footer = templater.stringify(self.t(types['footer'], |
|
1072 | 1072 | **props)) |
|
1073 | 1073 | |
|
1074 | 1074 | except KeyError, inst: |
|
1075 | 1075 | msg = _("%s: no key named '%s'") |
|
1076 | 1076 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) |
|
1077 | 1077 | except SyntaxError, inst: |
|
1078 | 1078 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) |
|
1079 | 1079 | |
|
1080 | 1080 | def gettemplate(ui, tmpl, style): |
|
1081 | 1081 | """ |
|
1082 | 1082 | Find the template matching the given template spec or style. |
|
1083 | 1083 | """ |
|
1084 | 1084 | |
|
1085 | 1085 | # ui settings |
|
1086 | 1086 | if not tmpl and not style: |
|
1087 | 1087 | tmpl = ui.config('ui', 'logtemplate') |
|
1088 | 1088 | if tmpl: |
|
1089 | 1089 | try: |
|
1090 | 1090 | tmpl = templater.parsestring(tmpl) |
|
1091 | 1091 | except SyntaxError: |
|
1092 | 1092 | tmpl = templater.parsestring(tmpl, quoted=False) |
|
1093 | 1093 | return tmpl, None |
|
1094 | 1094 | else: |
|
1095 | 1095 | style = util.expandpath(ui.config('ui', 'style', '')) |
|
1096 | 1096 | |
|
1097 | 1097 | if style: |
|
1098 | 1098 | mapfile = style |
|
1099 | 1099 | if not os.path.split(mapfile)[0]: |
|
1100 | 1100 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
|
1101 | 1101 | or templater.templatepath(mapfile)) |
|
1102 | 1102 | if mapname: |
|
1103 | 1103 | mapfile = mapname |
|
1104 | 1104 | return None, mapfile |
|
1105 | 1105 | |
|
1106 | 1106 | if not tmpl: |
|
1107 | 1107 | return None, None |
|
1108 | 1108 | |
|
1109 | 1109 | # looks like a literal template? |
|
1110 | 1110 | if '{' in tmpl: |
|
1111 | 1111 | return tmpl, None |
|
1112 | 1112 | |
|
1113 | 1113 | # perhaps a stock style? |
|
1114 | 1114 | if not os.path.split(tmpl)[0]: |
|
1115 | 1115 | mapname = (templater.templatepath('map-cmdline.' + tmpl) |
|
1116 | 1116 | or templater.templatepath(tmpl)) |
|
1117 | 1117 | if mapname and os.path.isfile(mapname): |
|
1118 | 1118 | return None, mapname |
|
1119 | 1119 | |
|
1120 | 1120 | # perhaps it's a reference to [templates] |
|
1121 | 1121 | t = ui.config('templates', tmpl) |
|
1122 | 1122 | if t: |
|
1123 | 1123 | try: |
|
1124 | 1124 | tmpl = templater.parsestring(t) |
|
1125 | 1125 | except SyntaxError: |
|
1126 | 1126 | tmpl = templater.parsestring(t, quoted=False) |
|
1127 | 1127 | return tmpl, None |
|
1128 | 1128 | |
|
1129 | 1129 | if tmpl == 'list': |
|
1130 | 1130 | ui.write(_("available styles: %s\n") % templater.stylelist()) |
|
1131 | 1131 | raise util.Abort(_("specify a template")) |
|
1132 | 1132 | |
|
1133 | 1133 | # perhaps it's a path to a map or a template |
|
1134 | 1134 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): |
|
1135 | 1135 | # is it a mapfile for a style? |
|
1136 | 1136 | if os.path.basename(tmpl).startswith("map-"): |
|
1137 | 1137 | return None, os.path.realpath(tmpl) |
|
1138 | 1138 | tmpl = open(tmpl).read() |
|
1139 | 1139 | return tmpl, None |
|
1140 | 1140 | |
|
1141 | 1141 | # constant string? |
|
1142 | 1142 | return tmpl, None |
|
1143 | 1143 | |
|
1144 | 1144 | def show_changeset(ui, repo, opts, buffered=False): |
|
1145 | 1145 | """show one changeset using template or regular display. |
|
1146 | 1146 | |
|
1147 | 1147 | Display format will be the first non-empty hit of: |
|
1148 | 1148 | 1. option 'template' |
|
1149 | 1149 | 2. option 'style' |
|
1150 | 1150 | 3. [ui] setting 'logtemplate' |
|
1151 | 1151 | 4. [ui] setting 'style' |
|
1152 | 1152 | If all of these values are either the unset or the empty string, |
|
1153 | 1153 | regular display via changeset_printer() is done. |
|
1154 | 1154 | """ |
|
1155 | 1155 | # options |
|
1156 | 1156 | patch = None |
|
1157 | 1157 | if opts.get('patch') or opts.get('stat'): |
|
1158 | 1158 | patch = scmutil.matchall(repo) |
|
1159 | 1159 | |
|
1160 | 1160 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) |
|
1161 | 1161 | |
|
1162 | 1162 | if not tmpl and not mapfile: |
|
1163 | 1163 | return changeset_printer(ui, repo, patch, opts, buffered) |
|
1164 | 1164 | |
|
1165 | 1165 | try: |
|
1166 | 1166 | t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered) |
|
1167 | 1167 | except SyntaxError, inst: |
|
1168 | 1168 | raise util.Abort(inst.args[0]) |
|
1169 | 1169 | return t |
|
1170 | 1170 | |
|
1171 | 1171 | def showmarker(ui, marker): |
|
1172 | 1172 | """utility function to display obsolescence marker in a readable way |
|
1173 | 1173 | |
|
1174 | 1174 | To be used by debug function.""" |
|
1175 | 1175 | ui.write(hex(marker.precnode())) |
|
1176 | 1176 | for repl in marker.succnodes(): |
|
1177 | 1177 | ui.write(' ') |
|
1178 | 1178 | ui.write(hex(repl)) |
|
1179 | 1179 | ui.write(' %X ' % marker._data[2]) |
|
1180 | 1180 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
1181 | 1181 | sorted(marker.metadata().items())))) |
|
1182 | 1182 | ui.write('\n') |
|
1183 | 1183 | |
|
1184 | 1184 | def finddate(ui, repo, date): |
|
1185 | 1185 | """Find the tipmost changeset that matches the given date spec""" |
|
1186 | 1186 | |
|
1187 | 1187 | df = util.matchdate(date) |
|
1188 | 1188 | m = scmutil.matchall(repo) |
|
1189 | 1189 | results = {} |
|
1190 | 1190 | |
|
1191 | 1191 | def prep(ctx, fns): |
|
1192 | 1192 | d = ctx.date() |
|
1193 | 1193 | if df(d[0]): |
|
1194 | 1194 | results[ctx.rev()] = d |
|
1195 | 1195 | |
|
1196 | 1196 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): |
|
1197 | 1197 | rev = ctx.rev() |
|
1198 | 1198 | if rev in results: |
|
1199 | 1199 | ui.status(_("found revision %s from %s\n") % |
|
1200 | 1200 | (rev, util.datestr(results[rev]))) |
|
1201 | 1201 | return str(rev) |
|
1202 | 1202 | |
|
1203 | 1203 | raise util.Abort(_("revision matching date not found")) |
|
1204 | 1204 | |
|
1205 | 1205 | def increasingwindows(windowsize=8, sizelimit=512): |
|
1206 | 1206 | while True: |
|
1207 | 1207 | yield windowsize |
|
1208 | 1208 | if windowsize < sizelimit: |
|
1209 | 1209 | windowsize *= 2 |
|
1210 | 1210 | |
|
1211 | 1211 | class FileWalkError(Exception): |
|
1212 | 1212 | pass |
|
1213 | 1213 | |
|
1214 | 1214 | def walkfilerevs(repo, match, follow, revs, fncache): |
|
1215 | 1215 | '''Walks the file history for the matched files. |
|
1216 | 1216 | |
|
1217 | 1217 | Returns the changeset revs that are involved in the file history. |
|
1218 | 1218 | |
|
1219 | 1219 | Throws FileWalkError if the file history can't be walked using |
|
1220 | 1220 | filelogs alone. |
|
1221 | 1221 | ''' |
|
1222 | 1222 | wanted = set() |
|
1223 | 1223 | copies = [] |
|
1224 | 1224 | minrev, maxrev = min(revs), max(revs) |
|
1225 | 1225 | def filerevgen(filelog, last): |
|
1226 | 1226 | """ |
|
1227 | 1227 | Only files, no patterns. Check the history of each file. |
|
1228 | 1228 | |
|
1229 | 1229 | Examines filelog entries within minrev, maxrev linkrev range |
|
1230 | 1230 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) |
|
1231 | 1231 | tuples in backwards order |
|
1232 | 1232 | """ |
|
1233 | 1233 | cl_count = len(repo) |
|
1234 | 1234 | revs = [] |
|
1235 | 1235 | for j in xrange(0, last + 1): |
|
1236 | 1236 | linkrev = filelog.linkrev(j) |
|
1237 | 1237 | if linkrev < minrev: |
|
1238 | 1238 | continue |
|
1239 | 1239 | # only yield rev for which we have the changelog, it can |
|
1240 | 1240 | # happen while doing "hg log" during a pull or commit |
|
1241 | 1241 | if linkrev >= cl_count: |
|
1242 | 1242 | break |
|
1243 | 1243 | |
|
1244 | 1244 | parentlinkrevs = [] |
|
1245 | 1245 | for p in filelog.parentrevs(j): |
|
1246 | 1246 | if p != nullrev: |
|
1247 | 1247 | parentlinkrevs.append(filelog.linkrev(p)) |
|
1248 | 1248 | n = filelog.node(j) |
|
1249 | 1249 | revs.append((linkrev, parentlinkrevs, |
|
1250 | 1250 | follow and filelog.renamed(n))) |
|
1251 | 1251 | |
|
1252 | 1252 | return reversed(revs) |
|
1253 | 1253 | def iterfiles(): |
|
1254 | 1254 | pctx = repo['.'] |
|
1255 | 1255 | for filename in match.files(): |
|
1256 | 1256 | if follow: |
|
1257 | 1257 | if filename not in pctx: |
|
1258 | 1258 | raise util.Abort(_('cannot follow file not in parent ' |
|
1259 | 1259 | 'revision: "%s"') % filename) |
|
1260 | 1260 | yield filename, pctx[filename].filenode() |
|
1261 | 1261 | else: |
|
1262 | 1262 | yield filename, None |
|
1263 | 1263 | for filename_node in copies: |
|
1264 | 1264 | yield filename_node |
|
1265 | 1265 | |
|
1266 | 1266 | for file_, node in iterfiles(): |
|
1267 | 1267 | filelog = repo.file(file_) |
|
1268 | 1268 | if not len(filelog): |
|
1269 | 1269 | if node is None: |
|
1270 | 1270 | # A zero count may be a directory or deleted file, so |
|
1271 | 1271 | # try to find matching entries on the slow path. |
|
1272 | 1272 | if follow: |
|
1273 | 1273 | raise util.Abort( |
|
1274 | 1274 | _('cannot follow nonexistent file: "%s"') % file_) |
|
1275 | 1275 | raise FileWalkError("Cannot walk via filelog") |
|
1276 | 1276 | else: |
|
1277 | 1277 | continue |
|
1278 | 1278 | |
|
1279 | 1279 | if node is None: |
|
1280 | 1280 | last = len(filelog) - 1 |
|
1281 | 1281 | else: |
|
1282 | 1282 | last = filelog.rev(node) |
|
1283 | 1283 | |
|
1284 | 1284 | |
|
1285 | 1285 | # keep track of all ancestors of the file |
|
1286 | 1286 | ancestors = set([filelog.linkrev(last)]) |
|
1287 | 1287 | |
|
1288 | 1288 | # iterate from latest to oldest revision |
|
1289 | 1289 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): |
|
1290 | 1290 | if not follow: |
|
1291 | 1291 | if rev > maxrev: |
|
1292 | 1292 | continue |
|
1293 | 1293 | else: |
|
1294 | 1294 | # Note that last might not be the first interesting |
|
1295 | 1295 | # rev to us: |
|
1296 | 1296 | # if the file has been changed after maxrev, we'll |
|
1297 | 1297 | # have linkrev(last) > maxrev, and we still need |
|
1298 | 1298 | # to explore the file graph |
|
1299 | 1299 | if rev not in ancestors: |
|
1300 | 1300 | continue |
|
1301 | 1301 | # XXX insert 1327 fix here |
|
1302 | 1302 | if flparentlinkrevs: |
|
1303 | 1303 | ancestors.update(flparentlinkrevs) |
|
1304 | 1304 | |
|
1305 | 1305 | fncache.setdefault(rev, []).append(file_) |
|
1306 | 1306 | wanted.add(rev) |
|
1307 | 1307 | if copied: |
|
1308 | 1308 | copies.append(copied) |
|
1309 | 1309 | |
|
1310 | 1310 | return wanted |
|
1311 | 1311 | |
|
1312 | 1312 | def walkchangerevs(repo, match, opts, prepare): |
|
1313 | 1313 | '''Iterate over files and the revs in which they changed. |
|
1314 | 1314 | |
|
1315 | 1315 | Callers most commonly need to iterate backwards over the history |
|
1316 | 1316 | in which they are interested. Doing so has awful (quadratic-looking) |
|
1317 | 1317 | performance, so we use iterators in a "windowed" way. |
|
1318 | 1318 | |
|
1319 | 1319 | We walk a window of revisions in the desired order. Within the |
|
1320 | 1320 | window, we first walk forwards to gather data, then in the desired |
|
1321 | 1321 | order (usually backwards) to display it. |
|
1322 | 1322 | |
|
1323 | 1323 | This function returns an iterator yielding contexts. Before |
|
1324 | 1324 | yielding each context, the iterator will first call the prepare |
|
1325 | 1325 | function on each context in the window in forward order.''' |
|
1326 | 1326 | |
|
1327 | 1327 | follow = opts.get('follow') or opts.get('follow_first') |
|
1328 | 1328 | |
|
1329 | 1329 | if opts.get('rev'): |
|
1330 | 1330 | revs = scmutil.revrange(repo, opts.get('rev')) |
|
1331 | 1331 | elif follow: |
|
1332 | 1332 | revs = repo.revs('reverse(:.)') |
|
1333 | 1333 | else: |
|
1334 | 1334 | revs = revset.spanset(repo) |
|
1335 | 1335 | revs.reverse() |
|
1336 | 1336 | if not revs: |
|
1337 | 1337 | return [] |
|
1338 | 1338 | wanted = set() |
|
1339 | 1339 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1340 | 1340 | fncache = {} |
|
1341 | 1341 | change = repo.changectx |
|
1342 | 1342 | |
|
1343 | 1343 | # First step is to fill wanted, the set of revisions that we want to yield. |
|
1344 | 1344 | # When it does not induce extra cost, we also fill fncache for revisions in |
|
1345 | 1345 | # wanted: a cache of filenames that were changed (ctx.files()) and that |
|
1346 | 1346 | # match the file filtering conditions. |
|
1347 | 1347 | |
|
1348 | 1348 | if not slowpath and not match.files(): |
|
1349 | 1349 | # No files, no patterns. Display all revs. |
|
1350 | 1350 | wanted = revs |
|
1351 | 1351 | |
|
1352 | 1352 | if not slowpath and match.files(): |
|
1353 | 1353 | # We only have to read through the filelog to find wanted revisions |
|
1354 | 1354 | |
|
1355 | 1355 | try: |
|
1356 | 1356 | wanted = walkfilerevs(repo, match, follow, revs, fncache) |
|
1357 | 1357 | except FileWalkError: |
|
1358 | 1358 | slowpath = True |
|
1359 | 1359 | |
|
1360 | 1360 | # We decided to fall back to the slowpath because at least one |
|
1361 | 1361 | # of the paths was not a file. Check to see if at least one of them |
|
1362 | 1362 | # existed in history, otherwise simply return |
|
1363 | 1363 | for path in match.files(): |
|
1364 | 1364 | if path == '.' or path in repo.store: |
|
1365 | 1365 | break |
|
1366 | 1366 | else: |
|
1367 | 1367 | return [] |
|
1368 | 1368 | |
|
1369 | 1369 | if slowpath: |
|
1370 | 1370 | # We have to read the changelog to match filenames against |
|
1371 | 1371 | # changed files |
|
1372 | 1372 | |
|
1373 | 1373 | if follow: |
|
1374 | 1374 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
1375 | 1375 | 'filenames')) |
|
1376 | 1376 | |
|
1377 | 1377 | # The slow path checks files modified in every changeset. |
|
1378 | 1378 | # This is really slow on large repos, so compute the set lazily. |
|
1379 | 1379 | class lazywantedset(object): |
|
1380 | 1380 | def __init__(self): |
|
1381 | 1381 | self.set = set() |
|
1382 | 1382 | self.revs = set(revs) |
|
1383 | 1383 | |
|
1384 | 1384 | # No need to worry about locality here because it will be accessed |
|
1385 | 1385 | # in the same order as the increasing window below. |
|
1386 | 1386 | def __contains__(self, value): |
|
1387 | 1387 | if value in self.set: |
|
1388 | 1388 | return True |
|
1389 | 1389 | elif not value in self.revs: |
|
1390 | 1390 | return False |
|
1391 | 1391 | else: |
|
1392 | 1392 | self.revs.discard(value) |
|
1393 | 1393 | ctx = change(value) |
|
1394 | 1394 | matches = filter(match, ctx.files()) |
|
1395 | 1395 | if matches: |
|
1396 | 1396 | fncache[value] = matches |
|
1397 | 1397 | self.set.add(value) |
|
1398 | 1398 | return True |
|
1399 | 1399 | return False |
|
1400 | 1400 | |
|
1401 | 1401 | def discard(self, value): |
|
1402 | 1402 | self.revs.discard(value) |
|
1403 | 1403 | self.set.discard(value) |
|
1404 | 1404 | |
|
1405 | 1405 | wanted = lazywantedset() |
|
1406 | 1406 | |
|
1407 | 1407 | class followfilter(object): |
|
1408 | 1408 | def __init__(self, onlyfirst=False): |
|
1409 | 1409 | self.startrev = nullrev |
|
1410 | 1410 | self.roots = set() |
|
1411 | 1411 | self.onlyfirst = onlyfirst |
|
1412 | 1412 | |
|
1413 | 1413 | def match(self, rev): |
|
1414 | 1414 | def realparents(rev): |
|
1415 | 1415 | if self.onlyfirst: |
|
1416 | 1416 | return repo.changelog.parentrevs(rev)[0:1] |
|
1417 | 1417 | else: |
|
1418 | 1418 | return filter(lambda x: x != nullrev, |
|
1419 | 1419 | repo.changelog.parentrevs(rev)) |
|
1420 | 1420 | |
|
1421 | 1421 | if self.startrev == nullrev: |
|
1422 | 1422 | self.startrev = rev |
|
1423 | 1423 | return True |
|
1424 | 1424 | |
|
1425 | 1425 | if rev > self.startrev: |
|
1426 | 1426 | # forward: all descendants |
|
1427 | 1427 | if not self.roots: |
|
1428 | 1428 | self.roots.add(self.startrev) |
|
1429 | 1429 | for parent in realparents(rev): |
|
1430 | 1430 | if parent in self.roots: |
|
1431 | 1431 | self.roots.add(rev) |
|
1432 | 1432 | return True |
|
1433 | 1433 | else: |
|
1434 | 1434 | # backwards: all parents |
|
1435 | 1435 | if not self.roots: |
|
1436 | 1436 | self.roots.update(realparents(self.startrev)) |
|
1437 | 1437 | if rev in self.roots: |
|
1438 | 1438 | self.roots.remove(rev) |
|
1439 | 1439 | self.roots.update(realparents(rev)) |
|
1440 | 1440 | return True |
|
1441 | 1441 | |
|
1442 | 1442 | return False |
|
1443 | 1443 | |
|
1444 | 1444 | # it might be worthwhile to do this in the iterator if the rev range |
|
1445 | 1445 | # is descending and the prune args are all within that range |
|
1446 | 1446 | for rev in opts.get('prune', ()): |
|
1447 | 1447 | rev = repo[rev].rev() |
|
1448 | 1448 | ff = followfilter() |
|
1449 | 1449 | stop = min(revs[0], revs[-1]) |
|
1450 | 1450 | for x in xrange(rev, stop - 1, -1): |
|
1451 | 1451 | if ff.match(x): |
|
1452 | 1452 | wanted = wanted - [x] |
|
1453 | 1453 | |
|
1454 | 1454 | # Now that wanted is correctly initialized, we can iterate over the |
|
1455 | 1455 | # revision range, yielding only revisions in wanted. |
|
1456 | 1456 | def iterate(): |
|
1457 | 1457 | if follow and not match.files(): |
|
1458 | 1458 | ff = followfilter(onlyfirst=opts.get('follow_first')) |
|
1459 | 1459 | def want(rev): |
|
1460 | 1460 | return ff.match(rev) and rev in wanted |
|
1461 | 1461 | else: |
|
1462 | 1462 | def want(rev): |
|
1463 | 1463 | return rev in wanted |
|
1464 | 1464 | |
|
1465 | 1465 | it = iter(revs) |
|
1466 | 1466 | stopiteration = False |
|
1467 | 1467 | for windowsize in increasingwindows(): |
|
1468 | 1468 | nrevs = [] |
|
1469 | 1469 | for i in xrange(windowsize): |
|
1470 | 1470 | try: |
|
1471 | 1471 | rev = it.next() |
|
1472 | 1472 | if want(rev): |
|
1473 | 1473 | nrevs.append(rev) |
|
1474 | 1474 | except (StopIteration): |
|
1475 | 1475 | stopiteration = True |
|
1476 | 1476 | break |
|
1477 | 1477 | for rev in sorted(nrevs): |
|
1478 | 1478 | fns = fncache.get(rev) |
|
1479 | 1479 | ctx = change(rev) |
|
1480 | 1480 | if not fns: |
|
1481 | 1481 | def fns_generator(): |
|
1482 | 1482 | for f in ctx.files(): |
|
1483 | 1483 | if match(f): |
|
1484 | 1484 | yield f |
|
1485 | 1485 | fns = fns_generator() |
|
1486 | 1486 | prepare(ctx, fns) |
|
1487 | 1487 | for rev in nrevs: |
|
1488 | 1488 | yield change(rev) |
|
1489 | 1489 | |
|
1490 | 1490 | if stopiteration: |
|
1491 | 1491 | break |
|
1492 | 1492 | |
|
1493 | 1493 | return iterate() |
|
1494 | 1494 | |
|
1495 | 1495 | def _makelogfilematcher(repo, files, followfirst): |
|
1496 | 1496 | # When displaying a revision with --patch --follow FILE, we have |
|
1497 | 1497 | # to know which file of the revision must be diffed. With |
|
1498 | 1498 | # --follow, we want the names of the ancestors of FILE in the |
|
1499 | 1499 | # revision, stored in "fcache". "fcache" is populated by |
|
1500 | 1500 | # reproducing the graph traversal already done by --follow revset |
|
1501 | 1501 | # and relating linkrevs to file names (which is not "correct" but |
|
1502 | 1502 | # good enough). |
|
1503 | 1503 | fcache = {} |
|
1504 | 1504 | fcacheready = [False] |
|
1505 | 1505 | pctx = repo['.'] |
|
1506 | 1506 | |
|
1507 | 1507 | def populate(): |
|
1508 | 1508 | for fn in files: |
|
1509 | 1509 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): |
|
1510 | 1510 | for c in i: |
|
1511 | 1511 | fcache.setdefault(c.linkrev(), set()).add(c.path()) |
|
1512 | 1512 | |
|
1513 | 1513 | def filematcher(rev): |
|
1514 | 1514 | if not fcacheready[0]: |
|
1515 | 1515 | # Lazy initialization |
|
1516 | 1516 | fcacheready[0] = True |
|
1517 | 1517 | populate() |
|
1518 | 1518 | return scmutil.matchfiles(repo, fcache.get(rev, [])) |
|
1519 | 1519 | |
|
1520 | 1520 | return filematcher |
|
1521 | 1521 | |
|
1522 | 1522 | def _makelogrevset(repo, pats, opts, revs): |
|
1523 | 1523 | """Return (expr, filematcher) where expr is a revset string built |
|
1524 | 1524 | from log options and file patterns or None. If --stat or --patch |
|
1525 | 1525 | are not passed filematcher is None. Otherwise it is a callable |
|
1526 | 1526 | taking a revision number and returning a match objects filtering |
|
1527 | 1527 | the files to be detailed when displaying the revision. |
|
1528 | 1528 | """ |
|
1529 | 1529 | opt2revset = { |
|
1530 | 1530 | 'no_merges': ('not merge()', None), |
|
1531 | 1531 | 'only_merges': ('merge()', None), |
|
1532 | 1532 | '_ancestors': ('ancestors(%(val)s)', None), |
|
1533 | 1533 | '_fancestors': ('_firstancestors(%(val)s)', None), |
|
1534 | 1534 | '_descendants': ('descendants(%(val)s)', None), |
|
1535 | 1535 | '_fdescendants': ('_firstdescendants(%(val)s)', None), |
|
1536 | 1536 | '_matchfiles': ('_matchfiles(%(val)s)', None), |
|
1537 | 1537 | 'date': ('date(%(val)r)', None), |
|
1538 | 1538 | 'branch': ('branch(%(val)r)', ' or '), |
|
1539 | 1539 | '_patslog': ('filelog(%(val)r)', ' or '), |
|
1540 | 1540 | '_patsfollow': ('follow(%(val)r)', ' or '), |
|
1541 | 1541 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), |
|
1542 | 1542 | 'keyword': ('keyword(%(val)r)', ' or '), |
|
1543 | 1543 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), |
|
1544 | 1544 | 'user': ('user(%(val)r)', ' or '), |
|
1545 | 1545 | } |
|
1546 | 1546 | |
|
1547 | 1547 | opts = dict(opts) |
|
1548 | 1548 | # follow or not follow? |
|
1549 | 1549 | follow = opts.get('follow') or opts.get('follow_first') |
|
1550 | 1550 | followfirst = opts.get('follow_first') and 1 or 0 |
|
1551 | 1551 | # --follow with FILE behaviour depends on revs... |
|
1552 | 1552 | it = iter(revs) |
|
1553 | 1553 | startrev = it.next() |
|
1554 | 1554 | try: |
|
1555 | 1555 | followdescendants = startrev < it.next() |
|
1556 | 1556 | except (StopIteration): |
|
1557 | 1557 | followdescendants = False |
|
1558 | 1558 | |
|
1559 | 1559 | # branch and only_branch are really aliases and must be handled at |
|
1560 | 1560 | # the same time |
|
1561 | 1561 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) |
|
1562 | 1562 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] |
|
1563 | 1563 | # pats/include/exclude are passed to match.match() directly in |
|
1564 | 1564 | # _matchfiles() revset but walkchangerevs() builds its matcher with |
|
1565 | 1565 | # scmutil.match(). The difference is input pats are globbed on |
|
1566 | 1566 | # platforms without shell expansion (windows). |
|
1567 | 1567 | pctx = repo[None] |
|
1568 | 1568 | match, pats = scmutil.matchandpats(pctx, pats, opts) |
|
1569 | 1569 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1570 | 1570 | if not slowpath: |
|
1571 | 1571 | for f in match.files(): |
|
1572 | 1572 | if follow and f not in pctx: |
|
1573 | raise util.Abort(_('cannot follow file not in parent ' | |
|
1574 | 'revision: "%s"') % f) | |
|
1573 | # If the file exists, it may be a directory, so let it | |
|
1574 | # take the slow path. | |
|
1575 | if os.path.exists(repo.wjoin(f)): | |
|
1576 | slowpath = True | |
|
1577 | continue | |
|
1578 | else: | |
|
1579 | raise util.Abort(_('cannot follow file not in parent ' | |
|
1580 | 'revision: "%s"') % f) | |
|
1575 | 1581 | filelog = repo.file(f) |
|
1576 | 1582 | if not filelog: |
|
1577 | 1583 | # A zero count may be a directory or deleted file, so |
|
1578 | 1584 | # try to find matching entries on the slow path. |
|
1579 | 1585 | if follow: |
|
1580 | 1586 | raise util.Abort( |
|
1581 | 1587 | _('cannot follow nonexistent file: "%s"') % f) |
|
1582 | 1588 | slowpath = True |
|
1583 | 1589 | |
|
1584 | 1590 | # We decided to fall back to the slowpath because at least one |
|
1585 | 1591 | # of the paths was not a file. Check to see if at least one of them |
|
1586 | 1592 | # existed in history - in that case, we'll continue down the |
|
1587 | 1593 | # slowpath; otherwise, we can turn off the slowpath |
|
1588 | 1594 | if slowpath: |
|
1589 | 1595 | for path in match.files(): |
|
1590 | 1596 | if path == '.' or path in repo.store: |
|
1591 | 1597 | break |
|
1592 | 1598 | else: |
|
1593 | 1599 | slowpath = False |
|
1594 | 1600 | |
|
1595 | 1601 | if slowpath: |
|
1596 | 1602 | # See walkchangerevs() slow path. |
|
1597 | 1603 | # |
|
1598 | if follow: | |
|
1599 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
|
1600 | 'filenames')) | |
|
1601 | 1604 | # pats/include/exclude cannot be represented as separate |
|
1602 | 1605 | # revset expressions as their filtering logic applies at file |
|
1603 | 1606 | # level. For instance "-I a -X a" matches a revision touching |
|
1604 | 1607 | # "a" and "b" while "file(a) and not file(b)" does |
|
1605 | 1608 | # not. Besides, filesets are evaluated against the working |
|
1606 | 1609 | # directory. |
|
1607 | 1610 | matchargs = ['r:', 'd:relpath'] |
|
1608 | 1611 | for p in pats: |
|
1609 | 1612 | matchargs.append('p:' + p) |
|
1610 | 1613 | for p in opts.get('include', []): |
|
1611 | 1614 | matchargs.append('i:' + p) |
|
1612 | 1615 | for p in opts.get('exclude', []): |
|
1613 | 1616 | matchargs.append('x:' + p) |
|
1614 | 1617 | matchargs = ','.join(('%r' % p) for p in matchargs) |
|
1615 | 1618 | opts['_matchfiles'] = matchargs |
|
1616 | 1619 | else: |
|
1617 | 1620 | if follow: |
|
1618 | 1621 | fpats = ('_patsfollow', '_patsfollowfirst') |
|
1619 | 1622 | fnopats = (('_ancestors', '_fancestors'), |
|
1620 | 1623 | ('_descendants', '_fdescendants')) |
|
1621 | 1624 | if pats: |
|
1622 | 1625 | # follow() revset interprets its file argument as a |
|
1623 | 1626 | # manifest entry, so use match.files(), not pats. |
|
1624 | 1627 | opts[fpats[followfirst]] = list(match.files()) |
|
1625 | 1628 | else: |
|
1626 | 1629 | opts[fnopats[followdescendants][followfirst]] = str(startrev) |
|
1627 | 1630 | else: |
|
1628 | 1631 | opts['_patslog'] = list(pats) |
|
1629 | 1632 | |
|
1630 | 1633 | filematcher = None |
|
1631 | 1634 | if opts.get('patch') or opts.get('stat'): |
|
1632 | if follow and not match.always(): | |
|
1635 | # When following files, track renames via a special matcher. | |
|
1636 | # If we're forced to take the slowpath it means we're following | |
|
1637 | # at least one pattern/directory, so don't bother with rename tracking. | |
|
1638 | if follow and not match.always() and not slowpath: | |
|
1633 | 1639 | # _makelogfilematcher expects its files argument to be relative to |
|
1634 | 1640 | # the repo root, so use match.files(), not pats. |
|
1635 | 1641 | filematcher = _makelogfilematcher(repo, match.files(), followfirst) |
|
1636 | 1642 | else: |
|
1637 | 1643 | filematcher = lambda rev: match |
|
1638 | 1644 | |
|
1639 | 1645 | expr = [] |
|
1640 | 1646 | for op, val in opts.iteritems(): |
|
1641 | 1647 | if not val: |
|
1642 | 1648 | continue |
|
1643 | 1649 | if op not in opt2revset: |
|
1644 | 1650 | continue |
|
1645 | 1651 | revop, andor = opt2revset[op] |
|
1646 | 1652 | if '%(val)' not in revop: |
|
1647 | 1653 | expr.append(revop) |
|
1648 | 1654 | else: |
|
1649 | 1655 | if not isinstance(val, list): |
|
1650 | 1656 | e = revop % {'val': val} |
|
1651 | 1657 | else: |
|
1652 | 1658 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' |
|
1653 | 1659 | expr.append(e) |
|
1654 | 1660 | |
|
1655 | 1661 | if expr: |
|
1656 | 1662 | expr = '(' + ' and '.join(expr) + ')' |
|
1657 | 1663 | else: |
|
1658 | 1664 | expr = None |
|
1659 | 1665 | return expr, filematcher |
|
1660 | 1666 | |
|
1661 | 1667 | def getgraphlogrevs(repo, pats, opts): |
|
1662 | 1668 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
1663 | 1669 | revision numbers, expr is a revset string built from log options |
|
1664 | 1670 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
1665 | 1671 | --patch are not passed filematcher is None. Otherwise it is a |
|
1666 | 1672 | callable taking a revision number and returning a match objects |
|
1667 | 1673 | filtering the files to be detailed when displaying the revision. |
|
1668 | 1674 | """ |
|
1669 | 1675 | if not len(repo): |
|
1670 | 1676 | return [], None, None |
|
1671 | 1677 | limit = loglimit(opts) |
|
1672 | 1678 | # Default --rev value depends on --follow but --follow behaviour |
|
1673 | 1679 | # depends on revisions resolved from --rev... |
|
1674 | 1680 | follow = opts.get('follow') or opts.get('follow_first') |
|
1675 | 1681 | possiblyunsorted = False # whether revs might need sorting |
|
1676 | 1682 | if opts.get('rev'): |
|
1677 | 1683 | revs = scmutil.revrange(repo, opts['rev']) |
|
1678 | 1684 | # Don't sort here because _makelogrevset might depend on the |
|
1679 | 1685 | # order of revs |
|
1680 | 1686 | possiblyunsorted = True |
|
1681 | 1687 | else: |
|
1682 | 1688 | if follow and len(repo) > 0: |
|
1683 | 1689 | revs = repo.revs('reverse(:.)') |
|
1684 | 1690 | else: |
|
1685 | 1691 | revs = revset.spanset(repo) |
|
1686 | 1692 | revs.reverse() |
|
1687 | 1693 | if not revs: |
|
1688 | 1694 | return revset.baseset(), None, None |
|
1689 | 1695 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
|
1690 | 1696 | if possiblyunsorted: |
|
1691 | 1697 | revs.sort(reverse=True) |
|
1692 | 1698 | if expr: |
|
1693 | 1699 | # Revset matchers often operate faster on revisions in changelog |
|
1694 | 1700 | # order, because most filters deal with the changelog. |
|
1695 | 1701 | revs.reverse() |
|
1696 | 1702 | matcher = revset.match(repo.ui, expr) |
|
1697 | 1703 | # Revset matches can reorder revisions. "A or B" typically returns |
|
1698 | 1704 | # returns the revision matching A then the revision matching B. Sort |
|
1699 | 1705 | # again to fix that. |
|
1700 | 1706 | revs = matcher(repo, revs) |
|
1701 | 1707 | revs.sort(reverse=True) |
|
1702 | 1708 | if limit is not None: |
|
1703 | 1709 | limitedrevs = revset.baseset() |
|
1704 | 1710 | for idx, rev in enumerate(revs): |
|
1705 | 1711 | if idx >= limit: |
|
1706 | 1712 | break |
|
1707 | 1713 | limitedrevs.append(rev) |
|
1708 | 1714 | revs = limitedrevs |
|
1709 | 1715 | |
|
1710 | 1716 | return revs, expr, filematcher |
|
1711 | 1717 | |
|
1712 | 1718 | def getlogrevs(repo, pats, opts): |
|
1713 | 1719 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
1714 | 1720 | revision numbers, expr is a revset string built from log options |
|
1715 | 1721 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
1716 | 1722 | --patch are not passed filematcher is None. Otherwise it is a |
|
1717 | 1723 | callable taking a revision number and returning a match objects |
|
1718 | 1724 | filtering the files to be detailed when displaying the revision. |
|
1719 | 1725 | """ |
|
1720 | 1726 | limit = loglimit(opts) |
|
1721 | 1727 | # Default --rev value depends on --follow but --follow behaviour |
|
1722 | 1728 | # depends on revisions resolved from --rev... |
|
1723 | 1729 | follow = opts.get('follow') or opts.get('follow_first') |
|
1724 | 1730 | if opts.get('rev'): |
|
1725 | 1731 | revs = scmutil.revrange(repo, opts['rev']) |
|
1726 | 1732 | elif follow: |
|
1727 | 1733 | revs = repo.revs('reverse(:.)') |
|
1728 | 1734 | else: |
|
1729 | 1735 | revs = revset.spanset(repo) |
|
1730 | 1736 | revs.reverse() |
|
1731 | 1737 | if not revs: |
|
1732 | 1738 | return revset.baseset([]), None, None |
|
1733 | 1739 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
|
1734 | 1740 | if expr: |
|
1735 | 1741 | # Revset matchers often operate faster on revisions in changelog |
|
1736 | 1742 | # order, because most filters deal with the changelog. |
|
1737 | 1743 | if not opts.get('rev'): |
|
1738 | 1744 | revs.reverse() |
|
1739 | 1745 | matcher = revset.match(repo.ui, expr) |
|
1740 | 1746 | # Revset matches can reorder revisions. "A or B" typically returns |
|
1741 | 1747 | # returns the revision matching A then the revision matching B. Sort |
|
1742 | 1748 | # again to fix that. |
|
1743 | 1749 | revs = matcher(repo, revs) |
|
1744 | 1750 | if not opts.get('rev'): |
|
1745 | 1751 | revs.sort(reverse=True) |
|
1746 | 1752 | if limit is not None: |
|
1747 | 1753 | count = 0 |
|
1748 | 1754 | limitedrevs = revset.baseset([]) |
|
1749 | 1755 | it = iter(revs) |
|
1750 | 1756 | while count < limit: |
|
1751 | 1757 | try: |
|
1752 | 1758 | limitedrevs.append(it.next()) |
|
1753 | 1759 | except (StopIteration): |
|
1754 | 1760 | break |
|
1755 | 1761 | count += 1 |
|
1756 | 1762 | revs = limitedrevs |
|
1757 | 1763 | |
|
1758 | 1764 | return revs, expr, filematcher |
|
1759 | 1765 | |
|
1760 | 1766 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, |
|
1761 | 1767 | filematcher=None): |
|
1762 | 1768 | seen, state = [], graphmod.asciistate() |
|
1763 | 1769 | for rev, type, ctx, parents in dag: |
|
1764 | 1770 | char = 'o' |
|
1765 | 1771 | if ctx.node() in showparents: |
|
1766 | 1772 | char = '@' |
|
1767 | 1773 | elif ctx.obsolete(): |
|
1768 | 1774 | char = 'x' |
|
1769 | 1775 | copies = None |
|
1770 | 1776 | if getrenamed and ctx.rev(): |
|
1771 | 1777 | copies = [] |
|
1772 | 1778 | for fn in ctx.files(): |
|
1773 | 1779 | rename = getrenamed(fn, ctx.rev()) |
|
1774 | 1780 | if rename: |
|
1775 | 1781 | copies.append((fn, rename[0])) |
|
1776 | 1782 | revmatchfn = None |
|
1777 | 1783 | if filematcher is not None: |
|
1778 | 1784 | revmatchfn = filematcher(ctx.rev()) |
|
1779 | 1785 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
1780 | 1786 | lines = displayer.hunk.pop(rev).split('\n') |
|
1781 | 1787 | if not lines[-1]: |
|
1782 | 1788 | del lines[-1] |
|
1783 | 1789 | displayer.flush(rev) |
|
1784 | 1790 | edges = edgefn(type, char, lines, seen, rev, parents) |
|
1785 | 1791 | for type, char, lines, coldata in edges: |
|
1786 | 1792 | graphmod.ascii(ui, state, type, char, lines, coldata) |
|
1787 | 1793 | displayer.close() |
|
1788 | 1794 | |
|
1789 | 1795 | def graphlog(ui, repo, *pats, **opts): |
|
1790 | 1796 | # Parameters are identical to log command ones |
|
1791 | 1797 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) |
|
1792 | 1798 | revdag = graphmod.dagwalker(repo, revs) |
|
1793 | 1799 | |
|
1794 | 1800 | getrenamed = None |
|
1795 | 1801 | if opts.get('copies'): |
|
1796 | 1802 | endrev = None |
|
1797 | 1803 | if opts.get('rev'): |
|
1798 | 1804 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
1799 | 1805 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
1800 | 1806 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
1801 | 1807 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
1802 | 1808 | displaygraph(ui, revdag, displayer, showparents, |
|
1803 | 1809 | graphmod.asciiedges, getrenamed, filematcher) |
|
1804 | 1810 | |
|
1805 | 1811 | def checkunsupportedgraphflags(pats, opts): |
|
1806 | 1812 | for op in ["newest_first"]: |
|
1807 | 1813 | if op in opts and opts[op]: |
|
1808 | 1814 | raise util.Abort(_("-G/--graph option is incompatible with --%s") |
|
1809 | 1815 | % op.replace("_", "-")) |
|
1810 | 1816 | |
|
1811 | 1817 | def graphrevs(repo, nodes, opts): |
|
1812 | 1818 | limit = loglimit(opts) |
|
1813 | 1819 | nodes.reverse() |
|
1814 | 1820 | if limit is not None: |
|
1815 | 1821 | nodes = nodes[:limit] |
|
1816 | 1822 | return graphmod.nodes(repo, nodes) |
|
1817 | 1823 | |
|
1818 | 1824 | def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly): |
|
1819 | 1825 | join = lambda f: os.path.join(prefix, f) |
|
1820 | 1826 | bad = [] |
|
1821 | 1827 | oldbad = match.bad |
|
1822 | 1828 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
1823 | 1829 | names = [] |
|
1824 | 1830 | wctx = repo[None] |
|
1825 | 1831 | cca = None |
|
1826 | 1832 | abort, warn = scmutil.checkportabilityalert(ui) |
|
1827 | 1833 | if abort or warn: |
|
1828 | 1834 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) |
|
1829 | 1835 | for f in repo.walk(match): |
|
1830 | 1836 | exact = match.exact(f) |
|
1831 | 1837 | if exact or not explicitonly and f not in repo.dirstate: |
|
1832 | 1838 | if cca: |
|
1833 | 1839 | cca(f) |
|
1834 | 1840 | names.append(f) |
|
1835 | 1841 | if ui.verbose or not exact: |
|
1836 | 1842 | ui.status(_('adding %s\n') % match.rel(join(f))) |
|
1837 | 1843 | |
|
1838 | 1844 | for subpath in sorted(wctx.substate): |
|
1839 | 1845 | sub = wctx.sub(subpath) |
|
1840 | 1846 | try: |
|
1841 | 1847 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1842 | 1848 | if listsubrepos: |
|
1843 | 1849 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, |
|
1844 | 1850 | False)) |
|
1845 | 1851 | else: |
|
1846 | 1852 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, |
|
1847 | 1853 | True)) |
|
1848 | 1854 | except error.LookupError: |
|
1849 | 1855 | ui.status(_("skipping missing subrepository: %s\n") |
|
1850 | 1856 | % join(subpath)) |
|
1851 | 1857 | |
|
1852 | 1858 | if not dryrun: |
|
1853 | 1859 | rejected = wctx.add(names, prefix) |
|
1854 | 1860 | bad.extend(f for f in rejected if f in match.files()) |
|
1855 | 1861 | return bad |
|
1856 | 1862 | |
|
1857 | 1863 | def forget(ui, repo, match, prefix, explicitonly): |
|
1858 | 1864 | join = lambda f: os.path.join(prefix, f) |
|
1859 | 1865 | bad = [] |
|
1860 | 1866 | oldbad = match.bad |
|
1861 | 1867 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
1862 | 1868 | wctx = repo[None] |
|
1863 | 1869 | forgot = [] |
|
1864 | 1870 | s = repo.status(match=match, clean=True) |
|
1865 | 1871 | forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
1866 | 1872 | if explicitonly: |
|
1867 | 1873 | forget = [f for f in forget if match.exact(f)] |
|
1868 | 1874 | |
|
1869 | 1875 | for subpath in sorted(wctx.substate): |
|
1870 | 1876 | sub = wctx.sub(subpath) |
|
1871 | 1877 | try: |
|
1872 | 1878 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1873 | 1879 | subbad, subforgot = sub.forget(ui, submatch, prefix) |
|
1874 | 1880 | bad.extend([subpath + '/' + f for f in subbad]) |
|
1875 | 1881 | forgot.extend([subpath + '/' + f for f in subforgot]) |
|
1876 | 1882 | except error.LookupError: |
|
1877 | 1883 | ui.status(_("skipping missing subrepository: %s\n") |
|
1878 | 1884 | % join(subpath)) |
|
1879 | 1885 | |
|
1880 | 1886 | if not explicitonly: |
|
1881 | 1887 | for f in match.files(): |
|
1882 | 1888 | if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))): |
|
1883 | 1889 | if f not in forgot: |
|
1884 | 1890 | if os.path.exists(match.rel(join(f))): |
|
1885 | 1891 | ui.warn(_('not removing %s: ' |
|
1886 | 1892 | 'file is already untracked\n') |
|
1887 | 1893 | % match.rel(join(f))) |
|
1888 | 1894 | bad.append(f) |
|
1889 | 1895 | |
|
1890 | 1896 | for f in forget: |
|
1891 | 1897 | if ui.verbose or not match.exact(f): |
|
1892 | 1898 | ui.status(_('removing %s\n') % match.rel(join(f))) |
|
1893 | 1899 | |
|
1894 | 1900 | rejected = wctx.forget(forget, prefix) |
|
1895 | 1901 | bad.extend(f for f in rejected if f in match.files()) |
|
1896 | 1902 | forgot.extend(forget) |
|
1897 | 1903 | return bad, forgot |
|
1898 | 1904 | |
|
1899 | 1905 | def cat(ui, repo, ctx, matcher, prefix, **opts): |
|
1900 | 1906 | err = 1 |
|
1901 | 1907 | |
|
1902 | 1908 | def write(path): |
|
1903 | 1909 | fp = makefileobj(repo, opts.get('output'), ctx.node(), |
|
1904 | 1910 | pathname=os.path.join(prefix, path)) |
|
1905 | 1911 | data = ctx[path].data() |
|
1906 | 1912 | if opts.get('decode'): |
|
1907 | 1913 | data = repo.wwritedata(path, data) |
|
1908 | 1914 | fp.write(data) |
|
1909 | 1915 | fp.close() |
|
1910 | 1916 | |
|
1911 | 1917 | # Automation often uses hg cat on single files, so special case it |
|
1912 | 1918 | # for performance to avoid the cost of parsing the manifest. |
|
1913 | 1919 | if len(matcher.files()) == 1 and not matcher.anypats(): |
|
1914 | 1920 | file = matcher.files()[0] |
|
1915 | 1921 | mf = repo.manifest |
|
1916 | 1922 | mfnode = ctx._changeset[0] |
|
1917 | 1923 | if mf.find(mfnode, file)[0]: |
|
1918 | 1924 | write(file) |
|
1919 | 1925 | return 0 |
|
1920 | 1926 | |
|
1921 | 1927 | # Don't warn about "missing" files that are really in subrepos |
|
1922 | 1928 | bad = matcher.bad |
|
1923 | 1929 | |
|
1924 | 1930 | def badfn(path, msg): |
|
1925 | 1931 | for subpath in ctx.substate: |
|
1926 | 1932 | if path.startswith(subpath): |
|
1927 | 1933 | return |
|
1928 | 1934 | bad(path, msg) |
|
1929 | 1935 | |
|
1930 | 1936 | matcher.bad = badfn |
|
1931 | 1937 | |
|
1932 | 1938 | for abs in ctx.walk(matcher): |
|
1933 | 1939 | write(abs) |
|
1934 | 1940 | err = 0 |
|
1935 | 1941 | |
|
1936 | 1942 | matcher.bad = bad |
|
1937 | 1943 | |
|
1938 | 1944 | for subpath in sorted(ctx.substate): |
|
1939 | 1945 | sub = ctx.sub(subpath) |
|
1940 | 1946 | try: |
|
1941 | 1947 | submatch = matchmod.narrowmatcher(subpath, matcher) |
|
1942 | 1948 | |
|
1943 | 1949 | if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), |
|
1944 | 1950 | **opts): |
|
1945 | 1951 | err = 0 |
|
1946 | 1952 | except error.RepoLookupError: |
|
1947 | 1953 | ui.status(_("skipping missing subrepository: %s\n") |
|
1948 | 1954 | % os.path.join(prefix, subpath)) |
|
1949 | 1955 | |
|
1950 | 1956 | return err |
|
1951 | 1957 | |
|
1952 | 1958 | def duplicatecopies(repo, rev, fromrev, skiprev=None): |
|
1953 | 1959 | '''reproduce copies from fromrev to rev in the dirstate |
|
1954 | 1960 | |
|
1955 | 1961 | If skiprev is specified, it's a revision that should be used to |
|
1956 | 1962 | filter copy records. Any copies that occur between fromrev and |
|
1957 | 1963 | skiprev will not be duplicated, even if they appear in the set of |
|
1958 | 1964 | copies between fromrev and rev. |
|
1959 | 1965 | ''' |
|
1960 | 1966 | exclude = {} |
|
1961 | 1967 | if skiprev is not None: |
|
1962 | 1968 | exclude = copies.pathcopies(repo[fromrev], repo[skiprev]) |
|
1963 | 1969 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): |
|
1964 | 1970 | # copies.pathcopies returns backward renames, so dst might not |
|
1965 | 1971 | # actually be in the dirstate |
|
1966 | 1972 | if dst in exclude: |
|
1967 | 1973 | continue |
|
1968 | 1974 | if repo.dirstate[dst] in "nma": |
|
1969 | 1975 | repo.dirstate.copy(src, dst) |
|
1970 | 1976 | |
|
1971 | 1977 | def commit(ui, repo, commitfunc, pats, opts): |
|
1972 | 1978 | '''commit the specified files or all outstanding changes''' |
|
1973 | 1979 | date = opts.get('date') |
|
1974 | 1980 | if date: |
|
1975 | 1981 | opts['date'] = util.parsedate(date) |
|
1976 | 1982 | message = logmessage(ui, opts) |
|
1977 | 1983 | |
|
1978 | 1984 | # extract addremove carefully -- this function can be called from a command |
|
1979 | 1985 | # that doesn't support addremove |
|
1980 | 1986 | if opts.get('addremove'): |
|
1981 | 1987 | scmutil.addremove(repo, pats, opts) |
|
1982 | 1988 | |
|
1983 | 1989 | return commitfunc(ui, repo, message, |
|
1984 | 1990 | scmutil.match(repo[None], pats, opts), opts) |
|
1985 | 1991 | |
|
1986 | 1992 | def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
1987 | 1993 | ui.note(_('amending changeset %s\n') % old) |
|
1988 | 1994 | base = old.p1() |
|
1989 | 1995 | |
|
1990 | 1996 | wlock = lock = newid = None |
|
1991 | 1997 | try: |
|
1992 | 1998 | wlock = repo.wlock() |
|
1993 | 1999 | lock = repo.lock() |
|
1994 | 2000 | tr = repo.transaction('amend') |
|
1995 | 2001 | try: |
|
1996 | 2002 | # See if we got a message from -m or -l, if not, open the editor |
|
1997 | 2003 | # with the message of the changeset to amend |
|
1998 | 2004 | message = logmessage(ui, opts) |
|
1999 | 2005 | # ensure logfile does not conflict with later enforcement of the |
|
2000 | 2006 | # message. potential logfile content has been processed by |
|
2001 | 2007 | # `logmessage` anyway. |
|
2002 | 2008 | opts.pop('logfile') |
|
2003 | 2009 | # First, do a regular commit to record all changes in the working |
|
2004 | 2010 | # directory (if there are any) |
|
2005 | 2011 | ui.callhooks = False |
|
2006 | 2012 | currentbookmark = repo._bookmarkcurrent |
|
2007 | 2013 | try: |
|
2008 | 2014 | repo._bookmarkcurrent = None |
|
2009 | 2015 | opts['message'] = 'temporary amend commit for %s' % old |
|
2010 | 2016 | node = commit(ui, repo, commitfunc, pats, opts) |
|
2011 | 2017 | finally: |
|
2012 | 2018 | repo._bookmarkcurrent = currentbookmark |
|
2013 | 2019 | ui.callhooks = True |
|
2014 | 2020 | ctx = repo[node] |
|
2015 | 2021 | |
|
2016 | 2022 | # Participating changesets: |
|
2017 | 2023 | # |
|
2018 | 2024 | # node/ctx o - new (intermediate) commit that contains changes |
|
2019 | 2025 | # | from working dir to go into amending commit |
|
2020 | 2026 | # | (or a workingctx if there were no changes) |
|
2021 | 2027 | # | |
|
2022 | 2028 | # old o - changeset to amend |
|
2023 | 2029 | # | |
|
2024 | 2030 | # base o - parent of amending changeset |
|
2025 | 2031 | |
|
2026 | 2032 | # Update extra dict from amended commit (e.g. to preserve graft |
|
2027 | 2033 | # source) |
|
2028 | 2034 | extra.update(old.extra()) |
|
2029 | 2035 | |
|
2030 | 2036 | # Also update it from the intermediate commit or from the wctx |
|
2031 | 2037 | extra.update(ctx.extra()) |
|
2032 | 2038 | |
|
2033 | 2039 | if len(old.parents()) > 1: |
|
2034 | 2040 | # ctx.files() isn't reliable for merges, so fall back to the |
|
2035 | 2041 | # slower repo.status() method |
|
2036 | 2042 | files = set([fn for st in repo.status(base, old)[:3] |
|
2037 | 2043 | for fn in st]) |
|
2038 | 2044 | else: |
|
2039 | 2045 | files = set(old.files()) |
|
2040 | 2046 | |
|
2041 | 2047 | # Second, we use either the commit we just did, or if there were no |
|
2042 | 2048 | # changes the parent of the working directory as the version of the |
|
2043 | 2049 | # files in the final amend commit |
|
2044 | 2050 | if node: |
|
2045 | 2051 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) |
|
2046 | 2052 | |
|
2047 | 2053 | user = ctx.user() |
|
2048 | 2054 | date = ctx.date() |
|
2049 | 2055 | # Recompute copies (avoid recording a -> b -> a) |
|
2050 | 2056 | copied = copies.pathcopies(base, ctx) |
|
2051 | 2057 | |
|
2052 | 2058 | # Prune files which were reverted by the updates: if old |
|
2053 | 2059 | # introduced file X and our intermediate commit, node, |
|
2054 | 2060 | # renamed that file, then those two files are the same and |
|
2055 | 2061 | # we can discard X from our list of files. Likewise if X |
|
2056 | 2062 | # was deleted, it's no longer relevant |
|
2057 | 2063 | files.update(ctx.files()) |
|
2058 | 2064 | |
|
2059 | 2065 | def samefile(f): |
|
2060 | 2066 | if f in ctx.manifest(): |
|
2061 | 2067 | a = ctx.filectx(f) |
|
2062 | 2068 | if f in base.manifest(): |
|
2063 | 2069 | b = base.filectx(f) |
|
2064 | 2070 | return (not a.cmp(b) |
|
2065 | 2071 | and a.flags() == b.flags()) |
|
2066 | 2072 | else: |
|
2067 | 2073 | return False |
|
2068 | 2074 | else: |
|
2069 | 2075 | return f not in base.manifest() |
|
2070 | 2076 | files = [f for f in files if not samefile(f)] |
|
2071 | 2077 | |
|
2072 | 2078 | def filectxfn(repo, ctx_, path): |
|
2073 | 2079 | try: |
|
2074 | 2080 | fctx = ctx[path] |
|
2075 | 2081 | flags = fctx.flags() |
|
2076 | 2082 | mctx = context.memfilectx(repo, |
|
2077 | 2083 | fctx.path(), fctx.data(), |
|
2078 | 2084 | islink='l' in flags, |
|
2079 | 2085 | isexec='x' in flags, |
|
2080 | 2086 | copied=copied.get(path)) |
|
2081 | 2087 | return mctx |
|
2082 | 2088 | except KeyError: |
|
2083 | 2089 | raise IOError |
|
2084 | 2090 | else: |
|
2085 | 2091 | ui.note(_('copying changeset %s to %s\n') % (old, base)) |
|
2086 | 2092 | |
|
2087 | 2093 | # Use version of files as in the old cset |
|
2088 | 2094 | def filectxfn(repo, ctx_, path): |
|
2089 | 2095 | try: |
|
2090 | 2096 | return old.filectx(path) |
|
2091 | 2097 | except KeyError: |
|
2092 | 2098 | raise IOError |
|
2093 | 2099 | |
|
2094 | 2100 | user = opts.get('user') or old.user() |
|
2095 | 2101 | date = opts.get('date') or old.date() |
|
2096 | 2102 | editor = getcommiteditor(**opts) |
|
2097 | 2103 | if not message: |
|
2098 | 2104 | editor = getcommiteditor(edit=True) |
|
2099 | 2105 | message = old.description() |
|
2100 | 2106 | |
|
2101 | 2107 | pureextra = extra.copy() |
|
2102 | 2108 | extra['amend_source'] = old.hex() |
|
2103 | 2109 | |
|
2104 | 2110 | new = context.memctx(repo, |
|
2105 | 2111 | parents=[base.node(), old.p2().node()], |
|
2106 | 2112 | text=message, |
|
2107 | 2113 | files=files, |
|
2108 | 2114 | filectxfn=filectxfn, |
|
2109 | 2115 | user=user, |
|
2110 | 2116 | date=date, |
|
2111 | 2117 | extra=extra, |
|
2112 | 2118 | editor=editor) |
|
2113 | 2119 | |
|
2114 | 2120 | newdesc = changelog.stripdesc(new.description()) |
|
2115 | 2121 | if ((not node) |
|
2116 | 2122 | and newdesc == old.description() |
|
2117 | 2123 | and user == old.user() |
|
2118 | 2124 | and date == old.date() |
|
2119 | 2125 | and pureextra == old.extra()): |
|
2120 | 2126 | # nothing changed. continuing here would create a new node |
|
2121 | 2127 | # anyway because of the amend_source noise. |
|
2122 | 2128 | # |
|
2123 | 2129 | # This not what we expect from amend. |
|
2124 | 2130 | return old.node() |
|
2125 | 2131 | |
|
2126 | 2132 | ph = repo.ui.config('phases', 'new-commit', phases.draft) |
|
2127 | 2133 | try: |
|
2128 | 2134 | if opts.get('secret'): |
|
2129 | 2135 | commitphase = 'secret' |
|
2130 | 2136 | else: |
|
2131 | 2137 | commitphase = old.phase() |
|
2132 | 2138 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') |
|
2133 | 2139 | newid = repo.commitctx(new) |
|
2134 | 2140 | finally: |
|
2135 | 2141 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') |
|
2136 | 2142 | if newid != old.node(): |
|
2137 | 2143 | # Reroute the working copy parent to the new changeset |
|
2138 | 2144 | repo.setparents(newid, nullid) |
|
2139 | 2145 | |
|
2140 | 2146 | # Move bookmarks from old parent to amend commit |
|
2141 | 2147 | bms = repo.nodebookmarks(old.node()) |
|
2142 | 2148 | if bms: |
|
2143 | 2149 | marks = repo._bookmarks |
|
2144 | 2150 | for bm in bms: |
|
2145 | 2151 | marks[bm] = newid |
|
2146 | 2152 | marks.write() |
|
2147 | 2153 | #commit the whole amend process |
|
2148 | 2154 | if obsolete._enabled and newid != old.node(): |
|
2149 | 2155 | # mark the new changeset as successor of the rewritten one |
|
2150 | 2156 | new = repo[newid] |
|
2151 | 2157 | obs = [(old, (new,))] |
|
2152 | 2158 | if node: |
|
2153 | 2159 | obs.append((ctx, ())) |
|
2154 | 2160 | |
|
2155 | 2161 | obsolete.createmarkers(repo, obs) |
|
2156 | 2162 | tr.close() |
|
2157 | 2163 | finally: |
|
2158 | 2164 | tr.release() |
|
2159 | 2165 | if (not obsolete._enabled) and newid != old.node(): |
|
2160 | 2166 | # Strip the intermediate commit (if there was one) and the amended |
|
2161 | 2167 | # commit |
|
2162 | 2168 | if node: |
|
2163 | 2169 | ui.note(_('stripping intermediate changeset %s\n') % ctx) |
|
2164 | 2170 | ui.note(_('stripping amended changeset %s\n') % old) |
|
2165 | 2171 | repair.strip(ui, repo, old.node(), topic='amend-backup') |
|
2166 | 2172 | finally: |
|
2167 | 2173 | if newid is None: |
|
2168 | 2174 | repo.dirstate.invalidate() |
|
2169 | 2175 | lockmod.release(lock, wlock) |
|
2170 | 2176 | return newid |
|
2171 | 2177 | |
|
2172 | 2178 | def commiteditor(repo, ctx, subs): |
|
2173 | 2179 | if ctx.description(): |
|
2174 | 2180 | return ctx.description() |
|
2175 | 2181 | return commitforceeditor(repo, ctx, subs) |
|
2176 | 2182 | |
|
2177 | 2183 | def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None): |
|
2178 | 2184 | if not extramsg: |
|
2179 | 2185 | extramsg = _("Leave message empty to abort commit.") |
|
2180 | 2186 | tmpl = repo.ui.config('committemplate', 'changeset', '').strip() |
|
2181 | 2187 | if tmpl: |
|
2182 | 2188 | committext = buildcommittemplate(repo, ctx, subs, extramsg, tmpl) |
|
2183 | 2189 | else: |
|
2184 | 2190 | committext = buildcommittext(repo, ctx, subs, extramsg) |
|
2185 | 2191 | |
|
2186 | 2192 | # run editor in the repository root |
|
2187 | 2193 | olddir = os.getcwd() |
|
2188 | 2194 | os.chdir(repo.root) |
|
2189 | 2195 | text = repo.ui.edit(committext, ctx.user(), ctx.extra()) |
|
2190 | 2196 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) |
|
2191 | 2197 | os.chdir(olddir) |
|
2192 | 2198 | |
|
2193 | 2199 | if finishdesc: |
|
2194 | 2200 | text = finishdesc(text) |
|
2195 | 2201 | if not text.strip(): |
|
2196 | 2202 | raise util.Abort(_("empty commit message")) |
|
2197 | 2203 | |
|
2198 | 2204 | return text |
|
2199 | 2205 | |
|
2200 | 2206 | def buildcommittemplate(repo, ctx, subs, extramsg, tmpl): |
|
2201 | 2207 | ui = repo.ui |
|
2202 | 2208 | tmpl, mapfile = gettemplate(ui, tmpl, None) |
|
2203 | 2209 | |
|
2204 | 2210 | try: |
|
2205 | 2211 | t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False) |
|
2206 | 2212 | except SyntaxError, inst: |
|
2207 | 2213 | raise util.Abort(inst.args[0]) |
|
2208 | 2214 | |
|
2209 | 2215 | if not extramsg: |
|
2210 | 2216 | extramsg = '' # ensure that extramsg is string |
|
2211 | 2217 | |
|
2212 | 2218 | ui.pushbuffer() |
|
2213 | 2219 | t.show(ctx, extramsg=extramsg) |
|
2214 | 2220 | return ui.popbuffer() |
|
2215 | 2221 | |
|
2216 | 2222 | def buildcommittext(repo, ctx, subs, extramsg): |
|
2217 | 2223 | edittext = [] |
|
2218 | 2224 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() |
|
2219 | 2225 | if ctx.description(): |
|
2220 | 2226 | edittext.append(ctx.description()) |
|
2221 | 2227 | edittext.append("") |
|
2222 | 2228 | edittext.append("") # Empty line between message and comments. |
|
2223 | 2229 | edittext.append(_("HG: Enter commit message." |
|
2224 | 2230 | " Lines beginning with 'HG:' are removed.")) |
|
2225 | 2231 | edittext.append("HG: %s" % extramsg) |
|
2226 | 2232 | edittext.append("HG: --") |
|
2227 | 2233 | edittext.append(_("HG: user: %s") % ctx.user()) |
|
2228 | 2234 | if ctx.p2(): |
|
2229 | 2235 | edittext.append(_("HG: branch merge")) |
|
2230 | 2236 | if ctx.branch(): |
|
2231 | 2237 | edittext.append(_("HG: branch '%s'") % ctx.branch()) |
|
2232 | 2238 | if bookmarks.iscurrent(repo): |
|
2233 | 2239 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) |
|
2234 | 2240 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) |
|
2235 | 2241 | edittext.extend([_("HG: added %s") % f for f in added]) |
|
2236 | 2242 | edittext.extend([_("HG: changed %s") % f for f in modified]) |
|
2237 | 2243 | edittext.extend([_("HG: removed %s") % f for f in removed]) |
|
2238 | 2244 | if not added and not modified and not removed: |
|
2239 | 2245 | edittext.append(_("HG: no files changed")) |
|
2240 | 2246 | edittext.append("") |
|
2241 | 2247 | |
|
2242 | 2248 | return "\n".join(edittext) |
|
2243 | 2249 | |
|
2244 | 2250 | def commitstatus(repo, node, branch, bheads=None, opts={}): |
|
2245 | 2251 | ctx = repo[node] |
|
2246 | 2252 | parents = ctx.parents() |
|
2247 | 2253 | |
|
2248 | 2254 | if (not opts.get('amend') and bheads and node not in bheads and not |
|
2249 | 2255 | [x for x in parents if x.node() in bheads and x.branch() == branch]): |
|
2250 | 2256 | repo.ui.status(_('created new head\n')) |
|
2251 | 2257 | # The message is not printed for initial roots. For the other |
|
2252 | 2258 | # changesets, it is printed in the following situations: |
|
2253 | 2259 | # |
|
2254 | 2260 | # Par column: for the 2 parents with ... |
|
2255 | 2261 | # N: null or no parent |
|
2256 | 2262 | # B: parent is on another named branch |
|
2257 | 2263 | # C: parent is a regular non head changeset |
|
2258 | 2264 | # H: parent was a branch head of the current branch |
|
2259 | 2265 | # Msg column: whether we print "created new head" message |
|
2260 | 2266 | # In the following, it is assumed that there already exists some |
|
2261 | 2267 | # initial branch heads of the current branch, otherwise nothing is |
|
2262 | 2268 | # printed anyway. |
|
2263 | 2269 | # |
|
2264 | 2270 | # Par Msg Comment |
|
2265 | 2271 | # N N y additional topo root |
|
2266 | 2272 | # |
|
2267 | 2273 | # B N y additional branch root |
|
2268 | 2274 | # C N y additional topo head |
|
2269 | 2275 | # H N n usual case |
|
2270 | 2276 | # |
|
2271 | 2277 | # B B y weird additional branch root |
|
2272 | 2278 | # C B y branch merge |
|
2273 | 2279 | # H B n merge with named branch |
|
2274 | 2280 | # |
|
2275 | 2281 | # C C y additional head from merge |
|
2276 | 2282 | # C H n merge with a head |
|
2277 | 2283 | # |
|
2278 | 2284 | # H H n head merge: head count decreases |
|
2279 | 2285 | |
|
2280 | 2286 | if not opts.get('close_branch'): |
|
2281 | 2287 | for r in parents: |
|
2282 | 2288 | if r.closesbranch() and r.branch() == branch: |
|
2283 | 2289 | repo.ui.status(_('reopening closed branch head %d\n') % r) |
|
2284 | 2290 | |
|
2285 | 2291 | if repo.ui.debugflag: |
|
2286 | 2292 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
2287 | 2293 | elif repo.ui.verbose: |
|
2288 | 2294 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
2289 | 2295 | |
|
2290 | 2296 | def revert(ui, repo, ctx, parents, *pats, **opts): |
|
2291 | 2297 | parent, p2 = parents |
|
2292 | 2298 | node = ctx.node() |
|
2293 | 2299 | |
|
2294 | 2300 | mf = ctx.manifest() |
|
2295 | 2301 | if node == p2: |
|
2296 | 2302 | parent = p2 |
|
2297 | 2303 | if node == parent: |
|
2298 | 2304 | pmf = mf |
|
2299 | 2305 | else: |
|
2300 | 2306 | pmf = None |
|
2301 | 2307 | |
|
2302 | 2308 | # need all matching names in dirstate and manifest of target rev, |
|
2303 | 2309 | # so have to walk both. do not print errors if files exist in one |
|
2304 | 2310 | # but not other. |
|
2305 | 2311 | |
|
2306 | 2312 | # `names` is a mapping for all elements in working copy and target revision |
|
2307 | 2313 | # The mapping is in the form: |
|
2308 | 2314 | # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>) |
|
2309 | 2315 | names = {} |
|
2310 | 2316 | |
|
2311 | 2317 | wlock = repo.wlock() |
|
2312 | 2318 | try: |
|
2313 | 2319 | ## filling of the `names` mapping |
|
2314 | 2320 | # walk dirstate to fill `names` |
|
2315 | 2321 | |
|
2316 | 2322 | m = scmutil.match(repo[None], pats, opts) |
|
2317 | 2323 | m.bad = lambda x, y: False |
|
2318 | 2324 | for abs in repo.walk(m): |
|
2319 | 2325 | names[abs] = m.rel(abs), m.exact(abs) |
|
2320 | 2326 | |
|
2321 | 2327 | # walk target manifest to fill `names` |
|
2322 | 2328 | |
|
2323 | 2329 | def badfn(path, msg): |
|
2324 | 2330 | if path in names: |
|
2325 | 2331 | return |
|
2326 | 2332 | if path in ctx.substate: |
|
2327 | 2333 | return |
|
2328 | 2334 | path_ = path + '/' |
|
2329 | 2335 | for f in names: |
|
2330 | 2336 | if f.startswith(path_): |
|
2331 | 2337 | return |
|
2332 | 2338 | ui.warn("%s: %s\n" % (m.rel(path), msg)) |
|
2333 | 2339 | |
|
2334 | 2340 | m = scmutil.match(ctx, pats, opts) |
|
2335 | 2341 | m.bad = badfn |
|
2336 | 2342 | for abs in ctx.walk(m): |
|
2337 | 2343 | if abs not in names: |
|
2338 | 2344 | names[abs] = m.rel(abs), m.exact(abs) |
|
2339 | 2345 | |
|
2340 | 2346 | # get the list of subrepos that must be reverted |
|
2341 | 2347 | targetsubs = sorted(s for s in ctx.substate if m(s)) |
|
2342 | 2348 | |
|
2343 | 2349 | # Find status of all file in `names`. (Against working directory parent) |
|
2344 | 2350 | m = scmutil.matchfiles(repo, names) |
|
2345 | 2351 | changes = repo.status(node1=parent, match=m)[:4] |
|
2346 | 2352 | modified, added, removed, deleted = map(set, changes) |
|
2347 | 2353 | |
|
2348 | 2354 | # if f is a rename, update `names` to also revert the source |
|
2349 | 2355 | cwd = repo.getcwd() |
|
2350 | 2356 | for f in added: |
|
2351 | 2357 | src = repo.dirstate.copied(f) |
|
2352 | 2358 | if src and src not in names and repo.dirstate[src] == 'r': |
|
2353 | 2359 | removed.add(src) |
|
2354 | 2360 | names[src] = (repo.pathto(src, cwd), True) |
|
2355 | 2361 | |
|
2356 | 2362 | ## computation of the action to performs on `names` content. |
|
2357 | 2363 | |
|
2358 | 2364 | def removeforget(abs): |
|
2359 | 2365 | if repo.dirstate[abs] == 'a': |
|
2360 | 2366 | return _('forgetting %s\n') |
|
2361 | 2367 | return _('removing %s\n') |
|
2362 | 2368 | |
|
2363 | 2369 | # action to be actually performed by revert |
|
2364 | 2370 | # (<list of file>, message>) tuple |
|
2365 | 2371 | actions = {'revert': ([], _('reverting %s\n')), |
|
2366 | 2372 | 'add': ([], _('adding %s\n')), |
|
2367 | 2373 | 'remove': ([], removeforget), |
|
2368 | 2374 | 'undelete': ([], _('undeleting %s\n'))} |
|
2369 | 2375 | |
|
2370 | 2376 | disptable = ( |
|
2371 | 2377 | # dispatch table: |
|
2372 | 2378 | # file state |
|
2373 | 2379 | # action if in target manifest |
|
2374 | 2380 | # action if not in target manifest |
|
2375 | 2381 | # make backup if in target manifest |
|
2376 | 2382 | # make backup if not in target manifest |
|
2377 | 2383 | (modified, (actions['revert'], True), |
|
2378 | 2384 | (actions['remove'], True)), |
|
2379 | 2385 | (added, (actions['revert'], True), |
|
2380 | 2386 | (actions['remove'], False)), |
|
2381 | 2387 | (removed, (actions['undelete'], True), |
|
2382 | 2388 | (None, False)), |
|
2383 | 2389 | (deleted, (actions['revert'], False), |
|
2384 | 2390 | (actions['remove'], False)), |
|
2385 | 2391 | ) |
|
2386 | 2392 | |
|
2387 | 2393 | for abs, (rel, exact) in sorted(names.items()): |
|
2388 | 2394 | # hash on file in target manifest (or None if missing from target) |
|
2389 | 2395 | mfentry = mf.get(abs) |
|
2390 | 2396 | # target file to be touch on disk (relative to cwd) |
|
2391 | 2397 | target = repo.wjoin(abs) |
|
2392 | 2398 | def handle(xlist, dobackup): |
|
2393 | 2399 | xlist[0].append(abs) |
|
2394 | 2400 | if (dobackup and not opts.get('no_backup') and |
|
2395 | 2401 | os.path.lexists(target) and |
|
2396 | 2402 | abs in ctx and repo[None][abs].cmp(ctx[abs])): |
|
2397 | 2403 | bakname = "%s.orig" % rel |
|
2398 | 2404 | ui.note(_('saving current version of %s as %s\n') % |
|
2399 | 2405 | (rel, bakname)) |
|
2400 | 2406 | if not opts.get('dry_run'): |
|
2401 | 2407 | util.rename(target, bakname) |
|
2402 | 2408 | if ui.verbose or not exact: |
|
2403 | 2409 | msg = xlist[1] |
|
2404 | 2410 | if not isinstance(msg, basestring): |
|
2405 | 2411 | msg = msg(abs) |
|
2406 | 2412 | ui.status(msg % rel) |
|
2407 | 2413 | # search the entry in the dispatch table. |
|
2408 | 2414 | # if the file is in any of this sets, it was touched in the working |
|
2409 | 2415 | # directory parent and we are sure it needs to be reverted. |
|
2410 | 2416 | for table, hit, miss in disptable: |
|
2411 | 2417 | if abs not in table: |
|
2412 | 2418 | continue |
|
2413 | 2419 | # file has changed in dirstate |
|
2414 | 2420 | if mfentry: |
|
2415 | 2421 | handle(*hit) |
|
2416 | 2422 | elif miss[0] is not None: |
|
2417 | 2423 | handle(*miss) |
|
2418 | 2424 | break |
|
2419 | 2425 | else: |
|
2420 | 2426 | # Not touched in current dirstate. |
|
2421 | 2427 | |
|
2422 | 2428 | # file is unknown in parent, restore older version or ignore. |
|
2423 | 2429 | if abs not in repo.dirstate: |
|
2424 | 2430 | if mfentry: |
|
2425 | 2431 | handle(actions['add'], True) |
|
2426 | 2432 | elif exact: |
|
2427 | 2433 | ui.warn(_('file not managed: %s\n') % rel) |
|
2428 | 2434 | continue |
|
2429 | 2435 | |
|
2430 | 2436 | # parent is target, no changes mean no changes |
|
2431 | 2437 | if node == parent: |
|
2432 | 2438 | if exact: |
|
2433 | 2439 | ui.warn(_('no changes needed to %s\n') % rel) |
|
2434 | 2440 | continue |
|
2435 | 2441 | # no change in dirstate but parent and target may differ |
|
2436 | 2442 | if pmf is None: |
|
2437 | 2443 | # only need parent manifest in this unlikely case, |
|
2438 | 2444 | # so do not read by default |
|
2439 | 2445 | pmf = repo[parent].manifest() |
|
2440 | 2446 | if abs in pmf and mfentry: |
|
2441 | 2447 | # if version of file is same in parent and target |
|
2442 | 2448 | # manifests, do nothing |
|
2443 | 2449 | if (pmf[abs] != mfentry or |
|
2444 | 2450 | pmf.flags(abs) != mf.flags(abs)): |
|
2445 | 2451 | handle(actions['revert'], False) |
|
2446 | 2452 | else: |
|
2447 | 2453 | handle(actions['remove'], False) |
|
2448 | 2454 | |
|
2449 | 2455 | if not opts.get('dry_run'): |
|
2450 | 2456 | _performrevert(repo, parents, ctx, actions) |
|
2451 | 2457 | |
|
2452 | 2458 | if targetsubs: |
|
2453 | 2459 | # Revert the subrepos on the revert list |
|
2454 | 2460 | for sub in targetsubs: |
|
2455 | 2461 | ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts) |
|
2456 | 2462 | finally: |
|
2457 | 2463 | wlock.release() |
|
2458 | 2464 | |
|
2459 | 2465 | def _performrevert(repo, parents, ctx, actions): |
|
2460 | 2466 | """function that actually perform all the actions computed for revert |
|
2461 | 2467 | |
|
2462 | 2468 | This is an independent function to let extension to plug in and react to |
|
2463 | 2469 | the imminent revert. |
|
2464 | 2470 | |
|
2465 | 2471 | Make sure you have the working directory locked when calling this function. |
|
2466 | 2472 | """ |
|
2467 | 2473 | parent, p2 = parents |
|
2468 | 2474 | node = ctx.node() |
|
2469 | 2475 | def checkout(f): |
|
2470 | 2476 | fc = ctx[f] |
|
2471 | 2477 | repo.wwrite(f, fc.data(), fc.flags()) |
|
2472 | 2478 | |
|
2473 | 2479 | audit_path = pathutil.pathauditor(repo.root) |
|
2474 | 2480 | for f in actions['remove'][0]: |
|
2475 | 2481 | if repo.dirstate[f] == 'a': |
|
2476 | 2482 | repo.dirstate.drop(f) |
|
2477 | 2483 | continue |
|
2478 | 2484 | audit_path(f) |
|
2479 | 2485 | try: |
|
2480 | 2486 | util.unlinkpath(repo.wjoin(f)) |
|
2481 | 2487 | except OSError: |
|
2482 | 2488 | pass |
|
2483 | 2489 | repo.dirstate.remove(f) |
|
2484 | 2490 | |
|
2485 | 2491 | normal = None |
|
2486 | 2492 | if node == parent: |
|
2487 | 2493 | # We're reverting to our parent. If possible, we'd like status |
|
2488 | 2494 | # to report the file as clean. We have to use normallookup for |
|
2489 | 2495 | # merges to avoid losing information about merged/dirty files. |
|
2490 | 2496 | if p2 != nullid: |
|
2491 | 2497 | normal = repo.dirstate.normallookup |
|
2492 | 2498 | else: |
|
2493 | 2499 | normal = repo.dirstate.normal |
|
2494 | 2500 | for f in actions['revert'][0]: |
|
2495 | 2501 | checkout(f) |
|
2496 | 2502 | if normal: |
|
2497 | 2503 | normal(f) |
|
2498 | 2504 | |
|
2499 | 2505 | for f in actions['add'][0]: |
|
2500 | 2506 | checkout(f) |
|
2501 | 2507 | repo.dirstate.add(f) |
|
2502 | 2508 | |
|
2503 | 2509 | normal = repo.dirstate.normallookup |
|
2504 | 2510 | if node == parent and p2 == nullid: |
|
2505 | 2511 | normal = repo.dirstate.normal |
|
2506 | 2512 | for f in actions['undelete'][0]: |
|
2507 | 2513 | checkout(f) |
|
2508 | 2514 | normal(f) |
|
2509 | 2515 | |
|
2510 | 2516 | copied = copies.pathcopies(repo[parent], ctx) |
|
2511 | 2517 | |
|
2512 | 2518 | for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]: |
|
2513 | 2519 | if f in copied: |
|
2514 | 2520 | repo.dirstate.copy(copied[f], f) |
|
2515 | 2521 | |
|
2516 | 2522 | def command(table): |
|
2517 | 2523 | """Returns a function object to be used as a decorator for making commands. |
|
2518 | 2524 | |
|
2519 | 2525 | This function receives a command table as its argument. The table should |
|
2520 | 2526 | be a dict. |
|
2521 | 2527 | |
|
2522 | 2528 | The returned function can be used as a decorator for adding commands |
|
2523 | 2529 | to that command table. This function accepts multiple arguments to define |
|
2524 | 2530 | a command. |
|
2525 | 2531 | |
|
2526 | 2532 | The first argument is the command name. |
|
2527 | 2533 | |
|
2528 | 2534 | The options argument is an iterable of tuples defining command arguments. |
|
2529 | 2535 | See ``mercurial.fancyopts.fancyopts()`` for the format of each tuple. |
|
2530 | 2536 | |
|
2531 | 2537 | The synopsis argument defines a short, one line summary of how to use the |
|
2532 | 2538 | command. This shows up in the help output. |
|
2533 | 2539 | |
|
2534 | 2540 | The norepo argument defines whether the command does not require a |
|
2535 | 2541 | local repository. Most commands operate against a repository, thus the |
|
2536 | 2542 | default is False. |
|
2537 | 2543 | |
|
2538 | 2544 | The optionalrepo argument defines whether the command optionally requires |
|
2539 | 2545 | a local repository. |
|
2540 | 2546 | |
|
2541 | 2547 | The inferrepo argument defines whether to try to find a repository from the |
|
2542 | 2548 | command line arguments. If True, arguments will be examined for potential |
|
2543 | 2549 | repository locations. See ``findrepo()``. If a repository is found, it |
|
2544 | 2550 | will be used. |
|
2545 | 2551 | """ |
|
2546 | 2552 | def cmd(name, options=(), synopsis=None, norepo=False, optionalrepo=False, |
|
2547 | 2553 | inferrepo=False): |
|
2548 | 2554 | def decorator(func): |
|
2549 | 2555 | if synopsis: |
|
2550 | 2556 | table[name] = func, list(options), synopsis |
|
2551 | 2557 | else: |
|
2552 | 2558 | table[name] = func, list(options) |
|
2553 | 2559 | |
|
2554 | 2560 | if norepo: |
|
2555 | 2561 | # Avoid import cycle. |
|
2556 | 2562 | import commands |
|
2557 | 2563 | commands.norepo += ' %s' % ' '.join(parsealiases(name)) |
|
2558 | 2564 | |
|
2559 | 2565 | if optionalrepo: |
|
2560 | 2566 | import commands |
|
2561 | 2567 | commands.optionalrepo += ' %s' % ' '.join(parsealiases(name)) |
|
2562 | 2568 | |
|
2563 | 2569 | if inferrepo: |
|
2564 | 2570 | import commands |
|
2565 | 2571 | commands.inferrepo += ' %s' % ' '.join(parsealiases(name)) |
|
2566 | 2572 | |
|
2567 | 2573 | return func |
|
2568 | 2574 | return decorator |
|
2569 | 2575 | |
|
2570 | 2576 | return cmd |
|
2571 | 2577 | |
|
2572 | 2578 | # a list of (ui, repo, otherpeer, opts, missing) functions called by |
|
2573 | 2579 | # commands.outgoing. "missing" is "missing" of the result of |
|
2574 | 2580 | # "findcommonoutgoing()" |
|
2575 | 2581 | outgoinghooks = util.hooks() |
|
2576 | 2582 | |
|
2577 | 2583 | # a list of (ui, repo) functions called by commands.summary |
|
2578 | 2584 | summaryhooks = util.hooks() |
|
2579 | 2585 | |
|
2580 | 2586 | # a list of (ui, repo, opts, changes) functions called by commands.summary. |
|
2581 | 2587 | # |
|
2582 | 2588 | # functions should return tuple of booleans below, if 'changes' is None: |
|
2583 | 2589 | # (whether-incomings-are-needed, whether-outgoings-are-needed) |
|
2584 | 2590 | # |
|
2585 | 2591 | # otherwise, 'changes' is a tuple of tuples below: |
|
2586 | 2592 | # - (sourceurl, sourcebranch, sourcepeer, incoming) |
|
2587 | 2593 | # - (desturl, destbranch, destpeer, outgoing) |
|
2588 | 2594 | summaryremotehooks = util.hooks() |
|
2589 | 2595 | |
|
2590 | 2596 | # A list of state files kept by multistep operations like graft. |
|
2591 | 2597 | # Since graft cannot be aborted, it is considered 'clearable' by update. |
|
2592 | 2598 | # note: bisect is intentionally excluded |
|
2593 | 2599 | # (state file, clearable, allowcommit, error, hint) |
|
2594 | 2600 | unfinishedstates = [ |
|
2595 | 2601 | ('graftstate', True, False, _('graft in progress'), |
|
2596 | 2602 | _("use 'hg graft --continue' or 'hg update' to abort")), |
|
2597 | 2603 | ('updatestate', True, False, _('last update was interrupted'), |
|
2598 | 2604 | _("use 'hg update' to get a consistent checkout")) |
|
2599 | 2605 | ] |
|
2600 | 2606 | |
|
2601 | 2607 | def checkunfinished(repo, commit=False): |
|
2602 | 2608 | '''Look for an unfinished multistep operation, like graft, and abort |
|
2603 | 2609 | if found. It's probably good to check this right before |
|
2604 | 2610 | bailifchanged(). |
|
2605 | 2611 | ''' |
|
2606 | 2612 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2607 | 2613 | if commit and allowcommit: |
|
2608 | 2614 | continue |
|
2609 | 2615 | if repo.vfs.exists(f): |
|
2610 | 2616 | raise util.Abort(msg, hint=hint) |
|
2611 | 2617 | |
|
2612 | 2618 | def clearunfinished(repo): |
|
2613 | 2619 | '''Check for unfinished operations (as above), and clear the ones |
|
2614 | 2620 | that are clearable. |
|
2615 | 2621 | ''' |
|
2616 | 2622 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2617 | 2623 | if not clearable and repo.vfs.exists(f): |
|
2618 | 2624 | raise util.Abort(msg, hint=hint) |
|
2619 | 2625 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2620 | 2626 | if clearable and repo.vfs.exists(f): |
|
2621 | 2627 | util.unlink(repo.join(f)) |
@@ -1,2131 +1,2158 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 mercurial import extensions, revset, commands, cmdutil |
|
86 | 86 | > |
|
87 | 87 | > def uisetup(ui): |
|
88 | 88 | > def printrevset(orig, ui, repo, *pats, **opts): |
|
89 | 89 | > if opts.get('print_revset'): |
|
90 | 90 | > expr = cmdutil.getgraphlogrevs(repo, pats, opts)[1] |
|
91 | 91 | > if expr: |
|
92 | 92 | > tree = revset.parse(expr)[0] |
|
93 | 93 | > else: |
|
94 | 94 | > tree = [] |
|
95 | 95 | > ui.write('%r\n' % (opts.get('rev', []),)) |
|
96 | 96 | > ui.write(revset.prettyformat(tree) + '\n') |
|
97 | 97 | > return 0 |
|
98 | 98 | > return orig(ui, repo, *pats, **opts) |
|
99 | 99 | > entry = extensions.wrapcommand(commands.table, 'log', printrevset) |
|
100 | 100 | > entry[1].append(('', 'print-revset', False, |
|
101 | 101 | > 'print generated revset and exit (DEPRECATED)')) |
|
102 | 102 | > EOF |
|
103 | 103 | |
|
104 | 104 | $ echo "[extensions]" >> $HGRCPATH |
|
105 | 105 | $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH |
|
106 | 106 | |
|
107 | 107 | $ hg init repo |
|
108 | 108 | $ cd repo |
|
109 | 109 | |
|
110 | 110 | Empty repo: |
|
111 | 111 | |
|
112 | 112 | $ hg log -G |
|
113 | 113 | |
|
114 | 114 | |
|
115 | 115 | Building DAG: |
|
116 | 116 | |
|
117 | 117 | $ commit 0 "root" |
|
118 | 118 | $ commit 1 "collapse" 0 |
|
119 | 119 | $ commit 2 "collapse" 1 |
|
120 | 120 | $ commit 3 "collapse" 2 |
|
121 | 121 | $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
122 | 122 | $ commit 5 "expand" 3 4 |
|
123 | 123 | $ commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
124 | 124 | $ commit 7 "expand" 2 5 |
|
125 | 125 | $ commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
126 | 126 | $ commit 9 "expand" 7 8 |
|
127 | 127 | $ commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
128 | 128 | $ commit 11 "expand" 6 10 |
|
129 | 129 | $ commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
130 | 130 | $ commit 13 "expand" 9 11 |
|
131 | 131 | $ commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
132 | 132 | $ commit 15 "expand" 13 14 |
|
133 | 133 | $ commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
134 | 134 | $ commit 17 "expand" 12 16 |
|
135 | 135 | $ commit 18 "merge two known; two far left" 1 15 |
|
136 | 136 | $ commit 19 "expand" 15 17 |
|
137 | 137 | $ commit 20 "merge two known; two far right" 0 18 |
|
138 | 138 | $ commit 21 "expand" 19 20 |
|
139 | 139 | $ commit 22 "merge two known; one far left, one far right" 18 21 |
|
140 | 140 | $ commit 23 "merge one known; immediate left" 1 22 |
|
141 | 141 | $ commit 24 "merge one known; immediate right" 0 23 |
|
142 | 142 | $ commit 25 "merge one known; far left" 21 24 |
|
143 | 143 | $ commit 26 "merge one known; far right" 18 25 |
|
144 | 144 | $ commit 27 "collapse" 21 |
|
145 | 145 | $ commit 28 "merge zero known" 1 26 |
|
146 | 146 | $ commit 29 "regular commit" 0 |
|
147 | 147 | $ commit 30 "expand" 28 29 |
|
148 | 148 | $ commit 31 "expand" 21 30 |
|
149 | 149 | $ commit 32 "expand" 27 31 |
|
150 | 150 | $ commit 33 "head" 18 |
|
151 | 151 | $ commit 34 "head" 32 |
|
152 | 152 | |
|
153 | 153 | |
|
154 | 154 | $ hg log -G -q |
|
155 | 155 | @ 34:fea3ac5810e0 |
|
156 | 156 | | |
|
157 | 157 | | o 33:68608f5145f9 |
|
158 | 158 | | | |
|
159 | 159 | o | 32:d06dffa21a31 |
|
160 | 160 | |\ \ |
|
161 | 161 | | o \ 31:621d83e11f67 |
|
162 | 162 | | |\ \ |
|
163 | 163 | | | o \ 30:6e11cd4b648f |
|
164 | 164 | | | |\ \ |
|
165 | 165 | | | | o | 29:cd9bb2be7593 |
|
166 | 166 | | | | | | |
|
167 | 167 | | | o | | 28:44ecd0b9ae99 |
|
168 | 168 | | | |\ \ \ |
|
169 | 169 | o | | | | | 27:886ed638191b |
|
170 | 170 | |/ / / / / |
|
171 | 171 | | | o---+ 26:7f25b6c2f0b9 |
|
172 | 172 | | | | | | |
|
173 | 173 | +---o | | 25:91da8ed57247 |
|
174 | 174 | | | | | | |
|
175 | 175 | | | o | | 24:a9c19a3d96b7 |
|
176 | 176 | | | |\| | |
|
177 | 177 | | | o | | 23:a01cddf0766d |
|
178 | 178 | | |/| | | |
|
179 | 179 | +---o---+ 22:e0d9cccacb5d |
|
180 | 180 | | | / / |
|
181 | 181 | o | | | 21:d42a756af44d |
|
182 | 182 | |\ \ \ \ |
|
183 | 183 | | o---+-+ 20:d30ed6450e32 |
|
184 | 184 | | / / / |
|
185 | 185 | o | | | 19:31ddc2c1573b |
|
186 | 186 | |\ \ \ \ |
|
187 | 187 | +---+---o 18:1aa84d96232a |
|
188 | 188 | | | | | |
|
189 | 189 | | o | | 17:44765d7c06e0 |
|
190 | 190 | | |\ \ \ |
|
191 | 191 | | | o---+ 16:3677d192927d |
|
192 | 192 | | | |/ / |
|
193 | 193 | o | | | 15:1dda3f72782d |
|
194 | 194 | |\ \ \ \ |
|
195 | 195 | | o-----+ 14:8eac370358ef |
|
196 | 196 | | |/ / / |
|
197 | 197 | o | | | 13:22d8966a97e3 |
|
198 | 198 | |\ \ \ \ |
|
199 | 199 | +---o | | 12:86b91144a6e9 |
|
200 | 200 | | | |/ / |
|
201 | 201 | | o | | 11:832d76e6bdf2 |
|
202 | 202 | | |\ \ \ |
|
203 | 203 | | | o---+ 10:74c64d036d72 |
|
204 | 204 | | |/ / / |
|
205 | 205 | o | | | 9:7010c0af0a35 |
|
206 | 206 | |\ \ \ \ |
|
207 | 207 | | o-----+ 8:7a0b11f71937 |
|
208 | 208 | |/ / / / |
|
209 | 209 | o | | | 7:b632bb1b1224 |
|
210 | 210 | |\ \ \ \ |
|
211 | 211 | +---o | | 6:b105a072e251 |
|
212 | 212 | | |/ / / |
|
213 | 213 | | o | | 5:4409d547b708 |
|
214 | 214 | | |\ \ \ |
|
215 | 215 | | | o | | 4:26a8bac39d9f |
|
216 | 216 | | |/|/ / |
|
217 | 217 | | o / / 3:27eef8ed80b4 |
|
218 | 218 | |/ / / |
|
219 | 219 | o / / 2:3d9a33b8d1e1 |
|
220 | 220 | |/ / |
|
221 | 221 | o / 1:6db2ef61d156 |
|
222 | 222 | |/ |
|
223 | 223 | o 0:e6eb3150255d |
|
224 | 224 | |
|
225 | 225 | |
|
226 | 226 | $ hg log -G |
|
227 | 227 | @ changeset: 34:fea3ac5810e0 |
|
228 | 228 | | tag: tip |
|
229 | 229 | | parent: 32:d06dffa21a31 |
|
230 | 230 | | user: test |
|
231 | 231 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
232 | 232 | | summary: (34) head |
|
233 | 233 | | |
|
234 | 234 | | o changeset: 33:68608f5145f9 |
|
235 | 235 | | | parent: 18:1aa84d96232a |
|
236 | 236 | | | user: test |
|
237 | 237 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
238 | 238 | | | summary: (33) head |
|
239 | 239 | | | |
|
240 | 240 | o | changeset: 32:d06dffa21a31 |
|
241 | 241 | |\ \ parent: 27:886ed638191b |
|
242 | 242 | | | | parent: 31:621d83e11f67 |
|
243 | 243 | | | | user: test |
|
244 | 244 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
245 | 245 | | | | summary: (32) expand |
|
246 | 246 | | | | |
|
247 | 247 | | o | changeset: 31:621d83e11f67 |
|
248 | 248 | | |\ \ parent: 21:d42a756af44d |
|
249 | 249 | | | | | parent: 30:6e11cd4b648f |
|
250 | 250 | | | | | user: test |
|
251 | 251 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
252 | 252 | | | | | summary: (31) expand |
|
253 | 253 | | | | | |
|
254 | 254 | | | o | changeset: 30:6e11cd4b648f |
|
255 | 255 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
256 | 256 | | | | | | parent: 29:cd9bb2be7593 |
|
257 | 257 | | | | | | user: test |
|
258 | 258 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
259 | 259 | | | | | | summary: (30) expand |
|
260 | 260 | | | | | | |
|
261 | 261 | | | | o | changeset: 29:cd9bb2be7593 |
|
262 | 262 | | | | | | parent: 0:e6eb3150255d |
|
263 | 263 | | | | | | user: test |
|
264 | 264 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
265 | 265 | | | | | | summary: (29) regular commit |
|
266 | 266 | | | | | | |
|
267 | 267 | | | o | | changeset: 28:44ecd0b9ae99 |
|
268 | 268 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
269 | 269 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
270 | 270 | | | | | | | user: test |
|
271 | 271 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
272 | 272 | | | | | | | summary: (28) merge zero known |
|
273 | 273 | | | | | | | |
|
274 | 274 | o | | | | | changeset: 27:886ed638191b |
|
275 | 275 | |/ / / / / parent: 21:d42a756af44d |
|
276 | 276 | | | | | | user: test |
|
277 | 277 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
278 | 278 | | | | | | summary: (27) collapse |
|
279 | 279 | | | | | | |
|
280 | 280 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
281 | 281 | | | | | | parent: 18:1aa84d96232a |
|
282 | 282 | | | | | | parent: 25:91da8ed57247 |
|
283 | 283 | | | | | | user: test |
|
284 | 284 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
285 | 285 | | | | | | summary: (26) merge one known; far right |
|
286 | 286 | | | | | | |
|
287 | 287 | +---o | | changeset: 25:91da8ed57247 |
|
288 | 288 | | | | | | parent: 21:d42a756af44d |
|
289 | 289 | | | | | | parent: 24:a9c19a3d96b7 |
|
290 | 290 | | | | | | user: test |
|
291 | 291 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
292 | 292 | | | | | | summary: (25) merge one known; far left |
|
293 | 293 | | | | | | |
|
294 | 294 | | | o | | changeset: 24:a9c19a3d96b7 |
|
295 | 295 | | | |\| | parent: 0:e6eb3150255d |
|
296 | 296 | | | | | | parent: 23:a01cddf0766d |
|
297 | 297 | | | | | | user: test |
|
298 | 298 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
299 | 299 | | | | | | summary: (24) merge one known; immediate right |
|
300 | 300 | | | | | | |
|
301 | 301 | | | o | | changeset: 23:a01cddf0766d |
|
302 | 302 | | |/| | | parent: 1:6db2ef61d156 |
|
303 | 303 | | | | | | parent: 22:e0d9cccacb5d |
|
304 | 304 | | | | | | user: test |
|
305 | 305 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
306 | 306 | | | | | | summary: (23) merge one known; immediate left |
|
307 | 307 | | | | | | |
|
308 | 308 | +---o---+ changeset: 22:e0d9cccacb5d |
|
309 | 309 | | | | | parent: 18:1aa84d96232a |
|
310 | 310 | | | / / parent: 21:d42a756af44d |
|
311 | 311 | | | | | user: test |
|
312 | 312 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
313 | 313 | | | | | summary: (22) merge two known; one far left, one far right |
|
314 | 314 | | | | | |
|
315 | 315 | o | | | changeset: 21:d42a756af44d |
|
316 | 316 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
317 | 317 | | | | | | parent: 20:d30ed6450e32 |
|
318 | 318 | | | | | | user: test |
|
319 | 319 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
320 | 320 | | | | | | summary: (21) expand |
|
321 | 321 | | | | | | |
|
322 | 322 | | o---+-+ changeset: 20:d30ed6450e32 |
|
323 | 323 | | | | | parent: 0:e6eb3150255d |
|
324 | 324 | | / / / parent: 18:1aa84d96232a |
|
325 | 325 | | | | | user: test |
|
326 | 326 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
327 | 327 | | | | | summary: (20) merge two known; two far right |
|
328 | 328 | | | | | |
|
329 | 329 | o | | | changeset: 19:31ddc2c1573b |
|
330 | 330 | |\ \ \ \ parent: 15:1dda3f72782d |
|
331 | 331 | | | | | | parent: 17:44765d7c06e0 |
|
332 | 332 | | | | | | user: test |
|
333 | 333 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
334 | 334 | | | | | | summary: (19) expand |
|
335 | 335 | | | | | | |
|
336 | 336 | +---+---o changeset: 18:1aa84d96232a |
|
337 | 337 | | | | | parent: 1:6db2ef61d156 |
|
338 | 338 | | | | | parent: 15:1dda3f72782d |
|
339 | 339 | | | | | user: test |
|
340 | 340 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
341 | 341 | | | | | summary: (18) merge two known; two far left |
|
342 | 342 | | | | | |
|
343 | 343 | | o | | changeset: 17:44765d7c06e0 |
|
344 | 344 | | |\ \ \ parent: 12:86b91144a6e9 |
|
345 | 345 | | | | | | parent: 16:3677d192927d |
|
346 | 346 | | | | | | user: test |
|
347 | 347 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
348 | 348 | | | | | | summary: (17) expand |
|
349 | 349 | | | | | | |
|
350 | 350 | | | o---+ changeset: 16:3677d192927d |
|
351 | 351 | | | | | | parent: 0:e6eb3150255d |
|
352 | 352 | | | |/ / parent: 1:6db2ef61d156 |
|
353 | 353 | | | | | user: test |
|
354 | 354 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
355 | 355 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
356 | 356 | | | | | |
|
357 | 357 | o | | | changeset: 15:1dda3f72782d |
|
358 | 358 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
359 | 359 | | | | | | parent: 14:8eac370358ef |
|
360 | 360 | | | | | | user: test |
|
361 | 361 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
362 | 362 | | | | | | summary: (15) expand |
|
363 | 363 | | | | | | |
|
364 | 364 | | o-----+ changeset: 14:8eac370358ef |
|
365 | 365 | | | | | | parent: 0:e6eb3150255d |
|
366 | 366 | | |/ / / parent: 12:86b91144a6e9 |
|
367 | 367 | | | | | user: test |
|
368 | 368 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
369 | 369 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
370 | 370 | | | | | |
|
371 | 371 | o | | | changeset: 13:22d8966a97e3 |
|
372 | 372 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
373 | 373 | | | | | | parent: 11:832d76e6bdf2 |
|
374 | 374 | | | | | | user: test |
|
375 | 375 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
376 | 376 | | | | | | summary: (13) expand |
|
377 | 377 | | | | | | |
|
378 | 378 | +---o | | changeset: 12:86b91144a6e9 |
|
379 | 379 | | | |/ / parent: 1:6db2ef61d156 |
|
380 | 380 | | | | | parent: 9:7010c0af0a35 |
|
381 | 381 | | | | | user: test |
|
382 | 382 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
383 | 383 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
384 | 384 | | | | | |
|
385 | 385 | | o | | changeset: 11:832d76e6bdf2 |
|
386 | 386 | | |\ \ \ parent: 6:b105a072e251 |
|
387 | 387 | | | | | | parent: 10:74c64d036d72 |
|
388 | 388 | | | | | | user: test |
|
389 | 389 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
390 | 390 | | | | | | summary: (11) expand |
|
391 | 391 | | | | | | |
|
392 | 392 | | | o---+ changeset: 10:74c64d036d72 |
|
393 | 393 | | | | | | parent: 0:e6eb3150255d |
|
394 | 394 | | |/ / / parent: 6:b105a072e251 |
|
395 | 395 | | | | | user: test |
|
396 | 396 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
397 | 397 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
398 | 398 | | | | | |
|
399 | 399 | o | | | changeset: 9:7010c0af0a35 |
|
400 | 400 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
401 | 401 | | | | | | parent: 8:7a0b11f71937 |
|
402 | 402 | | | | | | user: test |
|
403 | 403 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
404 | 404 | | | | | | summary: (9) expand |
|
405 | 405 | | | | | | |
|
406 | 406 | | o-----+ changeset: 8:7a0b11f71937 |
|
407 | 407 | | | | | | parent: 0:e6eb3150255d |
|
408 | 408 | |/ / / / parent: 7:b632bb1b1224 |
|
409 | 409 | | | | | user: test |
|
410 | 410 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
411 | 411 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
412 | 412 | | | | | |
|
413 | 413 | o | | | changeset: 7:b632bb1b1224 |
|
414 | 414 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
415 | 415 | | | | | | parent: 5:4409d547b708 |
|
416 | 416 | | | | | | user: test |
|
417 | 417 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
418 | 418 | | | | | | summary: (7) expand |
|
419 | 419 | | | | | | |
|
420 | 420 | +---o | | changeset: 6:b105a072e251 |
|
421 | 421 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
422 | 422 | | | | | parent: 5:4409d547b708 |
|
423 | 423 | | | | | user: test |
|
424 | 424 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
425 | 425 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
426 | 426 | | | | | |
|
427 | 427 | | o | | changeset: 5:4409d547b708 |
|
428 | 428 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
429 | 429 | | | | | | parent: 4:26a8bac39d9f |
|
430 | 430 | | | | | | user: test |
|
431 | 431 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
432 | 432 | | | | | | summary: (5) expand |
|
433 | 433 | | | | | | |
|
434 | 434 | | | o | | changeset: 4:26a8bac39d9f |
|
435 | 435 | | |/|/ / parent: 1:6db2ef61d156 |
|
436 | 436 | | | | | parent: 3:27eef8ed80b4 |
|
437 | 437 | | | | | user: test |
|
438 | 438 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
439 | 439 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
440 | 440 | | | | | |
|
441 | 441 | | o | | changeset: 3:27eef8ed80b4 |
|
442 | 442 | |/ / / user: test |
|
443 | 443 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
444 | 444 | | | | summary: (3) collapse |
|
445 | 445 | | | | |
|
446 | 446 | o | | changeset: 2:3d9a33b8d1e1 |
|
447 | 447 | |/ / user: test |
|
448 | 448 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
449 | 449 | | | summary: (2) collapse |
|
450 | 450 | | | |
|
451 | 451 | o | changeset: 1:6db2ef61d156 |
|
452 | 452 | |/ user: test |
|
453 | 453 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
454 | 454 | | summary: (1) collapse |
|
455 | 455 | | |
|
456 | 456 | o changeset: 0:e6eb3150255d |
|
457 | 457 | user: test |
|
458 | 458 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
459 | 459 | summary: (0) root |
|
460 | 460 | |
|
461 | 461 | |
|
462 | 462 | File glog: |
|
463 | 463 | $ hg log -G a |
|
464 | 464 | @ changeset: 34:fea3ac5810e0 |
|
465 | 465 | | tag: tip |
|
466 | 466 | | parent: 32:d06dffa21a31 |
|
467 | 467 | | user: test |
|
468 | 468 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
469 | 469 | | summary: (34) head |
|
470 | 470 | | |
|
471 | 471 | | o changeset: 33:68608f5145f9 |
|
472 | 472 | | | parent: 18:1aa84d96232a |
|
473 | 473 | | | user: test |
|
474 | 474 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
475 | 475 | | | summary: (33) head |
|
476 | 476 | | | |
|
477 | 477 | o | changeset: 32:d06dffa21a31 |
|
478 | 478 | |\ \ parent: 27:886ed638191b |
|
479 | 479 | | | | parent: 31:621d83e11f67 |
|
480 | 480 | | | | user: test |
|
481 | 481 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
482 | 482 | | | | summary: (32) expand |
|
483 | 483 | | | | |
|
484 | 484 | | o | changeset: 31:621d83e11f67 |
|
485 | 485 | | |\ \ parent: 21:d42a756af44d |
|
486 | 486 | | | | | parent: 30:6e11cd4b648f |
|
487 | 487 | | | | | user: test |
|
488 | 488 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
489 | 489 | | | | | summary: (31) expand |
|
490 | 490 | | | | | |
|
491 | 491 | | | o | changeset: 30:6e11cd4b648f |
|
492 | 492 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
493 | 493 | | | | | | parent: 29:cd9bb2be7593 |
|
494 | 494 | | | | | | user: test |
|
495 | 495 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
496 | 496 | | | | | | summary: (30) expand |
|
497 | 497 | | | | | | |
|
498 | 498 | | | | o | changeset: 29:cd9bb2be7593 |
|
499 | 499 | | | | | | parent: 0:e6eb3150255d |
|
500 | 500 | | | | | | user: test |
|
501 | 501 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
502 | 502 | | | | | | summary: (29) regular commit |
|
503 | 503 | | | | | | |
|
504 | 504 | | | o | | changeset: 28:44ecd0b9ae99 |
|
505 | 505 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
506 | 506 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
507 | 507 | | | | | | | user: test |
|
508 | 508 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
509 | 509 | | | | | | | summary: (28) merge zero known |
|
510 | 510 | | | | | | | |
|
511 | 511 | o | | | | | changeset: 27:886ed638191b |
|
512 | 512 | |/ / / / / parent: 21:d42a756af44d |
|
513 | 513 | | | | | | user: test |
|
514 | 514 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
515 | 515 | | | | | | summary: (27) collapse |
|
516 | 516 | | | | | | |
|
517 | 517 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
518 | 518 | | | | | | parent: 18:1aa84d96232a |
|
519 | 519 | | | | | | parent: 25:91da8ed57247 |
|
520 | 520 | | | | | | user: test |
|
521 | 521 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
522 | 522 | | | | | | summary: (26) merge one known; far right |
|
523 | 523 | | | | | | |
|
524 | 524 | +---o | | changeset: 25:91da8ed57247 |
|
525 | 525 | | | | | | parent: 21:d42a756af44d |
|
526 | 526 | | | | | | parent: 24:a9c19a3d96b7 |
|
527 | 527 | | | | | | user: test |
|
528 | 528 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
529 | 529 | | | | | | summary: (25) merge one known; far left |
|
530 | 530 | | | | | | |
|
531 | 531 | | | o | | changeset: 24:a9c19a3d96b7 |
|
532 | 532 | | | |\| | parent: 0:e6eb3150255d |
|
533 | 533 | | | | | | parent: 23:a01cddf0766d |
|
534 | 534 | | | | | | user: test |
|
535 | 535 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
536 | 536 | | | | | | summary: (24) merge one known; immediate right |
|
537 | 537 | | | | | | |
|
538 | 538 | | | o | | changeset: 23:a01cddf0766d |
|
539 | 539 | | |/| | | parent: 1:6db2ef61d156 |
|
540 | 540 | | | | | | parent: 22:e0d9cccacb5d |
|
541 | 541 | | | | | | user: test |
|
542 | 542 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
543 | 543 | | | | | | summary: (23) merge one known; immediate left |
|
544 | 544 | | | | | | |
|
545 | 545 | +---o---+ changeset: 22:e0d9cccacb5d |
|
546 | 546 | | | | | parent: 18:1aa84d96232a |
|
547 | 547 | | | / / parent: 21:d42a756af44d |
|
548 | 548 | | | | | user: test |
|
549 | 549 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
550 | 550 | | | | | summary: (22) merge two known; one far left, one far right |
|
551 | 551 | | | | | |
|
552 | 552 | o | | | changeset: 21:d42a756af44d |
|
553 | 553 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
554 | 554 | | | | | | parent: 20:d30ed6450e32 |
|
555 | 555 | | | | | | user: test |
|
556 | 556 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
557 | 557 | | | | | | summary: (21) expand |
|
558 | 558 | | | | | | |
|
559 | 559 | | o---+-+ changeset: 20:d30ed6450e32 |
|
560 | 560 | | | | | parent: 0:e6eb3150255d |
|
561 | 561 | | / / / parent: 18:1aa84d96232a |
|
562 | 562 | | | | | user: test |
|
563 | 563 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
564 | 564 | | | | | summary: (20) merge two known; two far right |
|
565 | 565 | | | | | |
|
566 | 566 | o | | | changeset: 19:31ddc2c1573b |
|
567 | 567 | |\ \ \ \ parent: 15:1dda3f72782d |
|
568 | 568 | | | | | | parent: 17:44765d7c06e0 |
|
569 | 569 | | | | | | user: test |
|
570 | 570 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
571 | 571 | | | | | | summary: (19) expand |
|
572 | 572 | | | | | | |
|
573 | 573 | +---+---o changeset: 18:1aa84d96232a |
|
574 | 574 | | | | | parent: 1:6db2ef61d156 |
|
575 | 575 | | | | | parent: 15:1dda3f72782d |
|
576 | 576 | | | | | user: test |
|
577 | 577 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
578 | 578 | | | | | summary: (18) merge two known; two far left |
|
579 | 579 | | | | | |
|
580 | 580 | | o | | changeset: 17:44765d7c06e0 |
|
581 | 581 | | |\ \ \ parent: 12:86b91144a6e9 |
|
582 | 582 | | | | | | parent: 16:3677d192927d |
|
583 | 583 | | | | | | user: test |
|
584 | 584 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
585 | 585 | | | | | | summary: (17) expand |
|
586 | 586 | | | | | | |
|
587 | 587 | | | o---+ changeset: 16:3677d192927d |
|
588 | 588 | | | | | | parent: 0:e6eb3150255d |
|
589 | 589 | | | |/ / parent: 1:6db2ef61d156 |
|
590 | 590 | | | | | user: test |
|
591 | 591 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
592 | 592 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
593 | 593 | | | | | |
|
594 | 594 | o | | | changeset: 15:1dda3f72782d |
|
595 | 595 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
596 | 596 | | | | | | parent: 14:8eac370358ef |
|
597 | 597 | | | | | | user: test |
|
598 | 598 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
599 | 599 | | | | | | summary: (15) expand |
|
600 | 600 | | | | | | |
|
601 | 601 | | o-----+ changeset: 14:8eac370358ef |
|
602 | 602 | | | | | | parent: 0:e6eb3150255d |
|
603 | 603 | | |/ / / parent: 12:86b91144a6e9 |
|
604 | 604 | | | | | user: test |
|
605 | 605 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
606 | 606 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
607 | 607 | | | | | |
|
608 | 608 | o | | | changeset: 13:22d8966a97e3 |
|
609 | 609 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
610 | 610 | | | | | | parent: 11:832d76e6bdf2 |
|
611 | 611 | | | | | | user: test |
|
612 | 612 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
613 | 613 | | | | | | summary: (13) expand |
|
614 | 614 | | | | | | |
|
615 | 615 | +---o | | changeset: 12:86b91144a6e9 |
|
616 | 616 | | | |/ / parent: 1:6db2ef61d156 |
|
617 | 617 | | | | | parent: 9:7010c0af0a35 |
|
618 | 618 | | | | | user: test |
|
619 | 619 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
620 | 620 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
621 | 621 | | | | | |
|
622 | 622 | | o | | changeset: 11:832d76e6bdf2 |
|
623 | 623 | | |\ \ \ parent: 6:b105a072e251 |
|
624 | 624 | | | | | | parent: 10:74c64d036d72 |
|
625 | 625 | | | | | | user: test |
|
626 | 626 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
627 | 627 | | | | | | summary: (11) expand |
|
628 | 628 | | | | | | |
|
629 | 629 | | | o---+ changeset: 10:74c64d036d72 |
|
630 | 630 | | | | | | parent: 0:e6eb3150255d |
|
631 | 631 | | |/ / / parent: 6:b105a072e251 |
|
632 | 632 | | | | | user: test |
|
633 | 633 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
634 | 634 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
635 | 635 | | | | | |
|
636 | 636 | o | | | changeset: 9:7010c0af0a35 |
|
637 | 637 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
638 | 638 | | | | | | parent: 8:7a0b11f71937 |
|
639 | 639 | | | | | | user: test |
|
640 | 640 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
641 | 641 | | | | | | summary: (9) expand |
|
642 | 642 | | | | | | |
|
643 | 643 | | o-----+ changeset: 8:7a0b11f71937 |
|
644 | 644 | | | | | | parent: 0:e6eb3150255d |
|
645 | 645 | |/ / / / parent: 7:b632bb1b1224 |
|
646 | 646 | | | | | user: test |
|
647 | 647 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
648 | 648 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
649 | 649 | | | | | |
|
650 | 650 | o | | | changeset: 7:b632bb1b1224 |
|
651 | 651 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
652 | 652 | | | | | | parent: 5:4409d547b708 |
|
653 | 653 | | | | | | user: test |
|
654 | 654 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
655 | 655 | | | | | | summary: (7) expand |
|
656 | 656 | | | | | | |
|
657 | 657 | +---o | | changeset: 6:b105a072e251 |
|
658 | 658 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
659 | 659 | | | | | parent: 5:4409d547b708 |
|
660 | 660 | | | | | user: test |
|
661 | 661 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
662 | 662 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
663 | 663 | | | | | |
|
664 | 664 | | o | | changeset: 5:4409d547b708 |
|
665 | 665 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
666 | 666 | | | | | | parent: 4:26a8bac39d9f |
|
667 | 667 | | | | | | user: test |
|
668 | 668 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
669 | 669 | | | | | | summary: (5) expand |
|
670 | 670 | | | | | | |
|
671 | 671 | | | o | | changeset: 4:26a8bac39d9f |
|
672 | 672 | | |/|/ / parent: 1:6db2ef61d156 |
|
673 | 673 | | | | | parent: 3:27eef8ed80b4 |
|
674 | 674 | | | | | user: test |
|
675 | 675 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
676 | 676 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
677 | 677 | | | | | |
|
678 | 678 | | o | | changeset: 3:27eef8ed80b4 |
|
679 | 679 | |/ / / user: test |
|
680 | 680 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
681 | 681 | | | | summary: (3) collapse |
|
682 | 682 | | | | |
|
683 | 683 | o | | changeset: 2:3d9a33b8d1e1 |
|
684 | 684 | |/ / user: test |
|
685 | 685 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
686 | 686 | | | summary: (2) collapse |
|
687 | 687 | | | |
|
688 | 688 | o | changeset: 1:6db2ef61d156 |
|
689 | 689 | |/ user: test |
|
690 | 690 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
691 | 691 | | summary: (1) collapse |
|
692 | 692 | | |
|
693 | 693 | o changeset: 0:e6eb3150255d |
|
694 | 694 | user: test |
|
695 | 695 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
696 | 696 | summary: (0) root |
|
697 | 697 | |
|
698 | 698 | |
|
699 | 699 | File glog per revset: |
|
700 | 700 | |
|
701 | 701 | $ hg log -G -r 'file("a")' |
|
702 | 702 | @ changeset: 34:fea3ac5810e0 |
|
703 | 703 | | tag: tip |
|
704 | 704 | | parent: 32:d06dffa21a31 |
|
705 | 705 | | user: test |
|
706 | 706 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
707 | 707 | | summary: (34) head |
|
708 | 708 | | |
|
709 | 709 | | o changeset: 33:68608f5145f9 |
|
710 | 710 | | | parent: 18:1aa84d96232a |
|
711 | 711 | | | user: test |
|
712 | 712 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
713 | 713 | | | summary: (33) head |
|
714 | 714 | | | |
|
715 | 715 | o | changeset: 32:d06dffa21a31 |
|
716 | 716 | |\ \ parent: 27:886ed638191b |
|
717 | 717 | | | | parent: 31:621d83e11f67 |
|
718 | 718 | | | | user: test |
|
719 | 719 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
720 | 720 | | | | summary: (32) expand |
|
721 | 721 | | | | |
|
722 | 722 | | o | changeset: 31:621d83e11f67 |
|
723 | 723 | | |\ \ parent: 21:d42a756af44d |
|
724 | 724 | | | | | parent: 30:6e11cd4b648f |
|
725 | 725 | | | | | user: test |
|
726 | 726 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
727 | 727 | | | | | summary: (31) expand |
|
728 | 728 | | | | | |
|
729 | 729 | | | o | changeset: 30:6e11cd4b648f |
|
730 | 730 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
731 | 731 | | | | | | parent: 29:cd9bb2be7593 |
|
732 | 732 | | | | | | user: test |
|
733 | 733 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
734 | 734 | | | | | | summary: (30) expand |
|
735 | 735 | | | | | | |
|
736 | 736 | | | | o | changeset: 29:cd9bb2be7593 |
|
737 | 737 | | | | | | parent: 0:e6eb3150255d |
|
738 | 738 | | | | | | user: test |
|
739 | 739 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
740 | 740 | | | | | | summary: (29) regular commit |
|
741 | 741 | | | | | | |
|
742 | 742 | | | o | | changeset: 28:44ecd0b9ae99 |
|
743 | 743 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
744 | 744 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
745 | 745 | | | | | | | user: test |
|
746 | 746 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
747 | 747 | | | | | | | summary: (28) merge zero known |
|
748 | 748 | | | | | | | |
|
749 | 749 | o | | | | | changeset: 27:886ed638191b |
|
750 | 750 | |/ / / / / parent: 21:d42a756af44d |
|
751 | 751 | | | | | | user: test |
|
752 | 752 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
753 | 753 | | | | | | summary: (27) collapse |
|
754 | 754 | | | | | | |
|
755 | 755 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
756 | 756 | | | | | | parent: 18:1aa84d96232a |
|
757 | 757 | | | | | | parent: 25:91da8ed57247 |
|
758 | 758 | | | | | | user: test |
|
759 | 759 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
760 | 760 | | | | | | summary: (26) merge one known; far right |
|
761 | 761 | | | | | | |
|
762 | 762 | +---o | | changeset: 25:91da8ed57247 |
|
763 | 763 | | | | | | parent: 21:d42a756af44d |
|
764 | 764 | | | | | | parent: 24:a9c19a3d96b7 |
|
765 | 765 | | | | | | user: test |
|
766 | 766 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
767 | 767 | | | | | | summary: (25) merge one known; far left |
|
768 | 768 | | | | | | |
|
769 | 769 | | | o | | changeset: 24:a9c19a3d96b7 |
|
770 | 770 | | | |\| | parent: 0:e6eb3150255d |
|
771 | 771 | | | | | | parent: 23:a01cddf0766d |
|
772 | 772 | | | | | | user: test |
|
773 | 773 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
774 | 774 | | | | | | summary: (24) merge one known; immediate right |
|
775 | 775 | | | | | | |
|
776 | 776 | | | o | | changeset: 23:a01cddf0766d |
|
777 | 777 | | |/| | | parent: 1:6db2ef61d156 |
|
778 | 778 | | | | | | parent: 22:e0d9cccacb5d |
|
779 | 779 | | | | | | user: test |
|
780 | 780 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
781 | 781 | | | | | | summary: (23) merge one known; immediate left |
|
782 | 782 | | | | | | |
|
783 | 783 | +---o---+ changeset: 22:e0d9cccacb5d |
|
784 | 784 | | | | | parent: 18:1aa84d96232a |
|
785 | 785 | | | / / parent: 21:d42a756af44d |
|
786 | 786 | | | | | user: test |
|
787 | 787 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
788 | 788 | | | | | summary: (22) merge two known; one far left, one far right |
|
789 | 789 | | | | | |
|
790 | 790 | o | | | changeset: 21:d42a756af44d |
|
791 | 791 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
792 | 792 | | | | | | parent: 20:d30ed6450e32 |
|
793 | 793 | | | | | | user: test |
|
794 | 794 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
795 | 795 | | | | | | summary: (21) expand |
|
796 | 796 | | | | | | |
|
797 | 797 | | o---+-+ changeset: 20:d30ed6450e32 |
|
798 | 798 | | | | | parent: 0:e6eb3150255d |
|
799 | 799 | | / / / parent: 18:1aa84d96232a |
|
800 | 800 | | | | | user: test |
|
801 | 801 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
802 | 802 | | | | | summary: (20) merge two known; two far right |
|
803 | 803 | | | | | |
|
804 | 804 | o | | | changeset: 19:31ddc2c1573b |
|
805 | 805 | |\ \ \ \ parent: 15:1dda3f72782d |
|
806 | 806 | | | | | | parent: 17:44765d7c06e0 |
|
807 | 807 | | | | | | user: test |
|
808 | 808 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
809 | 809 | | | | | | summary: (19) expand |
|
810 | 810 | | | | | | |
|
811 | 811 | +---+---o changeset: 18:1aa84d96232a |
|
812 | 812 | | | | | parent: 1:6db2ef61d156 |
|
813 | 813 | | | | | parent: 15:1dda3f72782d |
|
814 | 814 | | | | | user: test |
|
815 | 815 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
816 | 816 | | | | | summary: (18) merge two known; two far left |
|
817 | 817 | | | | | |
|
818 | 818 | | o | | changeset: 17:44765d7c06e0 |
|
819 | 819 | | |\ \ \ parent: 12:86b91144a6e9 |
|
820 | 820 | | | | | | parent: 16:3677d192927d |
|
821 | 821 | | | | | | user: test |
|
822 | 822 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
823 | 823 | | | | | | summary: (17) expand |
|
824 | 824 | | | | | | |
|
825 | 825 | | | o---+ changeset: 16:3677d192927d |
|
826 | 826 | | | | | | parent: 0:e6eb3150255d |
|
827 | 827 | | | |/ / parent: 1:6db2ef61d156 |
|
828 | 828 | | | | | user: test |
|
829 | 829 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
830 | 830 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
831 | 831 | | | | | |
|
832 | 832 | o | | | changeset: 15:1dda3f72782d |
|
833 | 833 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
834 | 834 | | | | | | parent: 14:8eac370358ef |
|
835 | 835 | | | | | | user: test |
|
836 | 836 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
837 | 837 | | | | | | summary: (15) expand |
|
838 | 838 | | | | | | |
|
839 | 839 | | o-----+ changeset: 14:8eac370358ef |
|
840 | 840 | | | | | | parent: 0:e6eb3150255d |
|
841 | 841 | | |/ / / parent: 12:86b91144a6e9 |
|
842 | 842 | | | | | user: test |
|
843 | 843 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
844 | 844 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
845 | 845 | | | | | |
|
846 | 846 | o | | | changeset: 13:22d8966a97e3 |
|
847 | 847 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
848 | 848 | | | | | | parent: 11:832d76e6bdf2 |
|
849 | 849 | | | | | | user: test |
|
850 | 850 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
851 | 851 | | | | | | summary: (13) expand |
|
852 | 852 | | | | | | |
|
853 | 853 | +---o | | changeset: 12:86b91144a6e9 |
|
854 | 854 | | | |/ / parent: 1:6db2ef61d156 |
|
855 | 855 | | | | | parent: 9:7010c0af0a35 |
|
856 | 856 | | | | | user: test |
|
857 | 857 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
858 | 858 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
859 | 859 | | | | | |
|
860 | 860 | | o | | changeset: 11:832d76e6bdf2 |
|
861 | 861 | | |\ \ \ parent: 6:b105a072e251 |
|
862 | 862 | | | | | | parent: 10:74c64d036d72 |
|
863 | 863 | | | | | | user: test |
|
864 | 864 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
865 | 865 | | | | | | summary: (11) expand |
|
866 | 866 | | | | | | |
|
867 | 867 | | | o---+ changeset: 10:74c64d036d72 |
|
868 | 868 | | | | | | parent: 0:e6eb3150255d |
|
869 | 869 | | |/ / / parent: 6:b105a072e251 |
|
870 | 870 | | | | | user: test |
|
871 | 871 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
872 | 872 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
873 | 873 | | | | | |
|
874 | 874 | o | | | changeset: 9:7010c0af0a35 |
|
875 | 875 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
876 | 876 | | | | | | parent: 8:7a0b11f71937 |
|
877 | 877 | | | | | | user: test |
|
878 | 878 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
879 | 879 | | | | | | summary: (9) expand |
|
880 | 880 | | | | | | |
|
881 | 881 | | o-----+ changeset: 8:7a0b11f71937 |
|
882 | 882 | | | | | | parent: 0:e6eb3150255d |
|
883 | 883 | |/ / / / parent: 7:b632bb1b1224 |
|
884 | 884 | | | | | user: test |
|
885 | 885 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
886 | 886 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
887 | 887 | | | | | |
|
888 | 888 | o | | | changeset: 7:b632bb1b1224 |
|
889 | 889 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
890 | 890 | | | | | | parent: 5:4409d547b708 |
|
891 | 891 | | | | | | user: test |
|
892 | 892 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
893 | 893 | | | | | | summary: (7) expand |
|
894 | 894 | | | | | | |
|
895 | 895 | +---o | | changeset: 6:b105a072e251 |
|
896 | 896 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
897 | 897 | | | | | parent: 5:4409d547b708 |
|
898 | 898 | | | | | user: test |
|
899 | 899 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
900 | 900 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
901 | 901 | | | | | |
|
902 | 902 | | o | | changeset: 5:4409d547b708 |
|
903 | 903 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
904 | 904 | | | | | | parent: 4:26a8bac39d9f |
|
905 | 905 | | | | | | user: test |
|
906 | 906 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
907 | 907 | | | | | | summary: (5) expand |
|
908 | 908 | | | | | | |
|
909 | 909 | | | o | | changeset: 4:26a8bac39d9f |
|
910 | 910 | | |/|/ / parent: 1:6db2ef61d156 |
|
911 | 911 | | | | | parent: 3:27eef8ed80b4 |
|
912 | 912 | | | | | user: test |
|
913 | 913 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
914 | 914 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
915 | 915 | | | | | |
|
916 | 916 | | o | | changeset: 3:27eef8ed80b4 |
|
917 | 917 | |/ / / user: test |
|
918 | 918 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
919 | 919 | | | | summary: (3) collapse |
|
920 | 920 | | | | |
|
921 | 921 | o | | changeset: 2:3d9a33b8d1e1 |
|
922 | 922 | |/ / user: test |
|
923 | 923 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
924 | 924 | | | summary: (2) collapse |
|
925 | 925 | | | |
|
926 | 926 | o | changeset: 1:6db2ef61d156 |
|
927 | 927 | |/ user: test |
|
928 | 928 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
929 | 929 | | summary: (1) collapse |
|
930 | 930 | | |
|
931 | 931 | o changeset: 0:e6eb3150255d |
|
932 | 932 | user: test |
|
933 | 933 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
934 | 934 | summary: (0) root |
|
935 | 935 | |
|
936 | 936 | |
|
937 | 937 | |
|
938 | 938 | File glog per revset (only merges): |
|
939 | 939 | |
|
940 | 940 | $ hg log -G -r 'file("a")' -m |
|
941 | 941 | o changeset: 32:d06dffa21a31 |
|
942 | 942 | |\ parent: 27:886ed638191b |
|
943 | 943 | | | parent: 31:621d83e11f67 |
|
944 | 944 | | | user: test |
|
945 | 945 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
946 | 946 | | | summary: (32) expand |
|
947 | 947 | | | |
|
948 | 948 | o | changeset: 31:621d83e11f67 |
|
949 | 949 | |\| parent: 21:d42a756af44d |
|
950 | 950 | | | parent: 30:6e11cd4b648f |
|
951 | 951 | | | user: test |
|
952 | 952 | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
953 | 953 | | | summary: (31) expand |
|
954 | 954 | | | |
|
955 | 955 | o | changeset: 30:6e11cd4b648f |
|
956 | 956 | |\ \ parent: 28:44ecd0b9ae99 |
|
957 | 957 | | | | parent: 29:cd9bb2be7593 |
|
958 | 958 | | | | user: test |
|
959 | 959 | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
960 | 960 | | | | summary: (30) expand |
|
961 | 961 | | | | |
|
962 | 962 | o | | changeset: 28:44ecd0b9ae99 |
|
963 | 963 | |\ \ \ parent: 1:6db2ef61d156 |
|
964 | 964 | | | | | parent: 26:7f25b6c2f0b9 |
|
965 | 965 | | | | | user: test |
|
966 | 966 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
967 | 967 | | | | | summary: (28) merge zero known |
|
968 | 968 | | | | | |
|
969 | 969 | o | | | changeset: 26:7f25b6c2f0b9 |
|
970 | 970 | |\ \ \ \ parent: 18:1aa84d96232a |
|
971 | 971 | | | | | | parent: 25:91da8ed57247 |
|
972 | 972 | | | | | | user: test |
|
973 | 973 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
974 | 974 | | | | | | summary: (26) merge one known; far right |
|
975 | 975 | | | | | | |
|
976 | 976 | | o-----+ changeset: 25:91da8ed57247 |
|
977 | 977 | | | | | | parent: 21:d42a756af44d |
|
978 | 978 | | | | | | parent: 24:a9c19a3d96b7 |
|
979 | 979 | | | | | | user: test |
|
980 | 980 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
981 | 981 | | | | | | summary: (25) merge one known; far left |
|
982 | 982 | | | | | | |
|
983 | 983 | | o | | | changeset: 24:a9c19a3d96b7 |
|
984 | 984 | | |\ \ \ \ parent: 0:e6eb3150255d |
|
985 | 985 | | | | | | | parent: 23:a01cddf0766d |
|
986 | 986 | | | | | | | user: test |
|
987 | 987 | | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
988 | 988 | | | | | | | summary: (24) merge one known; immediate right |
|
989 | 989 | | | | | | | |
|
990 | 990 | | o---+ | | changeset: 23:a01cddf0766d |
|
991 | 991 | | | | | | | parent: 1:6db2ef61d156 |
|
992 | 992 | | | | | | | parent: 22:e0d9cccacb5d |
|
993 | 993 | | | | | | | user: test |
|
994 | 994 | | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
995 | 995 | | | | | | | summary: (23) merge one known; immediate left |
|
996 | 996 | | | | | | | |
|
997 | 997 | | o-------+ changeset: 22:e0d9cccacb5d |
|
998 | 998 | | | | | | | parent: 18:1aa84d96232a |
|
999 | 999 | |/ / / / / parent: 21:d42a756af44d |
|
1000 | 1000 | | | | | | user: test |
|
1001 | 1001 | | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
1002 | 1002 | | | | | | summary: (22) merge two known; one far left, one far right |
|
1003 | 1003 | | | | | | |
|
1004 | 1004 | | | | | o changeset: 21:d42a756af44d |
|
1005 | 1005 | | | | | |\ parent: 19:31ddc2c1573b |
|
1006 | 1006 | | | | | | | parent: 20:d30ed6450e32 |
|
1007 | 1007 | | | | | | | user: test |
|
1008 | 1008 | | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
1009 | 1009 | | | | | | | summary: (21) expand |
|
1010 | 1010 | | | | | | | |
|
1011 | 1011 | +-+-------o changeset: 20:d30ed6450e32 |
|
1012 | 1012 | | | | | | parent: 0:e6eb3150255d |
|
1013 | 1013 | | | | | | parent: 18:1aa84d96232a |
|
1014 | 1014 | | | | | | user: test |
|
1015 | 1015 | | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
1016 | 1016 | | | | | | summary: (20) merge two known; two far right |
|
1017 | 1017 | | | | | | |
|
1018 | 1018 | | | | | o changeset: 19:31ddc2c1573b |
|
1019 | 1019 | | | | | |\ parent: 15:1dda3f72782d |
|
1020 | 1020 | | | | | | | parent: 17:44765d7c06e0 |
|
1021 | 1021 | | | | | | | user: test |
|
1022 | 1022 | | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
1023 | 1023 | | | | | | | summary: (19) expand |
|
1024 | 1024 | | | | | | | |
|
1025 | 1025 | o---+---+ | changeset: 18:1aa84d96232a |
|
1026 | 1026 | | | | | | parent: 1:6db2ef61d156 |
|
1027 | 1027 | / / / / / parent: 15:1dda3f72782d |
|
1028 | 1028 | | | | | | user: test |
|
1029 | 1029 | | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
1030 | 1030 | | | | | | summary: (18) merge two known; two far left |
|
1031 | 1031 | | | | | | |
|
1032 | 1032 | | | | | o changeset: 17:44765d7c06e0 |
|
1033 | 1033 | | | | | |\ parent: 12:86b91144a6e9 |
|
1034 | 1034 | | | | | | | parent: 16:3677d192927d |
|
1035 | 1035 | | | | | | | user: test |
|
1036 | 1036 | | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
1037 | 1037 | | | | | | | summary: (17) expand |
|
1038 | 1038 | | | | | | | |
|
1039 | 1039 | +-+-------o changeset: 16:3677d192927d |
|
1040 | 1040 | | | | | | parent: 0:e6eb3150255d |
|
1041 | 1041 | | | | | | parent: 1:6db2ef61d156 |
|
1042 | 1042 | | | | | | user: test |
|
1043 | 1043 | | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
1044 | 1044 | | | | | | summary: (16) merge two known; one immediate right, one near right |
|
1045 | 1045 | | | | | | |
|
1046 | 1046 | | | | o | changeset: 15:1dda3f72782d |
|
1047 | 1047 | | | | |\ \ parent: 13:22d8966a97e3 |
|
1048 | 1048 | | | | | | | parent: 14:8eac370358ef |
|
1049 | 1049 | | | | | | | user: test |
|
1050 | 1050 | | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
1051 | 1051 | | | | | | | summary: (15) expand |
|
1052 | 1052 | | | | | | | |
|
1053 | 1053 | +-------o | changeset: 14:8eac370358ef |
|
1054 | 1054 | | | | | |/ parent: 0:e6eb3150255d |
|
1055 | 1055 | | | | | | parent: 12:86b91144a6e9 |
|
1056 | 1056 | | | | | | user: test |
|
1057 | 1057 | | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
1058 | 1058 | | | | | | summary: (14) merge two known; one immediate right, one far right |
|
1059 | 1059 | | | | | | |
|
1060 | 1060 | | | | o | changeset: 13:22d8966a97e3 |
|
1061 | 1061 | | | | |\ \ parent: 9:7010c0af0a35 |
|
1062 | 1062 | | | | | | | parent: 11:832d76e6bdf2 |
|
1063 | 1063 | | | | | | | user: test |
|
1064 | 1064 | | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
1065 | 1065 | | | | | | | summary: (13) expand |
|
1066 | 1066 | | | | | | | |
|
1067 | 1067 | | +---+---o changeset: 12:86b91144a6e9 |
|
1068 | 1068 | | | | | | parent: 1:6db2ef61d156 |
|
1069 | 1069 | | | | | | parent: 9:7010c0af0a35 |
|
1070 | 1070 | | | | | | user: test |
|
1071 | 1071 | | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
1072 | 1072 | | | | | | summary: (12) merge two known; one immediate right, one far left |
|
1073 | 1073 | | | | | | |
|
1074 | 1074 | | | | | o changeset: 11:832d76e6bdf2 |
|
1075 | 1075 | | | | | |\ parent: 6:b105a072e251 |
|
1076 | 1076 | | | | | | | parent: 10:74c64d036d72 |
|
1077 | 1077 | | | | | | | user: test |
|
1078 | 1078 | | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
1079 | 1079 | | | | | | | summary: (11) expand |
|
1080 | 1080 | | | | | | | |
|
1081 | 1081 | +---------o changeset: 10:74c64d036d72 |
|
1082 | 1082 | | | | | |/ parent: 0:e6eb3150255d |
|
1083 | 1083 | | | | | | parent: 6:b105a072e251 |
|
1084 | 1084 | | | | | | user: test |
|
1085 | 1085 | | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
1086 | 1086 | | | | | | summary: (10) merge two known; one immediate left, one near right |
|
1087 | 1087 | | | | | | |
|
1088 | 1088 | | | | o | changeset: 9:7010c0af0a35 |
|
1089 | 1089 | | | | |\ \ parent: 7:b632bb1b1224 |
|
1090 | 1090 | | | | | | | parent: 8:7a0b11f71937 |
|
1091 | 1091 | | | | | | | user: test |
|
1092 | 1092 | | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1093 | 1093 | | | | | | | summary: (9) expand |
|
1094 | 1094 | | | | | | | |
|
1095 | 1095 | +-------o | changeset: 8:7a0b11f71937 |
|
1096 | 1096 | | | | |/ / parent: 0:e6eb3150255d |
|
1097 | 1097 | | | | | | parent: 7:b632bb1b1224 |
|
1098 | 1098 | | | | | | user: test |
|
1099 | 1099 | | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1100 | 1100 | | | | | | summary: (8) merge two known; one immediate left, one far right |
|
1101 | 1101 | | | | | | |
|
1102 | 1102 | | | | o | changeset: 7:b632bb1b1224 |
|
1103 | 1103 | | | | |\ \ parent: 2:3d9a33b8d1e1 |
|
1104 | 1104 | | | | | | | parent: 5:4409d547b708 |
|
1105 | 1105 | | | | | | | user: test |
|
1106 | 1106 | | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
1107 | 1107 | | | | | | | summary: (7) expand |
|
1108 | 1108 | | | | | | | |
|
1109 | 1109 | | | | +---o changeset: 6:b105a072e251 |
|
1110 | 1110 | | | | | |/ parent: 2:3d9a33b8d1e1 |
|
1111 | 1111 | | | | | | parent: 5:4409d547b708 |
|
1112 | 1112 | | | | | | user: test |
|
1113 | 1113 | | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
1114 | 1114 | | | | | | summary: (6) merge two known; one immediate left, one far left |
|
1115 | 1115 | | | | | | |
|
1116 | 1116 | | | | o | changeset: 5:4409d547b708 |
|
1117 | 1117 | | | | |\ \ parent: 3:27eef8ed80b4 |
|
1118 | 1118 | | | | | | | parent: 4:26a8bac39d9f |
|
1119 | 1119 | | | | | | | user: test |
|
1120 | 1120 | | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
1121 | 1121 | | | | | | | summary: (5) expand |
|
1122 | 1122 | | | | | | | |
|
1123 | 1123 | | +---o | | changeset: 4:26a8bac39d9f |
|
1124 | 1124 | | | | |/ / parent: 1:6db2ef61d156 |
|
1125 | 1125 | | | | | | parent: 3:27eef8ed80b4 |
|
1126 | 1126 | | | | | | user: test |
|
1127 | 1127 | | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
1128 | 1128 | | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
1129 | 1129 | | | | | | |
|
1130 | 1130 | |
|
1131 | 1131 | |
|
1132 | 1132 | Empty revision range - display nothing: |
|
1133 | 1133 | $ hg log -G -r 1..0 |
|
1134 | 1134 | |
|
1135 | 1135 | $ cd .. |
|
1136 | 1136 | |
|
1137 | 1137 | #if no-outer-repo |
|
1138 | 1138 | |
|
1139 | 1139 | From outer space: |
|
1140 | 1140 | $ hg log -G -l1 repo |
|
1141 | 1141 | @ changeset: 34:fea3ac5810e0 |
|
1142 | 1142 | | tag: tip |
|
1143 | 1143 | | parent: 32:d06dffa21a31 |
|
1144 | 1144 | | user: test |
|
1145 | 1145 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1146 | 1146 | | summary: (34) head |
|
1147 | 1147 | | |
|
1148 | 1148 | $ hg log -G -l1 repo/a |
|
1149 | 1149 | @ changeset: 34:fea3ac5810e0 |
|
1150 | 1150 | | tag: tip |
|
1151 | 1151 | | parent: 32:d06dffa21a31 |
|
1152 | 1152 | | user: test |
|
1153 | 1153 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1154 | 1154 | | summary: (34) head |
|
1155 | 1155 | | |
|
1156 | 1156 | $ hg log -G -l1 repo/missing |
|
1157 | 1157 | |
|
1158 | 1158 | #endif |
|
1159 | 1159 | |
|
1160 | 1160 | File log with revs != cset revs: |
|
1161 | 1161 | $ hg init flog |
|
1162 | 1162 | $ cd flog |
|
1163 | 1163 | $ echo one >one |
|
1164 | 1164 | $ hg add one |
|
1165 | 1165 | $ hg commit -mone |
|
1166 | 1166 | $ echo two >two |
|
1167 | 1167 | $ hg add two |
|
1168 | 1168 | $ hg commit -mtwo |
|
1169 | 1169 | $ echo more >two |
|
1170 | 1170 | $ hg commit -mmore |
|
1171 | 1171 | $ hg log -G two |
|
1172 | 1172 | @ changeset: 2:12c28321755b |
|
1173 | 1173 | | tag: tip |
|
1174 | 1174 | | user: test |
|
1175 | 1175 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1176 | 1176 | | summary: more |
|
1177 | 1177 | | |
|
1178 | 1178 | o changeset: 1:5ac72c0599bf |
|
1179 | 1179 | | user: test |
|
1180 | 1180 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1181 | 1181 | | summary: two |
|
1182 | 1182 | | |
|
1183 | 1183 | |
|
1184 | 1184 | Issue1896: File log with explicit style |
|
1185 | 1185 | $ hg log -G --style=default one |
|
1186 | 1186 | o changeset: 0:3d578b4a1f53 |
|
1187 | 1187 | user: test |
|
1188 | 1188 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1189 | 1189 | summary: one |
|
1190 | 1190 | |
|
1191 | 1191 | Issue2395: glog --style header and footer |
|
1192 | 1192 | $ hg log -G --style=xml one |
|
1193 | 1193 | <?xml version="1.0"?> |
|
1194 | 1194 | <log> |
|
1195 | 1195 | o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> |
|
1196 | 1196 | <author email="test">test</author> |
|
1197 | 1197 | <date>1970-01-01T00:00:00+00:00</date> |
|
1198 | 1198 | <msg xml:space="preserve">one</msg> |
|
1199 | 1199 | </logentry> |
|
1200 | 1200 | </log> |
|
1201 | 1201 | |
|
1202 | 1202 | $ cd .. |
|
1203 | 1203 | |
|
1204 | 1204 | Incoming and outgoing: |
|
1205 | 1205 | |
|
1206 | 1206 | $ hg clone -U -r31 repo repo2 |
|
1207 | 1207 | adding changesets |
|
1208 | 1208 | adding manifests |
|
1209 | 1209 | adding file changes |
|
1210 | 1210 | added 31 changesets with 31 changes to 1 files |
|
1211 | 1211 | $ cd repo2 |
|
1212 | 1212 | |
|
1213 | 1213 | $ hg incoming --graph ../repo |
|
1214 | 1214 | comparing with ../repo |
|
1215 | 1215 | searching for changes |
|
1216 | 1216 | o changeset: 34:fea3ac5810e0 |
|
1217 | 1217 | | tag: tip |
|
1218 | 1218 | | parent: 32:d06dffa21a31 |
|
1219 | 1219 | | user: test |
|
1220 | 1220 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1221 | 1221 | | summary: (34) head |
|
1222 | 1222 | | |
|
1223 | 1223 | | o changeset: 33:68608f5145f9 |
|
1224 | 1224 | | parent: 18:1aa84d96232a |
|
1225 | 1225 | | user: test |
|
1226 | 1226 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1227 | 1227 | | summary: (33) head |
|
1228 | 1228 | | |
|
1229 | 1229 | o changeset: 32:d06dffa21a31 |
|
1230 | 1230 | | parent: 27:886ed638191b |
|
1231 | 1231 | | parent: 31:621d83e11f67 |
|
1232 | 1232 | | user: test |
|
1233 | 1233 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1234 | 1234 | | summary: (32) expand |
|
1235 | 1235 | | |
|
1236 | 1236 | o changeset: 27:886ed638191b |
|
1237 | 1237 | parent: 21:d42a756af44d |
|
1238 | 1238 | user: test |
|
1239 | 1239 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1240 | 1240 | summary: (27) collapse |
|
1241 | 1241 | |
|
1242 | 1242 | $ cd .. |
|
1243 | 1243 | |
|
1244 | 1244 | $ hg -R repo outgoing --graph repo2 |
|
1245 | 1245 | comparing with repo2 |
|
1246 | 1246 | searching for changes |
|
1247 | 1247 | @ changeset: 34:fea3ac5810e0 |
|
1248 | 1248 | | tag: tip |
|
1249 | 1249 | | parent: 32:d06dffa21a31 |
|
1250 | 1250 | | user: test |
|
1251 | 1251 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1252 | 1252 | | summary: (34) head |
|
1253 | 1253 | | |
|
1254 | 1254 | | o changeset: 33:68608f5145f9 |
|
1255 | 1255 | | parent: 18:1aa84d96232a |
|
1256 | 1256 | | user: test |
|
1257 | 1257 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1258 | 1258 | | summary: (33) head |
|
1259 | 1259 | | |
|
1260 | 1260 | o changeset: 32:d06dffa21a31 |
|
1261 | 1261 | | parent: 27:886ed638191b |
|
1262 | 1262 | | parent: 31:621d83e11f67 |
|
1263 | 1263 | | user: test |
|
1264 | 1264 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1265 | 1265 | | summary: (32) expand |
|
1266 | 1266 | | |
|
1267 | 1267 | o changeset: 27:886ed638191b |
|
1268 | 1268 | parent: 21:d42a756af44d |
|
1269 | 1269 | user: test |
|
1270 | 1270 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1271 | 1271 | summary: (27) collapse |
|
1272 | 1272 | |
|
1273 | 1273 | |
|
1274 | 1274 | File + limit with revs != cset revs: |
|
1275 | 1275 | $ cd repo |
|
1276 | 1276 | $ touch b |
|
1277 | 1277 | $ hg ci -Aqm0 |
|
1278 | 1278 | $ hg log -G -l2 a |
|
1279 | 1279 | o changeset: 34:fea3ac5810e0 |
|
1280 | 1280 | | parent: 32:d06dffa21a31 |
|
1281 | 1281 | | user: test |
|
1282 | 1282 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1283 | 1283 | | summary: (34) head |
|
1284 | 1284 | | |
|
1285 | 1285 | | o changeset: 33:68608f5145f9 |
|
1286 | 1286 | | | parent: 18:1aa84d96232a |
|
1287 | 1287 | | | user: test |
|
1288 | 1288 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1289 | 1289 | | | summary: (33) head |
|
1290 | 1290 | | | |
|
1291 | 1291 | |
|
1292 | 1292 | File + limit + -ra:b, (b - a) < limit: |
|
1293 | 1293 | $ hg log -G -l3000 -r32:tip a |
|
1294 | 1294 | o changeset: 34:fea3ac5810e0 |
|
1295 | 1295 | | parent: 32:d06dffa21a31 |
|
1296 | 1296 | | user: test |
|
1297 | 1297 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1298 | 1298 | | summary: (34) head |
|
1299 | 1299 | | |
|
1300 | 1300 | | o changeset: 33:68608f5145f9 |
|
1301 | 1301 | | | parent: 18:1aa84d96232a |
|
1302 | 1302 | | | user: test |
|
1303 | 1303 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1304 | 1304 | | | summary: (33) head |
|
1305 | 1305 | | | |
|
1306 | 1306 | o | changeset: 32:d06dffa21a31 |
|
1307 | 1307 | |\ \ parent: 27:886ed638191b |
|
1308 | 1308 | | | | parent: 31:621d83e11f67 |
|
1309 | 1309 | | | | user: test |
|
1310 | 1310 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1311 | 1311 | | | | summary: (32) expand |
|
1312 | 1312 | | | | |
|
1313 | 1313 | |
|
1314 | 1314 | Point out a common and an uncommon unshown parent |
|
1315 | 1315 | |
|
1316 | 1316 | $ hg log -G -r 'rev(8) or rev(9)' |
|
1317 | 1317 | o changeset: 9:7010c0af0a35 |
|
1318 | 1318 | |\ parent: 7:b632bb1b1224 |
|
1319 | 1319 | | | parent: 8:7a0b11f71937 |
|
1320 | 1320 | | | user: test |
|
1321 | 1321 | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1322 | 1322 | | | summary: (9) expand |
|
1323 | 1323 | | | |
|
1324 | 1324 | o | changeset: 8:7a0b11f71937 |
|
1325 | 1325 | |\| parent: 0:e6eb3150255d |
|
1326 | 1326 | | | parent: 7:b632bb1b1224 |
|
1327 | 1327 | | | user: test |
|
1328 | 1328 | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1329 | 1329 | | | summary: (8) merge two known; one immediate left, one far right |
|
1330 | 1330 | | | |
|
1331 | 1331 | |
|
1332 | 1332 | File + limit + -ra:b, b < tip: |
|
1333 | 1333 | |
|
1334 | 1334 | $ hg log -G -l1 -r32:34 a |
|
1335 | 1335 | o changeset: 34:fea3ac5810e0 |
|
1336 | 1336 | | parent: 32:d06dffa21a31 |
|
1337 | 1337 | | user: test |
|
1338 | 1338 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1339 | 1339 | | summary: (34) head |
|
1340 | 1340 | | |
|
1341 | 1341 | |
|
1342 | 1342 | file(File) + limit + -ra:b, b < tip: |
|
1343 | 1343 | |
|
1344 | 1344 | $ hg log -G -l1 -r32:34 -r 'file("a")' |
|
1345 | 1345 | o changeset: 34:fea3ac5810e0 |
|
1346 | 1346 | | parent: 32:d06dffa21a31 |
|
1347 | 1347 | | user: test |
|
1348 | 1348 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1349 | 1349 | | summary: (34) head |
|
1350 | 1350 | | |
|
1351 | 1351 | |
|
1352 | 1352 | limit(file(File) and a::b), b < tip: |
|
1353 | 1353 | |
|
1354 | 1354 | $ hg log -G -r 'limit(file("a") and 32::34, 1)' |
|
1355 | 1355 | o changeset: 32:d06dffa21a31 |
|
1356 | 1356 | |\ parent: 27:886ed638191b |
|
1357 | 1357 | | | parent: 31:621d83e11f67 |
|
1358 | 1358 | | | user: test |
|
1359 | 1359 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1360 | 1360 | | | summary: (32) expand |
|
1361 | 1361 | | | |
|
1362 | 1362 | |
|
1363 | 1363 | File + limit + -ra:b, b < tip: |
|
1364 | 1364 | |
|
1365 | 1365 | $ hg log -G -r 'limit(file("a") and 34::32, 1)' |
|
1366 | 1366 | |
|
1367 | 1367 | File + limit + -ra:b, b < tip, (b - a) < limit: |
|
1368 | 1368 | |
|
1369 | 1369 | $ hg log -G -l10 -r33:34 a |
|
1370 | 1370 | o changeset: 34:fea3ac5810e0 |
|
1371 | 1371 | | parent: 32:d06dffa21a31 |
|
1372 | 1372 | | user: test |
|
1373 | 1373 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1374 | 1374 | | summary: (34) head |
|
1375 | 1375 | | |
|
1376 | 1376 | | o changeset: 33:68608f5145f9 |
|
1377 | 1377 | | | parent: 18:1aa84d96232a |
|
1378 | 1378 | | | user: test |
|
1379 | 1379 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1380 | 1380 | | | summary: (33) head |
|
1381 | 1381 | | | |
|
1382 | 1382 | |
|
1383 | 1383 | Do not crash or produce strange graphs if history is buggy |
|
1384 | 1384 | |
|
1385 | 1385 | $ hg branch branch |
|
1386 | 1386 | marked working directory as branch branch |
|
1387 | 1387 | (branches are permanent and global, did you want a bookmark?) |
|
1388 | 1388 | $ commit 36 "buggy merge: identical parents" 35 35 |
|
1389 | 1389 | $ hg log -G -l5 |
|
1390 | 1390 | @ changeset: 36:08a19a744424 |
|
1391 | 1391 | | branch: branch |
|
1392 | 1392 | | tag: tip |
|
1393 | 1393 | | parent: 35:9159c3644c5e |
|
1394 | 1394 | | parent: 35:9159c3644c5e |
|
1395 | 1395 | | user: test |
|
1396 | 1396 | | date: Thu Jan 01 00:00:36 1970 +0000 |
|
1397 | 1397 | | summary: (36) buggy merge: identical parents |
|
1398 | 1398 | | |
|
1399 | 1399 | o changeset: 35:9159c3644c5e |
|
1400 | 1400 | | user: test |
|
1401 | 1401 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1402 | 1402 | | summary: 0 |
|
1403 | 1403 | | |
|
1404 | 1404 | o changeset: 34:fea3ac5810e0 |
|
1405 | 1405 | | parent: 32:d06dffa21a31 |
|
1406 | 1406 | | user: test |
|
1407 | 1407 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1408 | 1408 | | summary: (34) head |
|
1409 | 1409 | | |
|
1410 | 1410 | | o changeset: 33:68608f5145f9 |
|
1411 | 1411 | | | parent: 18:1aa84d96232a |
|
1412 | 1412 | | | user: test |
|
1413 | 1413 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1414 | 1414 | | | summary: (33) head |
|
1415 | 1415 | | | |
|
1416 | 1416 | o | changeset: 32:d06dffa21a31 |
|
1417 | 1417 | |\ \ parent: 27:886ed638191b |
|
1418 | 1418 | | | | parent: 31:621d83e11f67 |
|
1419 | 1419 | | | | user: test |
|
1420 | 1420 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1421 | 1421 | | | | summary: (32) expand |
|
1422 | 1422 | | | | |
|
1423 | 1423 | |
|
1424 | 1424 | Test log -G options |
|
1425 | 1425 | |
|
1426 | 1426 | $ testlog() { |
|
1427 | 1427 | > hg log -G --print-revset "$@" |
|
1428 | 1428 | > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \ |
|
1429 | 1429 | > | sed 's/.*nodetag/nodetag/' > log.nodes |
|
1430 | 1430 | > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \ |
|
1431 | 1431 | > | sed 's/.*nodetag/nodetag/' > glog.nodes |
|
1432 | 1432 | > diff -u log.nodes glog.nodes | grep '^[-+@ ]' || : |
|
1433 | 1433 | > } |
|
1434 | 1434 | |
|
1435 | 1435 | glog always reorders nodes which explains the difference with log |
|
1436 | 1436 | |
|
1437 | 1437 | $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 |
|
1438 | 1438 | ['27', '25', '21', '34', '32', '31'] |
|
1439 | 1439 | [] |
|
1440 | 1440 | --- log.nodes * (glob) |
|
1441 | 1441 | +++ glog.nodes * (glob) |
|
1442 | 1442 | @@ -1,6 +1,6 @@ |
|
1443 | 1443 | -nodetag 27 |
|
1444 | 1444 | -nodetag 25 |
|
1445 | 1445 | -nodetag 21 |
|
1446 | 1446 | nodetag 34 |
|
1447 | 1447 | nodetag 32 |
|
1448 | 1448 | nodetag 31 |
|
1449 | 1449 | +nodetag 27 |
|
1450 | 1450 | +nodetag 25 |
|
1451 | 1451 | +nodetag 21 |
|
1452 | 1452 | $ testlog -u test -u not-a-user |
|
1453 | 1453 | [] |
|
1454 | 1454 | (group |
|
1455 | 1455 | (group |
|
1456 | 1456 | (or |
|
1457 | 1457 | (func |
|
1458 | 1458 | ('symbol', 'user') |
|
1459 | 1459 | ('string', 'test')) |
|
1460 | 1460 | (func |
|
1461 | 1461 | ('symbol', 'user') |
|
1462 | 1462 | ('string', 'not-a-user'))))) |
|
1463 | 1463 | $ testlog -b not-a-branch |
|
1464 | 1464 | abort: unknown revision 'not-a-branch'! |
|
1465 | 1465 | abort: unknown revision 'not-a-branch'! |
|
1466 | 1466 | abort: unknown revision 'not-a-branch'! |
|
1467 | 1467 | $ testlog -b 35 -b 36 --only-branch branch |
|
1468 | 1468 | [] |
|
1469 | 1469 | (group |
|
1470 | 1470 | (group |
|
1471 | 1471 | (or |
|
1472 | 1472 | (or |
|
1473 | 1473 | (func |
|
1474 | 1474 | ('symbol', 'branch') |
|
1475 | 1475 | ('string', 'default')) |
|
1476 | 1476 | (func |
|
1477 | 1477 | ('symbol', 'branch') |
|
1478 | 1478 | ('string', 'branch'))) |
|
1479 | 1479 | (func |
|
1480 | 1480 | ('symbol', 'branch') |
|
1481 | 1481 | ('string', 'branch'))))) |
|
1482 | 1482 | $ testlog -k expand -k merge |
|
1483 | 1483 | [] |
|
1484 | 1484 | (group |
|
1485 | 1485 | (group |
|
1486 | 1486 | (or |
|
1487 | 1487 | (func |
|
1488 | 1488 | ('symbol', 'keyword') |
|
1489 | 1489 | ('string', 'expand')) |
|
1490 | 1490 | (func |
|
1491 | 1491 | ('symbol', 'keyword') |
|
1492 | 1492 | ('string', 'merge'))))) |
|
1493 | 1493 | $ testlog --only-merges |
|
1494 | 1494 | [] |
|
1495 | 1495 | (group |
|
1496 | 1496 | (func |
|
1497 | 1497 | ('symbol', 'merge') |
|
1498 | 1498 | None)) |
|
1499 | 1499 | $ testlog --no-merges |
|
1500 | 1500 | [] |
|
1501 | 1501 | (group |
|
1502 | 1502 | (not |
|
1503 | 1503 | (func |
|
1504 | 1504 | ('symbol', 'merge') |
|
1505 | 1505 | None))) |
|
1506 | 1506 | $ testlog --date '2 0 to 4 0' |
|
1507 | 1507 | [] |
|
1508 | 1508 | (group |
|
1509 | 1509 | (func |
|
1510 | 1510 | ('symbol', 'date') |
|
1511 | 1511 | ('string', '2 0 to 4 0'))) |
|
1512 | 1512 | $ hg log -G -d 'brace ) in a date' |
|
1513 | 1513 | abort: invalid date: 'brace ) in a date' |
|
1514 | 1514 | [255] |
|
1515 | 1515 | $ testlog --prune 31 --prune 32 |
|
1516 | 1516 | [] |
|
1517 | 1517 | (group |
|
1518 | 1518 | (group |
|
1519 | 1519 | (and |
|
1520 | 1520 | (not |
|
1521 | 1521 | (group |
|
1522 | 1522 | (or |
|
1523 | 1523 | ('string', '31') |
|
1524 | 1524 | (func |
|
1525 | 1525 | ('symbol', 'ancestors') |
|
1526 | 1526 | ('string', '31'))))) |
|
1527 | 1527 | (not |
|
1528 | 1528 | (group |
|
1529 | 1529 | (or |
|
1530 | 1530 | ('string', '32') |
|
1531 | 1531 | (func |
|
1532 | 1532 | ('symbol', 'ancestors') |
|
1533 | 1533 | ('string', '32')))))))) |
|
1534 | 1534 | |
|
1535 | 1535 | Dedicated repo for --follow and paths filtering. The g is crafted to |
|
1536 | 1536 | have 2 filelog topological heads in a linear changeset graph. |
|
1537 | 1537 | |
|
1538 | 1538 | $ cd .. |
|
1539 | 1539 | $ hg init follow |
|
1540 | 1540 | $ cd follow |
|
1541 | 1541 | $ testlog --follow |
|
1542 | 1542 | [] |
|
1543 | 1543 | [] |
|
1544 | 1544 | $ echo a > a |
|
1545 | 1545 | $ echo aa > aa |
|
1546 | 1546 | $ echo f > f |
|
1547 | 1547 | $ hg ci -Am "add a" a aa f |
|
1548 | 1548 | $ hg cp a b |
|
1549 | 1549 | $ hg cp f g |
|
1550 | 1550 | $ hg ci -m "copy a b" |
|
1551 | 1551 | $ mkdir dir |
|
1552 | 1552 | $ hg mv b dir |
|
1553 | 1553 | $ echo g >> g |
|
1554 | 1554 | $ echo f >> f |
|
1555 | 1555 | $ hg ci -m "mv b dir/b" |
|
1556 | 1556 | $ hg mv a b |
|
1557 | 1557 | $ hg cp -f f g |
|
1558 | 1558 | $ echo a > d |
|
1559 | 1559 | $ hg add d |
|
1560 | 1560 | $ hg ci -m "mv a b; add d" |
|
1561 | 1561 | $ hg mv dir/b e |
|
1562 | 1562 | $ hg ci -m "mv dir/b e" |
|
1563 | 1563 | $ hg log -G --template '({rev}) {desc|firstline}\n' |
|
1564 | 1564 | @ (4) mv dir/b e |
|
1565 | 1565 | | |
|
1566 | 1566 | o (3) mv a b; add d |
|
1567 | 1567 | | |
|
1568 | 1568 | o (2) mv b dir/b |
|
1569 | 1569 | | |
|
1570 | 1570 | o (1) copy a b |
|
1571 | 1571 | | |
|
1572 | 1572 | o (0) add a |
|
1573 | 1573 | |
|
1574 | 1574 | |
|
1575 | 1575 | $ testlog a |
|
1576 | 1576 | [] |
|
1577 | 1577 | (group |
|
1578 | 1578 | (group |
|
1579 | 1579 | (func |
|
1580 | 1580 | ('symbol', 'filelog') |
|
1581 | 1581 | ('string', 'a')))) |
|
1582 | 1582 | $ testlog a b |
|
1583 | 1583 | [] |
|
1584 | 1584 | (group |
|
1585 | 1585 | (group |
|
1586 | 1586 | (or |
|
1587 | 1587 | (func |
|
1588 | 1588 | ('symbol', 'filelog') |
|
1589 | 1589 | ('string', 'a')) |
|
1590 | 1590 | (func |
|
1591 | 1591 | ('symbol', 'filelog') |
|
1592 | 1592 | ('string', 'b'))))) |
|
1593 | 1593 | |
|
1594 | 1594 | Test falling back to slow path for non-existing files |
|
1595 | 1595 | |
|
1596 | 1596 | $ testlog a c |
|
1597 | 1597 | [] |
|
1598 | 1598 | (group |
|
1599 | 1599 | (func |
|
1600 | 1600 | ('symbol', '_matchfiles') |
|
1601 | 1601 | (list |
|
1602 | 1602 | (list |
|
1603 | 1603 | (list |
|
1604 | 1604 | ('string', 'r:') |
|
1605 | 1605 | ('string', 'd:relpath')) |
|
1606 | 1606 | ('string', 'p:a')) |
|
1607 | 1607 | ('string', 'p:c')))) |
|
1608 | 1608 | |
|
1609 | 1609 | Test multiple --include/--exclude/paths |
|
1610 | 1610 | |
|
1611 | 1611 | $ testlog --include a --include e --exclude b --exclude e a e |
|
1612 | 1612 | [] |
|
1613 | 1613 | (group |
|
1614 | 1614 | (func |
|
1615 | 1615 | ('symbol', '_matchfiles') |
|
1616 | 1616 | (list |
|
1617 | 1617 | (list |
|
1618 | 1618 | (list |
|
1619 | 1619 | (list |
|
1620 | 1620 | (list |
|
1621 | 1621 | (list |
|
1622 | 1622 | (list |
|
1623 | 1623 | ('string', 'r:') |
|
1624 | 1624 | ('string', 'd:relpath')) |
|
1625 | 1625 | ('string', 'p:a')) |
|
1626 | 1626 | ('string', 'p:e')) |
|
1627 | 1627 | ('string', 'i:a')) |
|
1628 | 1628 | ('string', 'i:e')) |
|
1629 | 1629 | ('string', 'x:b')) |
|
1630 | 1630 | ('string', 'x:e')))) |
|
1631 | 1631 | |
|
1632 | 1632 | Test glob expansion of pats |
|
1633 | 1633 | |
|
1634 | 1634 | $ expandglobs=`python -c "import mercurial.util; \ |
|
1635 | 1635 | > print mercurial.util.expandglobs and 'true' or 'false'"` |
|
1636 | 1636 | $ if [ $expandglobs = "true" ]; then |
|
1637 | 1637 | > testlog 'a*'; |
|
1638 | 1638 | > else |
|
1639 | 1639 | > testlog a*; |
|
1640 | 1640 | > fi; |
|
1641 | 1641 | [] |
|
1642 | 1642 | (group |
|
1643 | 1643 | (group |
|
1644 | 1644 | (func |
|
1645 | 1645 | ('symbol', 'filelog') |
|
1646 | 1646 | ('string', 'aa')))) |
|
1647 | 1647 | |
|
1648 | Test --follow on a directory | |
|
1648 | Test --follow on a non-existent directory | |
|
1649 | 1649 | |
|
1650 | 1650 | $ testlog -f dir |
|
1651 | 1651 | abort: cannot follow file not in parent revision: "dir" |
|
1652 | 1652 | abort: cannot follow file not in parent revision: "dir" |
|
1653 | 1653 | abort: cannot follow file not in parent revision: "dir" |
|
1654 | 1654 | |
|
1655 | Test --follow on a directory | |
|
1656 | ||
|
1657 | $ hg up -q '.^' | |
|
1658 | $ testlog -f dir | |
|
1659 | [] | |
|
1660 | (group | |
|
1661 | (func | |
|
1662 | ('symbol', '_matchfiles') | |
|
1663 | (list | |
|
1664 | (list | |
|
1665 | ('string', 'r:') | |
|
1666 | ('string', 'd:relpath')) | |
|
1667 | ('string', 'p:dir')))) | |
|
1668 | $ hg up -q tip | |
|
1669 | ||
|
1655 | 1670 | Test --follow on file not in parent revision |
|
1656 | 1671 | |
|
1657 | 1672 | $ testlog -f a |
|
1658 | 1673 | abort: cannot follow file not in parent revision: "a" |
|
1659 | 1674 | abort: cannot follow file not in parent revision: "a" |
|
1660 | 1675 | abort: cannot follow file not in parent revision: "a" |
|
1661 | 1676 | |
|
1662 | 1677 | Test --follow and patterns |
|
1663 | 1678 | |
|
1664 | 1679 | $ testlog -f 'glob:*' |
|
1665 | abort: can only follow copies/renames for explicit filenames | |
|
1666 | abort: can only follow copies/renames for explicit filenames | |
|
1667 | abort: can only follow copies/renames for explicit filenames | |
|
1680 | [] | |
|
1681 | (group | |
|
1682 | (func | |
|
1683 | ('symbol', '_matchfiles') | |
|
1684 | (list | |
|
1685 | (list | |
|
1686 | ('string', 'r:') | |
|
1687 | ('string', 'd:relpath')) | |
|
1688 | ('string', 'p:glob:*')))) | |
|
1668 | 1689 | |
|
1669 | 1690 | Test --follow on a single rename |
|
1670 | 1691 | |
|
1671 | 1692 | $ hg up -q 2 |
|
1672 | 1693 | $ testlog -f a |
|
1673 | 1694 | [] |
|
1674 | 1695 | (group |
|
1675 | 1696 | (group |
|
1676 | 1697 | (func |
|
1677 | 1698 | ('symbol', 'follow') |
|
1678 | 1699 | ('string', 'a')))) |
|
1679 | 1700 | |
|
1680 | 1701 | Test --follow and multiple renames |
|
1681 | 1702 | |
|
1682 | 1703 | $ hg up -q tip |
|
1683 | 1704 | $ testlog -f e |
|
1684 | 1705 | [] |
|
1685 | 1706 | (group |
|
1686 | 1707 | (group |
|
1687 | 1708 | (func |
|
1688 | 1709 | ('symbol', 'follow') |
|
1689 | 1710 | ('string', 'e')))) |
|
1690 | 1711 | |
|
1691 | 1712 | Test --follow and multiple filelog heads |
|
1692 | 1713 | |
|
1693 | 1714 | $ hg up -q 2 |
|
1694 | 1715 | $ testlog -f g |
|
1695 | 1716 | [] |
|
1696 | 1717 | (group |
|
1697 | 1718 | (group |
|
1698 | 1719 | (func |
|
1699 | 1720 | ('symbol', 'follow') |
|
1700 | 1721 | ('string', 'g')))) |
|
1701 | 1722 | $ cat log.nodes |
|
1702 | 1723 | nodetag 2 |
|
1703 | 1724 | nodetag 1 |
|
1704 | 1725 | nodetag 0 |
|
1705 | 1726 | $ hg up -q tip |
|
1706 | 1727 | $ testlog -f g |
|
1707 | 1728 | [] |
|
1708 | 1729 | (group |
|
1709 | 1730 | (group |
|
1710 | 1731 | (func |
|
1711 | 1732 | ('symbol', 'follow') |
|
1712 | 1733 | ('string', 'g')))) |
|
1713 | 1734 | $ cat log.nodes |
|
1714 | 1735 | nodetag 3 |
|
1715 | 1736 | nodetag 2 |
|
1716 | 1737 | nodetag 0 |
|
1717 | 1738 | |
|
1718 | 1739 | Test --follow and multiple files |
|
1719 | 1740 | |
|
1720 | 1741 | $ testlog -f g e |
|
1721 | 1742 | [] |
|
1722 | 1743 | (group |
|
1723 | 1744 | (group |
|
1724 | 1745 | (or |
|
1725 | 1746 | (func |
|
1726 | 1747 | ('symbol', 'follow') |
|
1727 | 1748 | ('string', 'g')) |
|
1728 | 1749 | (func |
|
1729 | 1750 | ('symbol', 'follow') |
|
1730 | 1751 | ('string', 'e'))))) |
|
1731 | 1752 | $ cat log.nodes |
|
1732 | 1753 | nodetag 4 |
|
1733 | 1754 | nodetag 3 |
|
1734 | 1755 | nodetag 2 |
|
1735 | 1756 | nodetag 1 |
|
1736 | 1757 | nodetag 0 |
|
1737 | 1758 | |
|
1738 | 1759 | Test --follow-first |
|
1739 | 1760 | |
|
1740 | 1761 | $ hg up -q 3 |
|
1741 | 1762 | $ echo ee > e |
|
1742 | 1763 | $ hg ci -Am "add another e" e |
|
1743 | 1764 | created new head |
|
1744 | 1765 | $ hg merge --tool internal:other 4 |
|
1745 | 1766 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
1746 | 1767 | (branch merge, don't forget to commit) |
|
1747 | 1768 | $ echo merge > e |
|
1748 | 1769 | $ hg ci -m "merge 5 and 4" |
|
1749 | 1770 | $ testlog --follow-first |
|
1750 | 1771 | [] |
|
1751 | 1772 | (group |
|
1752 | 1773 | (func |
|
1753 | 1774 | ('symbol', '_firstancestors') |
|
1754 | 1775 | ('symbol', '6'))) |
|
1755 | 1776 | |
|
1756 | 1777 | Cannot compare with log --follow-first FILE as it never worked |
|
1757 | 1778 | |
|
1758 | 1779 | $ hg log -G --print-revset --follow-first e |
|
1759 | 1780 | [] |
|
1760 | 1781 | (group |
|
1761 | 1782 | (group |
|
1762 | 1783 | (func |
|
1763 | 1784 | ('symbol', '_followfirst') |
|
1764 | 1785 | ('string', 'e')))) |
|
1765 | 1786 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
|
1766 | 1787 | @ 6 merge 5 and 4 |
|
1767 | 1788 | |\ |
|
1768 | 1789 | o | 5 add another e |
|
1769 | 1790 | | | |
|
1770 | 1791 | |
|
1771 | 1792 | Test --copies |
|
1772 | 1793 | |
|
1773 | 1794 | $ hg log -G --copies --template "{rev} {desc|firstline} \ |
|
1774 | 1795 | > copies: {file_copies_switch}\n" |
|
1775 | 1796 | @ 6 merge 5 and 4 copies: |
|
1776 | 1797 | |\ |
|
1777 | 1798 | | o 5 add another e copies: |
|
1778 | 1799 | | | |
|
1779 | 1800 | o | 4 mv dir/b e copies: e (dir/b) |
|
1780 | 1801 | |/ |
|
1781 | 1802 | o 3 mv a b; add d copies: b (a)g (f) |
|
1782 | 1803 | | |
|
1783 | 1804 | o 2 mv b dir/b copies: dir/b (b) |
|
1784 | 1805 | | |
|
1785 | 1806 | o 1 copy a b copies: b (a)g (f) |
|
1786 | 1807 | | |
|
1787 | 1808 | o 0 add a copies: |
|
1788 | 1809 | |
|
1789 | 1810 | Test "set:..." and parent revision |
|
1790 | 1811 | |
|
1791 | 1812 | $ hg up -q 4 |
|
1792 | 1813 | $ testlog "set:copied()" |
|
1793 | 1814 | [] |
|
1794 | 1815 | (group |
|
1795 | 1816 | (func |
|
1796 | 1817 | ('symbol', '_matchfiles') |
|
1797 | 1818 | (list |
|
1798 | 1819 | (list |
|
1799 | 1820 | ('string', 'r:') |
|
1800 | 1821 | ('string', 'd:relpath')) |
|
1801 | 1822 | ('string', 'p:set:copied()')))) |
|
1802 | 1823 | $ testlog --include "set:copied()" |
|
1803 | 1824 | [] |
|
1804 | 1825 | (group |
|
1805 | 1826 | (func |
|
1806 | 1827 | ('symbol', '_matchfiles') |
|
1807 | 1828 | (list |
|
1808 | 1829 | (list |
|
1809 | 1830 | ('string', 'r:') |
|
1810 | 1831 | ('string', 'd:relpath')) |
|
1811 | 1832 | ('string', 'i:set:copied()')))) |
|
1812 | 1833 | $ testlog -r "sort(file('set:copied()'), -rev)" |
|
1813 | 1834 | ["sort(file('set:copied()'), -rev)"] |
|
1814 | 1835 | [] |
|
1815 | 1836 | |
|
1816 | 1837 | Test --removed |
|
1817 | 1838 | |
|
1818 | 1839 | $ testlog --removed |
|
1819 | 1840 | [] |
|
1820 | 1841 | [] |
|
1821 | 1842 | $ testlog --removed a |
|
1822 | 1843 | [] |
|
1823 | 1844 | (group |
|
1824 | 1845 | (func |
|
1825 | 1846 | ('symbol', '_matchfiles') |
|
1826 | 1847 | (list |
|
1827 | 1848 | (list |
|
1828 | 1849 | ('string', 'r:') |
|
1829 | 1850 | ('string', 'd:relpath')) |
|
1830 | 1851 | ('string', 'p:a')))) |
|
1831 | 1852 | $ testlog --removed --follow a |
|
1832 | abort: can only follow copies/renames for explicit filenames | |
|
1833 | abort: can only follow copies/renames for explicit filenames | |
|
1834 | abort: can only follow copies/renames for explicit filenames | |
|
1853 | [] | |
|
1854 | (group | |
|
1855 | (func | |
|
1856 | ('symbol', '_matchfiles') | |
|
1857 | (list | |
|
1858 | (list | |
|
1859 | ('string', 'r:') | |
|
1860 | ('string', 'd:relpath')) | |
|
1861 | ('string', 'p:a')))) | |
|
1835 | 1862 | |
|
1836 | 1863 | Test --patch and --stat with --follow and --follow-first |
|
1837 | 1864 | |
|
1838 | 1865 | $ hg up -q 3 |
|
1839 | 1866 | $ hg log -G --git --patch b |
|
1840 | 1867 | o changeset: 1:216d4c92cf98 |
|
1841 | 1868 | | user: test |
|
1842 | 1869 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1843 | 1870 | | summary: copy a b |
|
1844 | 1871 | | |
|
1845 | 1872 | | diff --git a/a b/b |
|
1846 | 1873 | | copy from a |
|
1847 | 1874 | | copy to b |
|
1848 | 1875 | | |
|
1849 | 1876 | |
|
1850 | 1877 | $ hg log -G --git --stat b |
|
1851 | 1878 | o changeset: 1:216d4c92cf98 |
|
1852 | 1879 | | user: test |
|
1853 | 1880 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1854 | 1881 | | summary: copy a b |
|
1855 | 1882 | | |
|
1856 | 1883 | | b | 0 |
|
1857 | 1884 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
1858 | 1885 | | |
|
1859 | 1886 | |
|
1860 | 1887 | $ hg log -G --git --patch --follow b |
|
1861 | 1888 | o changeset: 1:216d4c92cf98 |
|
1862 | 1889 | | user: test |
|
1863 | 1890 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1864 | 1891 | | summary: copy a b |
|
1865 | 1892 | | |
|
1866 | 1893 | | diff --git a/a b/b |
|
1867 | 1894 | | copy from a |
|
1868 | 1895 | | copy to b |
|
1869 | 1896 | | |
|
1870 | 1897 | o changeset: 0:f8035bb17114 |
|
1871 | 1898 | user: test |
|
1872 | 1899 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1873 | 1900 | summary: add a |
|
1874 | 1901 | |
|
1875 | 1902 | diff --git a/a b/a |
|
1876 | 1903 | new file mode 100644 |
|
1877 | 1904 | --- /dev/null |
|
1878 | 1905 | +++ b/a |
|
1879 | 1906 | @@ -0,0 +1,1 @@ |
|
1880 | 1907 | +a |
|
1881 | 1908 | |
|
1882 | 1909 | |
|
1883 | 1910 | $ hg log -G --git --stat --follow b |
|
1884 | 1911 | o changeset: 1:216d4c92cf98 |
|
1885 | 1912 | | user: test |
|
1886 | 1913 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1887 | 1914 | | summary: copy a b |
|
1888 | 1915 | | |
|
1889 | 1916 | | b | 0 |
|
1890 | 1917 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
1891 | 1918 | | |
|
1892 | 1919 | o changeset: 0:f8035bb17114 |
|
1893 | 1920 | user: test |
|
1894 | 1921 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1895 | 1922 | summary: add a |
|
1896 | 1923 | |
|
1897 | 1924 | a | 1 + |
|
1898 | 1925 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
1899 | 1926 | |
|
1900 | 1927 | |
|
1901 | 1928 | $ hg up -q 6 |
|
1902 | 1929 | $ hg log -G --git --patch --follow-first e |
|
1903 | 1930 | @ changeset: 6:fc281d8ff18d |
|
1904 | 1931 | |\ tag: tip |
|
1905 | 1932 | | | parent: 5:99b31f1c2782 |
|
1906 | 1933 | | | parent: 4:17d952250a9d |
|
1907 | 1934 | | | user: test |
|
1908 | 1935 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1909 | 1936 | | | summary: merge 5 and 4 |
|
1910 | 1937 | | | |
|
1911 | 1938 | | | diff --git a/e b/e |
|
1912 | 1939 | | | --- a/e |
|
1913 | 1940 | | | +++ b/e |
|
1914 | 1941 | | | @@ -1,1 +1,1 @@ |
|
1915 | 1942 | | | -ee |
|
1916 | 1943 | | | +merge |
|
1917 | 1944 | | | |
|
1918 | 1945 | o | changeset: 5:99b31f1c2782 |
|
1919 | 1946 | | | parent: 3:5918b8d165d1 |
|
1920 | 1947 | | | user: test |
|
1921 | 1948 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1922 | 1949 | | | summary: add another e |
|
1923 | 1950 | | | |
|
1924 | 1951 | | | diff --git a/e b/e |
|
1925 | 1952 | | | new file mode 100644 |
|
1926 | 1953 | | | --- /dev/null |
|
1927 | 1954 | | | +++ b/e |
|
1928 | 1955 | | | @@ -0,0 +1,1 @@ |
|
1929 | 1956 | | | +ee |
|
1930 | 1957 | | | |
|
1931 | 1958 | |
|
1932 | 1959 | Test old-style --rev |
|
1933 | 1960 | |
|
1934 | 1961 | $ hg tag 'foo-bar' |
|
1935 | 1962 | $ testlog -r 'foo-bar' |
|
1936 | 1963 | ['foo-bar'] |
|
1937 | 1964 | [] |
|
1938 | 1965 | |
|
1939 | 1966 | Test --follow and forward --rev |
|
1940 | 1967 | |
|
1941 | 1968 | $ hg up -q 6 |
|
1942 | 1969 | $ echo g > g |
|
1943 | 1970 | $ hg ci -Am 'add g' g |
|
1944 | 1971 | created new head |
|
1945 | 1972 | $ hg up -q 2 |
|
1946 | 1973 | $ hg log -G --template "{rev} {desc|firstline}\n" |
|
1947 | 1974 | o 8 add g |
|
1948 | 1975 | | |
|
1949 | 1976 | | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
1950 | 1977 | |/ |
|
1951 | 1978 | o 6 merge 5 and 4 |
|
1952 | 1979 | |\ |
|
1953 | 1980 | | o 5 add another e |
|
1954 | 1981 | | | |
|
1955 | 1982 | o | 4 mv dir/b e |
|
1956 | 1983 | |/ |
|
1957 | 1984 | o 3 mv a b; add d |
|
1958 | 1985 | | |
|
1959 | 1986 | @ 2 mv b dir/b |
|
1960 | 1987 | | |
|
1961 | 1988 | o 1 copy a b |
|
1962 | 1989 | | |
|
1963 | 1990 | o 0 add a |
|
1964 | 1991 | |
|
1965 | 1992 | $ testlog --follow -r6 -r8 -r5 -r7 -r4 |
|
1966 | 1993 | ['6', '8', '5', '7', '4'] |
|
1967 | 1994 | (group |
|
1968 | 1995 | (func |
|
1969 | 1996 | ('symbol', 'descendants') |
|
1970 | 1997 | ('symbol', '6'))) |
|
1971 | 1998 | --- log.nodes * (glob) |
|
1972 | 1999 | +++ glog.nodes * (glob) |
|
1973 | 2000 | @@ -1,3 +1,3 @@ |
|
1974 | 2001 | -nodetag 6 |
|
1975 | 2002 | -nodetag 7 |
|
1976 | 2003 | nodetag 8 |
|
1977 | 2004 | +nodetag 7 |
|
1978 | 2005 | +nodetag 6 |
|
1979 | 2006 | |
|
1980 | 2007 | Test --follow-first and forward --rev |
|
1981 | 2008 | |
|
1982 | 2009 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 |
|
1983 | 2010 | ['6', '8', '5', '7', '4'] |
|
1984 | 2011 | (group |
|
1985 | 2012 | (func |
|
1986 | 2013 | ('symbol', '_firstdescendants') |
|
1987 | 2014 | ('symbol', '6'))) |
|
1988 | 2015 | --- log.nodes * (glob) |
|
1989 | 2016 | +++ glog.nodes * (glob) |
|
1990 | 2017 | @@ -1,3 +1,3 @@ |
|
1991 | 2018 | -nodetag 6 |
|
1992 | 2019 | -nodetag 7 |
|
1993 | 2020 | nodetag 8 |
|
1994 | 2021 | +nodetag 7 |
|
1995 | 2022 | +nodetag 6 |
|
1996 | 2023 | |
|
1997 | 2024 | Test --follow and backward --rev |
|
1998 | 2025 | |
|
1999 | 2026 | $ testlog --follow -r6 -r5 -r7 -r8 -r4 |
|
2000 | 2027 | ['6', '5', '7', '8', '4'] |
|
2001 | 2028 | (group |
|
2002 | 2029 | (func |
|
2003 | 2030 | ('symbol', 'ancestors') |
|
2004 | 2031 | ('symbol', '6'))) |
|
2005 | 2032 | |
|
2006 | 2033 | Test --follow-first and backward --rev |
|
2007 | 2034 | |
|
2008 | 2035 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 |
|
2009 | 2036 | ['6', '5', '7', '8', '4'] |
|
2010 | 2037 | (group |
|
2011 | 2038 | (func |
|
2012 | 2039 | ('symbol', '_firstancestors') |
|
2013 | 2040 | ('symbol', '6'))) |
|
2014 | 2041 | |
|
2015 | 2042 | Test subdir |
|
2016 | 2043 | |
|
2017 | 2044 | $ hg up -q 3 |
|
2018 | 2045 | $ cd dir |
|
2019 | 2046 | $ testlog . |
|
2020 | 2047 | [] |
|
2021 | 2048 | (group |
|
2022 | 2049 | (func |
|
2023 | 2050 | ('symbol', '_matchfiles') |
|
2024 | 2051 | (list |
|
2025 | 2052 | (list |
|
2026 | 2053 | ('string', 'r:') |
|
2027 | 2054 | ('string', 'd:relpath')) |
|
2028 | 2055 | ('string', 'p:.')))) |
|
2029 | 2056 | $ testlog ../b |
|
2030 | 2057 | [] |
|
2031 | 2058 | (group |
|
2032 | 2059 | (group |
|
2033 | 2060 | (func |
|
2034 | 2061 | ('symbol', 'filelog') |
|
2035 | 2062 | ('string', '../b')))) |
|
2036 | 2063 | $ testlog -f ../b |
|
2037 | 2064 | [] |
|
2038 | 2065 | (group |
|
2039 | 2066 | (group |
|
2040 | 2067 | (func |
|
2041 | 2068 | ('symbol', 'follow') |
|
2042 | 2069 | ('string', 'b')))) |
|
2043 | 2070 | $ cd .. |
|
2044 | 2071 | |
|
2045 | 2072 | Test --hidden |
|
2046 | 2073 | (enable obsolete) |
|
2047 | 2074 | |
|
2048 | 2075 | $ cat > ${TESTTMP}/obs.py << EOF |
|
2049 | 2076 | > import mercurial.obsolete |
|
2050 | 2077 | > mercurial.obsolete._enabled = True |
|
2051 | 2078 | > EOF |
|
2052 | 2079 | $ echo '[extensions]' >> $HGRCPATH |
|
2053 | 2080 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
2054 | 2081 | |
|
2055 | 2082 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2056 | 2083 | $ testlog |
|
2057 | 2084 | [] |
|
2058 | 2085 | [] |
|
2059 | 2086 | $ testlog --hidden |
|
2060 | 2087 | [] |
|
2061 | 2088 | [] |
|
2062 | 2089 | $ hg log -G --template '{rev} {desc}\n' |
|
2063 | 2090 | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
2064 | 2091 | | |
|
2065 | 2092 | o 6 merge 5 and 4 |
|
2066 | 2093 | |\ |
|
2067 | 2094 | | o 5 add another e |
|
2068 | 2095 | | | |
|
2069 | 2096 | o | 4 mv dir/b e |
|
2070 | 2097 | |/ |
|
2071 | 2098 | @ 3 mv a b; add d |
|
2072 | 2099 | | |
|
2073 | 2100 | o 2 mv b dir/b |
|
2074 | 2101 | | |
|
2075 | 2102 | o 1 copy a b |
|
2076 | 2103 | | |
|
2077 | 2104 | o 0 add a |
|
2078 | 2105 | |
|
2079 | 2106 | |
|
2080 | 2107 | A template without trailing newline should do something sane |
|
2081 | 2108 | |
|
2082 | 2109 | $ hg log -G -r ::2 --template '{rev} {desc}' |
|
2083 | 2110 | o 2 mv b dir/b |
|
2084 | 2111 | | |
|
2085 | 2112 | o 1 copy a b |
|
2086 | 2113 | | |
|
2087 | 2114 | o 0 add a |
|
2088 | 2115 | |
|
2089 | 2116 | |
|
2090 | 2117 | Extra newlines must be preserved |
|
2091 | 2118 | |
|
2092 | 2119 | $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n' |
|
2093 | 2120 | o |
|
2094 | 2121 | | 2 mv b dir/b |
|
2095 | 2122 | | |
|
2096 | 2123 | o |
|
2097 | 2124 | | 1 copy a b |
|
2098 | 2125 | | |
|
2099 | 2126 | o |
|
2100 | 2127 | 0 add a |
|
2101 | 2128 | |
|
2102 | 2129 | |
|
2103 | 2130 | The almost-empty template should do something sane too ... |
|
2104 | 2131 | |
|
2105 | 2132 | $ hg log -G -r ::2 --template '\n' |
|
2106 | 2133 | o |
|
2107 | 2134 | | |
|
2108 | 2135 | o |
|
2109 | 2136 | | |
|
2110 | 2137 | o |
|
2111 | 2138 | |
|
2112 | 2139 | |
|
2113 | 2140 | issue3772 |
|
2114 | 2141 | |
|
2115 | 2142 | $ hg log -G -r :null |
|
2116 | 2143 | o changeset: 0:f8035bb17114 |
|
2117 | 2144 | | user: test |
|
2118 | 2145 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2119 | 2146 | | summary: add a |
|
2120 | 2147 | | |
|
2121 | 2148 | o changeset: -1:000000000000 |
|
2122 | 2149 | user: |
|
2123 | 2150 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2124 | 2151 | |
|
2125 | 2152 | $ hg log -G -r null:null |
|
2126 | 2153 | o changeset: -1:000000000000 |
|
2127 | 2154 | user: |
|
2128 | 2155 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2129 | 2156 | |
|
2130 | 2157 | |
|
2131 | 2158 | $ cd .. |
@@ -1,1506 +1,1546 b'' | |||
|
1 | 1 | Log on empty repository: checking consistency |
|
2 | 2 | |
|
3 | 3 | $ hg init empty |
|
4 | 4 | $ cd empty |
|
5 | 5 | $ hg log |
|
6 | 6 | $ hg log -r 1 |
|
7 | 7 | abort: unknown revision '1'! |
|
8 | 8 | [255] |
|
9 | 9 | $ hg log -r -1:0 |
|
10 | 10 | abort: unknown revision '-1'! |
|
11 | 11 | [255] |
|
12 | 12 | $ hg log -r 'branch(name)' |
|
13 | 13 | abort: unknown revision 'name'! |
|
14 | 14 | [255] |
|
15 | 15 | $ hg log -r null -q |
|
16 | 16 | -1:000000000000 |
|
17 | 17 | |
|
18 | 18 | The g is crafted to have 2 filelog topological heads in a linear |
|
19 | 19 | changeset graph |
|
20 | 20 | |
|
21 | 21 | $ hg init a |
|
22 | 22 | $ cd a |
|
23 | 23 | $ echo a > a |
|
24 | 24 | $ echo f > f |
|
25 | 25 | $ hg ci -Ama -d '1 0' |
|
26 | 26 | adding a |
|
27 | 27 | adding f |
|
28 | 28 | |
|
29 | 29 | $ hg cp a b |
|
30 | 30 | $ hg cp f g |
|
31 | 31 | $ hg ci -mb -d '2 0' |
|
32 | 32 | |
|
33 | 33 | $ mkdir dir |
|
34 | 34 | $ hg mv b dir |
|
35 | 35 | $ echo g >> g |
|
36 | 36 | $ echo f >> f |
|
37 | 37 | $ hg ci -mc -d '3 0' |
|
38 | 38 | |
|
39 | 39 | $ hg mv a b |
|
40 | 40 | $ hg cp -f f g |
|
41 | 41 | $ echo a > d |
|
42 | 42 | $ hg add d |
|
43 | 43 | $ hg ci -md -d '4 0' |
|
44 | 44 | |
|
45 | 45 | $ hg mv dir/b e |
|
46 | 46 | $ hg ci -me -d '5 0' |
|
47 | 47 | |
|
48 | 48 | $ hg log a |
|
49 | 49 | changeset: 0:9161b9aeaf16 |
|
50 | 50 | user: test |
|
51 | 51 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
52 | 52 | summary: a |
|
53 | 53 | |
|
54 | 54 | log on directory |
|
55 | 55 | |
|
56 | 56 | $ hg log dir |
|
57 | 57 | changeset: 4:7e4639b4691b |
|
58 | 58 | tag: tip |
|
59 | 59 | user: test |
|
60 | 60 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
61 | 61 | summary: e |
|
62 | 62 | |
|
63 | 63 | changeset: 2:f8954cd4dc1f |
|
64 | 64 | user: test |
|
65 | 65 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
66 | 66 | summary: c |
|
67 | 67 | |
|
68 | 68 | $ hg log somethingthatdoesntexist dir |
|
69 | 69 | changeset: 4:7e4639b4691b |
|
70 | 70 | tag: tip |
|
71 | 71 | user: test |
|
72 | 72 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
73 | 73 | summary: e |
|
74 | 74 | |
|
75 | 75 | changeset: 2:f8954cd4dc1f |
|
76 | 76 | user: test |
|
77 | 77 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
78 | 78 | summary: c |
|
79 | 79 | |
|
80 | 80 | |
|
81 | -f, directory | |
|
81 | -f, non-existent directory | |
|
82 | 82 | |
|
83 | 83 |
$ |
|
84 | 84 | abort: cannot follow file not in parent revision: "dir" |
|
85 | 85 | [255] |
|
86 | 86 | |
|
87 | -f, directory | |
|
88 | ||
|
89 | $ hg up -q 3 | |
|
90 | $ hg log -f dir | |
|
91 | changeset: 2:f8954cd4dc1f | |
|
92 | user: test | |
|
93 | date: Thu Jan 01 00:00:03 1970 +0000 | |
|
94 | summary: c | |
|
95 | ||
|
96 | -f, directory with --patch | |
|
97 | ||
|
98 | $ hg log -f dir -p | |
|
99 | changeset: 2:f8954cd4dc1f | |
|
100 | user: test | |
|
101 | date: Thu Jan 01 00:00:03 1970 +0000 | |
|
102 | summary: c | |
|
103 | ||
|
104 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
|
105 | --- /dev/null* (glob) | |
|
106 | +++ b/dir/b* (glob) | |
|
107 | @@ -0,0 +1,1 @@ | |
|
108 | +a | |
|
109 | ||
|
110 | ||
|
111 | -f, pattern | |
|
112 | ||
|
113 | $ hg log -f -I 'dir**' -p | |
|
114 | changeset: 2:f8954cd4dc1f | |
|
115 | user: test | |
|
116 | date: Thu Jan 01 00:00:03 1970 +0000 | |
|
117 | summary: c | |
|
118 | ||
|
119 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
|
120 | --- /dev/null* (glob) | |
|
121 | +++ b/dir/b* (glob) | |
|
122 | @@ -0,0 +1,1 @@ | |
|
123 | +a | |
|
124 | ||
|
125 | $ hg up -q 4 | |
|
126 | ||
|
87 | 127 | -f, a wrong style |
|
88 | 128 | |
|
89 | 129 | $ hg log -f -l1 --style something |
|
90 | 130 | abort: style 'something' not found |
|
91 | 131 | (available styles: bisect, changelog, compact, default, phases, xml) |
|
92 | 132 | [255] |
|
93 | 133 | |
|
94 | 134 | -f, phases style |
|
95 | 135 | |
|
96 | 136 | |
|
97 | 137 | $ hg log -f -l1 --style phases |
|
98 | 138 | changeset: 4:7e4639b4691b |
|
99 | 139 | tag: tip |
|
100 | 140 | phase: draft |
|
101 | 141 | user: test |
|
102 | 142 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
103 | 143 | summary: e |
|
104 | 144 | |
|
105 | 145 | |
|
106 | 146 | -f, but no args |
|
107 | 147 | |
|
108 | 148 | $ hg log -f |
|
109 | 149 | changeset: 4:7e4639b4691b |
|
110 | 150 | tag: tip |
|
111 | 151 | user: test |
|
112 | 152 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
113 | 153 | summary: e |
|
114 | 154 | |
|
115 | 155 | changeset: 3:2ca5ba701980 |
|
116 | 156 | user: test |
|
117 | 157 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
118 | 158 | summary: d |
|
119 | 159 | |
|
120 | 160 | changeset: 2:f8954cd4dc1f |
|
121 | 161 | user: test |
|
122 | 162 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
123 | 163 | summary: c |
|
124 | 164 | |
|
125 | 165 | changeset: 1:d89b0a12d229 |
|
126 | 166 | user: test |
|
127 | 167 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
128 | 168 | summary: b |
|
129 | 169 | |
|
130 | 170 | changeset: 0:9161b9aeaf16 |
|
131 | 171 | user: test |
|
132 | 172 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
133 | 173 | summary: a |
|
134 | 174 | |
|
135 | 175 | |
|
136 | 176 | one rename |
|
137 | 177 | |
|
138 | 178 | $ hg up -q 2 |
|
139 | 179 | $ hg log -vf a |
|
140 | 180 | changeset: 0:9161b9aeaf16 |
|
141 | 181 | user: test |
|
142 | 182 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
143 | 183 | files: a f |
|
144 | 184 | description: |
|
145 | 185 | a |
|
146 | 186 | |
|
147 | 187 | |
|
148 | 188 | |
|
149 | 189 | many renames |
|
150 | 190 | |
|
151 | 191 | $ hg up -q tip |
|
152 | 192 | $ hg log -vf e |
|
153 | 193 | changeset: 4:7e4639b4691b |
|
154 | 194 | tag: tip |
|
155 | 195 | user: test |
|
156 | 196 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
157 | 197 | files: dir/b e |
|
158 | 198 | description: |
|
159 | 199 | e |
|
160 | 200 | |
|
161 | 201 | |
|
162 | 202 | changeset: 2:f8954cd4dc1f |
|
163 | 203 | user: test |
|
164 | 204 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
165 | 205 | files: b dir/b f g |
|
166 | 206 | description: |
|
167 | 207 | c |
|
168 | 208 | |
|
169 | 209 | |
|
170 | 210 | changeset: 1:d89b0a12d229 |
|
171 | 211 | user: test |
|
172 | 212 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
173 | 213 | files: b g |
|
174 | 214 | description: |
|
175 | 215 | b |
|
176 | 216 | |
|
177 | 217 | |
|
178 | 218 | changeset: 0:9161b9aeaf16 |
|
179 | 219 | user: test |
|
180 | 220 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
181 | 221 | files: a f |
|
182 | 222 | description: |
|
183 | 223 | a |
|
184 | 224 | |
|
185 | 225 | |
|
186 | 226 | |
|
187 | 227 | |
|
188 | 228 | log -pf dir/b |
|
189 | 229 | |
|
190 | 230 | $ hg up -q 3 |
|
191 | 231 | $ hg log -pf dir/b |
|
192 | 232 | changeset: 2:f8954cd4dc1f |
|
193 | 233 | user: test |
|
194 | 234 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
195 | 235 | summary: c |
|
196 | 236 | |
|
197 | 237 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
198 | 238 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
199 | 239 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
200 | 240 | @@ -0,0 +1,1 @@ |
|
201 | 241 | +a |
|
202 | 242 | |
|
203 | 243 | changeset: 1:d89b0a12d229 |
|
204 | 244 | user: test |
|
205 | 245 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
206 | 246 | summary: b |
|
207 | 247 | |
|
208 | 248 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
209 | 249 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
210 | 250 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
211 | 251 | @@ -0,0 +1,1 @@ |
|
212 | 252 | +a |
|
213 | 253 | |
|
214 | 254 | changeset: 0:9161b9aeaf16 |
|
215 | 255 | user: test |
|
216 | 256 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
217 | 257 | summary: a |
|
218 | 258 | |
|
219 | 259 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
220 | 260 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
221 | 261 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
222 | 262 | @@ -0,0 +1,1 @@ |
|
223 | 263 | +a |
|
224 | 264 | |
|
225 | 265 | |
|
226 | 266 | log -pf b inside dir |
|
227 | 267 | |
|
228 | 268 | $ hg --cwd=dir log -pf b |
|
229 | 269 | changeset: 2:f8954cd4dc1f |
|
230 | 270 | user: test |
|
231 | 271 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
232 | 272 | summary: c |
|
233 | 273 | |
|
234 | 274 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
235 | 275 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
236 | 276 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
237 | 277 | @@ -0,0 +1,1 @@ |
|
238 | 278 | +a |
|
239 | 279 | |
|
240 | 280 | changeset: 1:d89b0a12d229 |
|
241 | 281 | user: test |
|
242 | 282 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
243 | 283 | summary: b |
|
244 | 284 | |
|
245 | 285 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
246 | 286 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
247 | 287 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
248 | 288 | @@ -0,0 +1,1 @@ |
|
249 | 289 | +a |
|
250 | 290 | |
|
251 | 291 | changeset: 0:9161b9aeaf16 |
|
252 | 292 | user: test |
|
253 | 293 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
254 | 294 | summary: a |
|
255 | 295 | |
|
256 | 296 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
257 | 297 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
258 | 298 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
259 | 299 | @@ -0,0 +1,1 @@ |
|
260 | 300 | +a |
|
261 | 301 | |
|
262 | 302 | |
|
263 | 303 | log -pf, but no args |
|
264 | 304 | |
|
265 | 305 | $ hg log -pf |
|
266 | 306 | changeset: 3:2ca5ba701980 |
|
267 | 307 | user: test |
|
268 | 308 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
269 | 309 | summary: d |
|
270 | 310 | |
|
271 | 311 | diff -r f8954cd4dc1f -r 2ca5ba701980 a |
|
272 | 312 | --- a/a Thu Jan 01 00:00:03 1970 +0000 |
|
273 | 313 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
274 | 314 | @@ -1,1 +0,0 @@ |
|
275 | 315 | -a |
|
276 | 316 | diff -r f8954cd4dc1f -r 2ca5ba701980 b |
|
277 | 317 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
278 | 318 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 |
|
279 | 319 | @@ -0,0 +1,1 @@ |
|
280 | 320 | +a |
|
281 | 321 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
282 | 322 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
283 | 323 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
284 | 324 | @@ -0,0 +1,1 @@ |
|
285 | 325 | +a |
|
286 | 326 | diff -r f8954cd4dc1f -r 2ca5ba701980 g |
|
287 | 327 | --- a/g Thu Jan 01 00:00:03 1970 +0000 |
|
288 | 328 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 |
|
289 | 329 | @@ -1,2 +1,2 @@ |
|
290 | 330 | f |
|
291 | 331 | -g |
|
292 | 332 | +f |
|
293 | 333 | |
|
294 | 334 | changeset: 2:f8954cd4dc1f |
|
295 | 335 | user: test |
|
296 | 336 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
297 | 337 | summary: c |
|
298 | 338 | |
|
299 | 339 | diff -r d89b0a12d229 -r f8954cd4dc1f b |
|
300 | 340 | --- a/b Thu Jan 01 00:00:02 1970 +0000 |
|
301 | 341 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
302 | 342 | @@ -1,1 +0,0 @@ |
|
303 | 343 | -a |
|
304 | 344 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
305 | 345 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
306 | 346 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
307 | 347 | @@ -0,0 +1,1 @@ |
|
308 | 348 | +a |
|
309 | 349 | diff -r d89b0a12d229 -r f8954cd4dc1f f |
|
310 | 350 | --- a/f Thu Jan 01 00:00:02 1970 +0000 |
|
311 | 351 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 |
|
312 | 352 | @@ -1,1 +1,2 @@ |
|
313 | 353 | f |
|
314 | 354 | +f |
|
315 | 355 | diff -r d89b0a12d229 -r f8954cd4dc1f g |
|
316 | 356 | --- a/g Thu Jan 01 00:00:02 1970 +0000 |
|
317 | 357 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 |
|
318 | 358 | @@ -1,1 +1,2 @@ |
|
319 | 359 | f |
|
320 | 360 | +g |
|
321 | 361 | |
|
322 | 362 | changeset: 1:d89b0a12d229 |
|
323 | 363 | user: test |
|
324 | 364 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
325 | 365 | summary: b |
|
326 | 366 | |
|
327 | 367 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
328 | 368 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
329 | 369 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
330 | 370 | @@ -0,0 +1,1 @@ |
|
331 | 371 | +a |
|
332 | 372 | diff -r 9161b9aeaf16 -r d89b0a12d229 g |
|
333 | 373 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
334 | 374 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 |
|
335 | 375 | @@ -0,0 +1,1 @@ |
|
336 | 376 | +f |
|
337 | 377 | |
|
338 | 378 | changeset: 0:9161b9aeaf16 |
|
339 | 379 | user: test |
|
340 | 380 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
341 | 381 | summary: a |
|
342 | 382 | |
|
343 | 383 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
344 | 384 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
345 | 385 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
346 | 386 | @@ -0,0 +1,1 @@ |
|
347 | 387 | +a |
|
348 | 388 | diff -r 000000000000 -r 9161b9aeaf16 f |
|
349 | 389 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
350 | 390 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 |
|
351 | 391 | @@ -0,0 +1,1 @@ |
|
352 | 392 | +f |
|
353 | 393 | |
|
354 | 394 | |
|
355 | 395 | log -vf dir/b |
|
356 | 396 | |
|
357 | 397 | $ hg log -vf dir/b |
|
358 | 398 | changeset: 2:f8954cd4dc1f |
|
359 | 399 | user: test |
|
360 | 400 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
361 | 401 | files: b dir/b f g |
|
362 | 402 | description: |
|
363 | 403 | c |
|
364 | 404 | |
|
365 | 405 | |
|
366 | 406 | changeset: 1:d89b0a12d229 |
|
367 | 407 | user: test |
|
368 | 408 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
369 | 409 | files: b g |
|
370 | 410 | description: |
|
371 | 411 | b |
|
372 | 412 | |
|
373 | 413 | |
|
374 | 414 | changeset: 0:9161b9aeaf16 |
|
375 | 415 | user: test |
|
376 | 416 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
377 | 417 | files: a f |
|
378 | 418 | description: |
|
379 | 419 | a |
|
380 | 420 | |
|
381 | 421 | |
|
382 | 422 | |
|
383 | 423 | |
|
384 | 424 | -f and multiple filelog heads |
|
385 | 425 | |
|
386 | 426 | $ hg up -q 2 |
|
387 | 427 | $ hg log -f g --template '{rev}\n' |
|
388 | 428 | 2 |
|
389 | 429 | 1 |
|
390 | 430 | 0 |
|
391 | 431 | $ hg up -q tip |
|
392 | 432 | $ hg log -f g --template '{rev}\n' |
|
393 | 433 | 3 |
|
394 | 434 | 2 |
|
395 | 435 | 0 |
|
396 | 436 | |
|
397 | 437 | |
|
398 | 438 | log copies with --copies |
|
399 | 439 | |
|
400 | 440 | $ hg log -vC --template '{rev} {file_copies}\n' |
|
401 | 441 | 4 e (dir/b) |
|
402 | 442 | 3 b (a)g (f) |
|
403 | 443 | 2 dir/b (b) |
|
404 | 444 | 1 b (a)g (f) |
|
405 | 445 | 0 |
|
406 | 446 | |
|
407 | 447 | log copies switch without --copies, with old filecopy template |
|
408 | 448 | |
|
409 | 449 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
410 | 450 | 4 |
|
411 | 451 | 3 |
|
412 | 452 | 2 |
|
413 | 453 | 1 |
|
414 | 454 | 0 |
|
415 | 455 | |
|
416 | 456 | log copies switch with --copies |
|
417 | 457 | |
|
418 | 458 | $ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
419 | 459 | 4 e (dir/b) |
|
420 | 460 | 3 b (a)g (f) |
|
421 | 461 | 2 dir/b (b) |
|
422 | 462 | 1 b (a)g (f) |
|
423 | 463 | 0 |
|
424 | 464 | |
|
425 | 465 | |
|
426 | 466 | log copies with hardcoded style and with --style=default |
|
427 | 467 | |
|
428 | 468 | $ hg log -vC -r4 |
|
429 | 469 | changeset: 4:7e4639b4691b |
|
430 | 470 | tag: tip |
|
431 | 471 | user: test |
|
432 | 472 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
433 | 473 | files: dir/b e |
|
434 | 474 | copies: e (dir/b) |
|
435 | 475 | description: |
|
436 | 476 | e |
|
437 | 477 | |
|
438 | 478 | |
|
439 | 479 | $ hg log -vC -r4 --style=default |
|
440 | 480 | changeset: 4:7e4639b4691b |
|
441 | 481 | tag: tip |
|
442 | 482 | user: test |
|
443 | 483 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
444 | 484 | files: dir/b e |
|
445 | 485 | copies: e (dir/b) |
|
446 | 486 | description: |
|
447 | 487 | e |
|
448 | 488 | |
|
449 | 489 | |
|
450 | 490 | |
|
451 | 491 | |
|
452 | 492 | log copies, non-linear manifest |
|
453 | 493 | |
|
454 | 494 | $ hg up -C 3 |
|
455 | 495 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
456 | 496 | $ hg mv dir/b e |
|
457 | 497 | $ echo foo > foo |
|
458 | 498 | $ hg ci -Ame2 -d '6 0' |
|
459 | 499 | adding foo |
|
460 | 500 | created new head |
|
461 | 501 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
462 | 502 | 5 e (dir/b) |
|
463 | 503 | |
|
464 | 504 | |
|
465 | 505 | log copies, execute bit set |
|
466 | 506 | |
|
467 | 507 | #if execbit |
|
468 | 508 | $ chmod +x e |
|
469 | 509 | $ hg ci -me3 -d '7 0' |
|
470 | 510 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
471 | 511 | 6 |
|
472 | 512 | #endif |
|
473 | 513 | |
|
474 | 514 | |
|
475 | 515 | log -p d |
|
476 | 516 | |
|
477 | 517 | $ hg log -pv d |
|
478 | 518 | changeset: 3:2ca5ba701980 |
|
479 | 519 | user: test |
|
480 | 520 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
481 | 521 | files: a b d g |
|
482 | 522 | description: |
|
483 | 523 | d |
|
484 | 524 | |
|
485 | 525 | |
|
486 | 526 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
487 | 527 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
488 | 528 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
489 | 529 | @@ -0,0 +1,1 @@ |
|
490 | 530 | +a |
|
491 | 531 | |
|
492 | 532 | |
|
493 | 533 | |
|
494 | 534 | log --removed file |
|
495 | 535 | |
|
496 | 536 | $ hg log --removed -v a |
|
497 | 537 | changeset: 3:2ca5ba701980 |
|
498 | 538 | user: test |
|
499 | 539 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
500 | 540 | files: a b d g |
|
501 | 541 | description: |
|
502 | 542 | d |
|
503 | 543 | |
|
504 | 544 | |
|
505 | 545 | changeset: 0:9161b9aeaf16 |
|
506 | 546 | user: test |
|
507 | 547 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
508 | 548 | files: a f |
|
509 | 549 | description: |
|
510 | 550 | a |
|
511 | 551 | |
|
512 | 552 | |
|
513 | 553 | |
|
514 | 554 | log --removed revrange file |
|
515 | 555 | |
|
516 | 556 | $ hg log --removed -v -r0:2 a |
|
517 | 557 | changeset: 0:9161b9aeaf16 |
|
518 | 558 | user: test |
|
519 | 559 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
520 | 560 | files: a f |
|
521 | 561 | description: |
|
522 | 562 | a |
|
523 | 563 | |
|
524 | 564 | |
|
525 | 565 | $ cd .. |
|
526 | 566 | |
|
527 | 567 | log --follow tests |
|
528 | 568 | |
|
529 | 569 | $ hg init follow |
|
530 | 570 | $ cd follow |
|
531 | 571 | |
|
532 | 572 | $ echo base > base |
|
533 | 573 | $ hg ci -Ambase -d '1 0' |
|
534 | 574 | adding base |
|
535 | 575 | |
|
536 | 576 | $ echo r1 >> base |
|
537 | 577 | $ hg ci -Amr1 -d '1 0' |
|
538 | 578 | $ echo r2 >> base |
|
539 | 579 | $ hg ci -Amr2 -d '1 0' |
|
540 | 580 | |
|
541 | 581 | $ hg up -C 1 |
|
542 | 582 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
543 | 583 | $ echo b1 > b1 |
|
544 | 584 | $ hg ci -Amb1 -d '1 0' |
|
545 | 585 | adding b1 |
|
546 | 586 | created new head |
|
547 | 587 | |
|
548 | 588 | |
|
549 | 589 | log -f |
|
550 | 590 | |
|
551 | 591 | $ hg log -f |
|
552 | 592 | changeset: 3:e62f78d544b4 |
|
553 | 593 | tag: tip |
|
554 | 594 | parent: 1:3d5bf5654eda |
|
555 | 595 | user: test |
|
556 | 596 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
557 | 597 | summary: b1 |
|
558 | 598 | |
|
559 | 599 | changeset: 1:3d5bf5654eda |
|
560 | 600 | user: test |
|
561 | 601 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
562 | 602 | summary: r1 |
|
563 | 603 | |
|
564 | 604 | changeset: 0:67e992f2c4f3 |
|
565 | 605 | user: test |
|
566 | 606 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
567 | 607 | summary: base |
|
568 | 608 | |
|
569 | 609 | |
|
570 | 610 | |
|
571 | 611 | log -f -r 1:tip |
|
572 | 612 | |
|
573 | 613 | $ hg up -C 0 |
|
574 | 614 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
575 | 615 | $ echo b2 > b2 |
|
576 | 616 | $ hg ci -Amb2 -d '1 0' |
|
577 | 617 | adding b2 |
|
578 | 618 | created new head |
|
579 | 619 | $ hg log -f -r 1:tip |
|
580 | 620 | changeset: 1:3d5bf5654eda |
|
581 | 621 | user: test |
|
582 | 622 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
583 | 623 | summary: r1 |
|
584 | 624 | |
|
585 | 625 | changeset: 2:60c670bf5b30 |
|
586 | 626 | user: test |
|
587 | 627 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
588 | 628 | summary: r2 |
|
589 | 629 | |
|
590 | 630 | changeset: 3:e62f78d544b4 |
|
591 | 631 | parent: 1:3d5bf5654eda |
|
592 | 632 | user: test |
|
593 | 633 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
594 | 634 | summary: b1 |
|
595 | 635 | |
|
596 | 636 | |
|
597 | 637 | |
|
598 | 638 | log -r . with two parents |
|
599 | 639 | |
|
600 | 640 | $ hg up -C 3 |
|
601 | 641 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
602 | 642 | $ hg merge tip |
|
603 | 643 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
604 | 644 | (branch merge, don't forget to commit) |
|
605 | 645 | $ hg log -r . |
|
606 | 646 | changeset: 3:e62f78d544b4 |
|
607 | 647 | parent: 1:3d5bf5654eda |
|
608 | 648 | user: test |
|
609 | 649 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
610 | 650 | summary: b1 |
|
611 | 651 | |
|
612 | 652 | |
|
613 | 653 | |
|
614 | 654 | log -r . with one parent |
|
615 | 655 | |
|
616 | 656 | $ hg ci -mm12 -d '1 0' |
|
617 | 657 | $ hg log -r . |
|
618 | 658 | changeset: 5:302e9dd6890d |
|
619 | 659 | tag: tip |
|
620 | 660 | parent: 3:e62f78d544b4 |
|
621 | 661 | parent: 4:ddb82e70d1a1 |
|
622 | 662 | user: test |
|
623 | 663 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
624 | 664 | summary: m12 |
|
625 | 665 | |
|
626 | 666 | |
|
627 | 667 | $ echo postm >> b1 |
|
628 | 668 | $ hg ci -Amb1.1 -d'1 0' |
|
629 | 669 | |
|
630 | 670 | |
|
631 | 671 | log --follow-first |
|
632 | 672 | |
|
633 | 673 | $ hg log --follow-first |
|
634 | 674 | changeset: 6:2404bbcab562 |
|
635 | 675 | tag: tip |
|
636 | 676 | user: test |
|
637 | 677 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
638 | 678 | summary: b1.1 |
|
639 | 679 | |
|
640 | 680 | changeset: 5:302e9dd6890d |
|
641 | 681 | parent: 3:e62f78d544b4 |
|
642 | 682 | parent: 4:ddb82e70d1a1 |
|
643 | 683 | user: test |
|
644 | 684 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
645 | 685 | summary: m12 |
|
646 | 686 | |
|
647 | 687 | changeset: 3:e62f78d544b4 |
|
648 | 688 | parent: 1:3d5bf5654eda |
|
649 | 689 | user: test |
|
650 | 690 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
651 | 691 | summary: b1 |
|
652 | 692 | |
|
653 | 693 | changeset: 1:3d5bf5654eda |
|
654 | 694 | user: test |
|
655 | 695 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
656 | 696 | summary: r1 |
|
657 | 697 | |
|
658 | 698 | changeset: 0:67e992f2c4f3 |
|
659 | 699 | user: test |
|
660 | 700 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
661 | 701 | summary: base |
|
662 | 702 | |
|
663 | 703 | |
|
664 | 704 | |
|
665 | 705 | log -P 2 |
|
666 | 706 | |
|
667 | 707 | $ hg log -P 2 |
|
668 | 708 | changeset: 6:2404bbcab562 |
|
669 | 709 | tag: tip |
|
670 | 710 | user: test |
|
671 | 711 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
672 | 712 | summary: b1.1 |
|
673 | 713 | |
|
674 | 714 | changeset: 5:302e9dd6890d |
|
675 | 715 | parent: 3:e62f78d544b4 |
|
676 | 716 | parent: 4:ddb82e70d1a1 |
|
677 | 717 | user: test |
|
678 | 718 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
679 | 719 | summary: m12 |
|
680 | 720 | |
|
681 | 721 | changeset: 4:ddb82e70d1a1 |
|
682 | 722 | parent: 0:67e992f2c4f3 |
|
683 | 723 | user: test |
|
684 | 724 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
685 | 725 | summary: b2 |
|
686 | 726 | |
|
687 | 727 | changeset: 3:e62f78d544b4 |
|
688 | 728 | parent: 1:3d5bf5654eda |
|
689 | 729 | user: test |
|
690 | 730 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
691 | 731 | summary: b1 |
|
692 | 732 | |
|
693 | 733 | |
|
694 | 734 | |
|
695 | 735 | log -r tip -p --git |
|
696 | 736 | |
|
697 | 737 | $ hg log -r tip -p --git |
|
698 | 738 | changeset: 6:2404bbcab562 |
|
699 | 739 | tag: tip |
|
700 | 740 | user: test |
|
701 | 741 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
702 | 742 | summary: b1.1 |
|
703 | 743 | |
|
704 | 744 | diff --git a/b1 b/b1 |
|
705 | 745 | --- a/b1 |
|
706 | 746 | +++ b/b1 |
|
707 | 747 | @@ -1,1 +1,2 @@ |
|
708 | 748 | b1 |
|
709 | 749 | +postm |
|
710 | 750 | |
|
711 | 751 | |
|
712 | 752 | |
|
713 | 753 | log -r "" |
|
714 | 754 | |
|
715 | 755 | $ hg log -r '' |
|
716 | 756 | hg: parse error: empty query |
|
717 | 757 | [255] |
|
718 | 758 | |
|
719 | 759 | log -r <some unknown node id> |
|
720 | 760 | |
|
721 | 761 | $ hg log -r 1000000000000000000000000000000000000000 |
|
722 | 762 | abort: unknown revision '1000000000000000000000000000000000000000'! |
|
723 | 763 | [255] |
|
724 | 764 | |
|
725 | 765 | log -k r1 |
|
726 | 766 | |
|
727 | 767 | $ hg log -k r1 |
|
728 | 768 | changeset: 1:3d5bf5654eda |
|
729 | 769 | user: test |
|
730 | 770 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
731 | 771 | summary: r1 |
|
732 | 772 | |
|
733 | 773 | log -p -l2 --color=always |
|
734 | 774 | |
|
735 | 775 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
736 | 776 | > log -p -l2 --color=always |
|
737 | 777 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
738 | 778 | tag: tip |
|
739 | 779 | user: test |
|
740 | 780 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
741 | 781 | summary: b1.1 |
|
742 | 782 | |
|
743 | 783 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
|
744 | 784 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
745 | 785 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
746 | 786 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
747 | 787 | b1 |
|
748 | 788 | \x1b[0;32m+postm\x1b[0m (esc) |
|
749 | 789 | |
|
750 | 790 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
751 | 791 | parent: 3:e62f78d544b4 |
|
752 | 792 | parent: 4:ddb82e70d1a1 |
|
753 | 793 | user: test |
|
754 | 794 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
755 | 795 | summary: m12 |
|
756 | 796 | |
|
757 | 797 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
|
758 | 798 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
|
759 | 799 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
760 | 800 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
|
761 | 801 | \x1b[0;32m+b2\x1b[0m (esc) |
|
762 | 802 | |
|
763 | 803 | |
|
764 | 804 | |
|
765 | 805 | log -r tip --stat |
|
766 | 806 | |
|
767 | 807 | $ hg log -r tip --stat |
|
768 | 808 | changeset: 6:2404bbcab562 |
|
769 | 809 | tag: tip |
|
770 | 810 | user: test |
|
771 | 811 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
772 | 812 | summary: b1.1 |
|
773 | 813 | |
|
774 | 814 | b1 | 1 + |
|
775 | 815 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
776 | 816 | |
|
777 | 817 | |
|
778 | 818 | $ cd .. |
|
779 | 819 | |
|
780 | 820 | |
|
781 | 821 | User |
|
782 | 822 | |
|
783 | 823 | $ hg init usertest |
|
784 | 824 | $ cd usertest |
|
785 | 825 | |
|
786 | 826 | $ echo a > a |
|
787 | 827 | $ hg ci -A -m "a" -u "User One <user1@example.org>" |
|
788 | 828 | adding a |
|
789 | 829 | $ echo b > b |
|
790 | 830 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
791 | 831 | adding b |
|
792 | 832 | |
|
793 | 833 | $ hg log -u "User One <user1@example.org>" |
|
794 | 834 | changeset: 0:29a4c94f1924 |
|
795 | 835 | user: User One <user1@example.org> |
|
796 | 836 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
797 | 837 | summary: a |
|
798 | 838 | |
|
799 | 839 | $ hg log -u "user1" -u "user2" |
|
800 | 840 | changeset: 1:e834b5e69c0e |
|
801 | 841 | tag: tip |
|
802 | 842 | user: User Two <user2@example.org> |
|
803 | 843 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
804 | 844 | summary: b |
|
805 | 845 | |
|
806 | 846 | changeset: 0:29a4c94f1924 |
|
807 | 847 | user: User One <user1@example.org> |
|
808 | 848 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
809 | 849 | summary: a |
|
810 | 850 | |
|
811 | 851 | $ hg log -u "user3" |
|
812 | 852 | |
|
813 | 853 | $ cd .. |
|
814 | 854 | |
|
815 | 855 | $ hg init branches |
|
816 | 856 | $ cd branches |
|
817 | 857 | |
|
818 | 858 | $ echo a > a |
|
819 | 859 | $ hg ci -A -m "commit on default" |
|
820 | 860 | adding a |
|
821 | 861 | $ hg branch test |
|
822 | 862 | marked working directory as branch test |
|
823 | 863 | (branches are permanent and global, did you want a bookmark?) |
|
824 | 864 | $ echo b > b |
|
825 | 865 | $ hg ci -A -m "commit on test" |
|
826 | 866 | adding b |
|
827 | 867 | |
|
828 | 868 | $ hg up default |
|
829 | 869 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
830 | 870 | $ echo c > c |
|
831 | 871 | $ hg ci -A -m "commit on default" |
|
832 | 872 | adding c |
|
833 | 873 | $ hg up test |
|
834 | 874 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
835 | 875 | $ echo c > c |
|
836 | 876 | $ hg ci -A -m "commit on test" |
|
837 | 877 | adding c |
|
838 | 878 | |
|
839 | 879 | |
|
840 | 880 | log -b default |
|
841 | 881 | |
|
842 | 882 | $ hg log -b default |
|
843 | 883 | changeset: 2:c3a4f03cc9a7 |
|
844 | 884 | parent: 0:24427303d56f |
|
845 | 885 | user: test |
|
846 | 886 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
847 | 887 | summary: commit on default |
|
848 | 888 | |
|
849 | 889 | changeset: 0:24427303d56f |
|
850 | 890 | user: test |
|
851 | 891 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
852 | 892 | summary: commit on default |
|
853 | 893 | |
|
854 | 894 | |
|
855 | 895 | |
|
856 | 896 | log -b test |
|
857 | 897 | |
|
858 | 898 | $ hg log -b test |
|
859 | 899 | changeset: 3:f5d8de11c2e2 |
|
860 | 900 | branch: test |
|
861 | 901 | tag: tip |
|
862 | 902 | parent: 1:d32277701ccb |
|
863 | 903 | user: test |
|
864 | 904 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
865 | 905 | summary: commit on test |
|
866 | 906 | |
|
867 | 907 | changeset: 1:d32277701ccb |
|
868 | 908 | branch: test |
|
869 | 909 | user: test |
|
870 | 910 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
871 | 911 | summary: commit on test |
|
872 | 912 | |
|
873 | 913 | |
|
874 | 914 | |
|
875 | 915 | log -b dummy |
|
876 | 916 | |
|
877 | 917 | $ hg log -b dummy |
|
878 | 918 | abort: unknown revision 'dummy'! |
|
879 | 919 | [255] |
|
880 | 920 | |
|
881 | 921 | |
|
882 | 922 | log -b . |
|
883 | 923 | |
|
884 | 924 | $ hg log -b . |
|
885 | 925 | changeset: 3:f5d8de11c2e2 |
|
886 | 926 | branch: test |
|
887 | 927 | tag: tip |
|
888 | 928 | parent: 1:d32277701ccb |
|
889 | 929 | user: test |
|
890 | 930 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
891 | 931 | summary: commit on test |
|
892 | 932 | |
|
893 | 933 | changeset: 1:d32277701ccb |
|
894 | 934 | branch: test |
|
895 | 935 | user: test |
|
896 | 936 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
897 | 937 | summary: commit on test |
|
898 | 938 | |
|
899 | 939 | |
|
900 | 940 | |
|
901 | 941 | log -b default -b test |
|
902 | 942 | |
|
903 | 943 | $ hg log -b default -b test |
|
904 | 944 | changeset: 3:f5d8de11c2e2 |
|
905 | 945 | branch: test |
|
906 | 946 | tag: tip |
|
907 | 947 | parent: 1:d32277701ccb |
|
908 | 948 | user: test |
|
909 | 949 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
910 | 950 | summary: commit on test |
|
911 | 951 | |
|
912 | 952 | changeset: 2:c3a4f03cc9a7 |
|
913 | 953 | parent: 0:24427303d56f |
|
914 | 954 | user: test |
|
915 | 955 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
916 | 956 | summary: commit on default |
|
917 | 957 | |
|
918 | 958 | changeset: 1:d32277701ccb |
|
919 | 959 | branch: test |
|
920 | 960 | user: test |
|
921 | 961 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
922 | 962 | summary: commit on test |
|
923 | 963 | |
|
924 | 964 | changeset: 0:24427303d56f |
|
925 | 965 | user: test |
|
926 | 966 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
927 | 967 | summary: commit on default |
|
928 | 968 | |
|
929 | 969 | |
|
930 | 970 | |
|
931 | 971 | log -b default -b . |
|
932 | 972 | |
|
933 | 973 | $ hg log -b default -b . |
|
934 | 974 | changeset: 3:f5d8de11c2e2 |
|
935 | 975 | branch: test |
|
936 | 976 | tag: tip |
|
937 | 977 | parent: 1:d32277701ccb |
|
938 | 978 | user: test |
|
939 | 979 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
940 | 980 | summary: commit on test |
|
941 | 981 | |
|
942 | 982 | changeset: 2:c3a4f03cc9a7 |
|
943 | 983 | parent: 0:24427303d56f |
|
944 | 984 | user: test |
|
945 | 985 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
946 | 986 | summary: commit on default |
|
947 | 987 | |
|
948 | 988 | changeset: 1:d32277701ccb |
|
949 | 989 | branch: test |
|
950 | 990 | user: test |
|
951 | 991 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
952 | 992 | summary: commit on test |
|
953 | 993 | |
|
954 | 994 | changeset: 0:24427303d56f |
|
955 | 995 | user: test |
|
956 | 996 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
957 | 997 | summary: commit on default |
|
958 | 998 | |
|
959 | 999 | |
|
960 | 1000 | |
|
961 | 1001 | log -b . -b test |
|
962 | 1002 | |
|
963 | 1003 | $ hg log -b . -b test |
|
964 | 1004 | changeset: 3:f5d8de11c2e2 |
|
965 | 1005 | branch: test |
|
966 | 1006 | tag: tip |
|
967 | 1007 | parent: 1:d32277701ccb |
|
968 | 1008 | user: test |
|
969 | 1009 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
970 | 1010 | summary: commit on test |
|
971 | 1011 | |
|
972 | 1012 | changeset: 1:d32277701ccb |
|
973 | 1013 | branch: test |
|
974 | 1014 | user: test |
|
975 | 1015 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
976 | 1016 | summary: commit on test |
|
977 | 1017 | |
|
978 | 1018 | |
|
979 | 1019 | |
|
980 | 1020 | log -b 2 |
|
981 | 1021 | |
|
982 | 1022 | $ hg log -b 2 |
|
983 | 1023 | changeset: 2:c3a4f03cc9a7 |
|
984 | 1024 | parent: 0:24427303d56f |
|
985 | 1025 | user: test |
|
986 | 1026 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
987 | 1027 | summary: commit on default |
|
988 | 1028 | |
|
989 | 1029 | changeset: 0:24427303d56f |
|
990 | 1030 | user: test |
|
991 | 1031 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
992 | 1032 | summary: commit on default |
|
993 | 1033 | |
|
994 | 1034 | |
|
995 | 1035 | |
|
996 | 1036 | log -p --cwd dir (in subdir) |
|
997 | 1037 | |
|
998 | 1038 | $ mkdir dir |
|
999 | 1039 | $ hg log -p --cwd dir |
|
1000 | 1040 | changeset: 3:f5d8de11c2e2 |
|
1001 | 1041 | branch: test |
|
1002 | 1042 | tag: tip |
|
1003 | 1043 | parent: 1:d32277701ccb |
|
1004 | 1044 | user: test |
|
1005 | 1045 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1006 | 1046 | summary: commit on test |
|
1007 | 1047 | |
|
1008 | 1048 | diff -r d32277701ccb -r f5d8de11c2e2 c |
|
1009 | 1049 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1010 | 1050 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1011 | 1051 | @@ -0,0 +1,1 @@ |
|
1012 | 1052 | +c |
|
1013 | 1053 | |
|
1014 | 1054 | changeset: 2:c3a4f03cc9a7 |
|
1015 | 1055 | parent: 0:24427303d56f |
|
1016 | 1056 | user: test |
|
1017 | 1057 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1018 | 1058 | summary: commit on default |
|
1019 | 1059 | |
|
1020 | 1060 | diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
1021 | 1061 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1022 | 1062 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
1023 | 1063 | @@ -0,0 +1,1 @@ |
|
1024 | 1064 | +c |
|
1025 | 1065 | |
|
1026 | 1066 | changeset: 1:d32277701ccb |
|
1027 | 1067 | branch: test |
|
1028 | 1068 | user: test |
|
1029 | 1069 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1030 | 1070 | summary: commit on test |
|
1031 | 1071 | |
|
1032 | 1072 | diff -r 24427303d56f -r d32277701ccb b |
|
1033 | 1073 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1034 | 1074 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1035 | 1075 | @@ -0,0 +1,1 @@ |
|
1036 | 1076 | +b |
|
1037 | 1077 | |
|
1038 | 1078 | changeset: 0:24427303d56f |
|
1039 | 1079 | user: test |
|
1040 | 1080 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1041 | 1081 | summary: commit on default |
|
1042 | 1082 | |
|
1043 | 1083 | diff -r 000000000000 -r 24427303d56f a |
|
1044 | 1084 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1045 | 1085 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1046 | 1086 | @@ -0,0 +1,1 @@ |
|
1047 | 1087 | +a |
|
1048 | 1088 | |
|
1049 | 1089 | |
|
1050 | 1090 | |
|
1051 | 1091 | log -p -R repo |
|
1052 | 1092 | |
|
1053 | 1093 | $ cd dir |
|
1054 | 1094 | $ hg log -p -R .. ../a |
|
1055 | 1095 | changeset: 0:24427303d56f |
|
1056 | 1096 | user: test |
|
1057 | 1097 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1058 | 1098 | summary: commit on default |
|
1059 | 1099 | |
|
1060 | 1100 | diff -r 000000000000 -r 24427303d56f a |
|
1061 | 1101 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1062 | 1102 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1063 | 1103 | @@ -0,0 +1,1 @@ |
|
1064 | 1104 | +a |
|
1065 | 1105 | |
|
1066 | 1106 | |
|
1067 | 1107 | $ cd ../.. |
|
1068 | 1108 | |
|
1069 | 1109 | $ hg init follow2 |
|
1070 | 1110 | $ cd follow2 |
|
1071 | 1111 | |
|
1072 | 1112 | # Build the following history: |
|
1073 | 1113 | # tip - o - x - o - x - x |
|
1074 | 1114 | # \ / |
|
1075 | 1115 | # o - o - o - x |
|
1076 | 1116 | # \ / |
|
1077 | 1117 | # o |
|
1078 | 1118 | # |
|
1079 | 1119 | # Where "o" is a revision containing "foo" and |
|
1080 | 1120 | # "x" is a revision without "foo" |
|
1081 | 1121 | |
|
1082 | 1122 | $ touch init |
|
1083 | 1123 | $ hg ci -A -m "init, unrelated" |
|
1084 | 1124 | adding init |
|
1085 | 1125 | $ echo 'foo' > init |
|
1086 | 1126 | $ hg ci -m "change, unrelated" |
|
1087 | 1127 | $ echo 'foo' > foo |
|
1088 | 1128 | $ hg ci -A -m "add unrelated old foo" |
|
1089 | 1129 | adding foo |
|
1090 | 1130 | $ hg rm foo |
|
1091 | 1131 | $ hg ci -m "delete foo, unrelated" |
|
1092 | 1132 | $ echo 'related' > foo |
|
1093 | 1133 | $ hg ci -A -m "add foo, related" |
|
1094 | 1134 | adding foo |
|
1095 | 1135 | |
|
1096 | 1136 | $ hg up 0 |
|
1097 | 1137 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1098 | 1138 | $ touch branch |
|
1099 | 1139 | $ hg ci -A -m "first branch, unrelated" |
|
1100 | 1140 | adding branch |
|
1101 | 1141 | created new head |
|
1102 | 1142 | $ touch foo |
|
1103 | 1143 | $ hg ci -A -m "create foo, related" |
|
1104 | 1144 | adding foo |
|
1105 | 1145 | $ echo 'change' > foo |
|
1106 | 1146 | $ hg ci -m "change foo, related" |
|
1107 | 1147 | |
|
1108 | 1148 | $ hg up 6 |
|
1109 | 1149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1110 | 1150 | $ echo 'change foo in branch' > foo |
|
1111 | 1151 | $ hg ci -m "change foo in branch, related" |
|
1112 | 1152 | created new head |
|
1113 | 1153 | $ hg merge 7 |
|
1114 | 1154 | merging foo |
|
1115 | 1155 | warning: conflicts during merge. |
|
1116 | 1156 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
1117 | 1157 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1118 | 1158 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1119 | 1159 | [1] |
|
1120 | 1160 | $ echo 'merge 1' > foo |
|
1121 | 1161 | $ hg resolve -m foo |
|
1122 | 1162 | (no more unresolved files) |
|
1123 | 1163 | $ hg ci -m "First merge, related" |
|
1124 | 1164 | |
|
1125 | 1165 | $ hg merge 4 |
|
1126 | 1166 | merging foo |
|
1127 | 1167 | warning: conflicts during merge. |
|
1128 | 1168 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
1129 | 1169 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1130 | 1170 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1131 | 1171 | [1] |
|
1132 | 1172 | $ echo 'merge 2' > foo |
|
1133 | 1173 | $ hg resolve -m foo |
|
1134 | 1174 | (no more unresolved files) |
|
1135 | 1175 | $ hg ci -m "Last merge, related" |
|
1136 | 1176 | |
|
1137 | 1177 | $ hg log --graph |
|
1138 | 1178 | @ changeset: 10:4dae8563d2c5 |
|
1139 | 1179 | |\ tag: tip |
|
1140 | 1180 | | | parent: 9:7b35701b003e |
|
1141 | 1181 | | | parent: 4:88176d361b69 |
|
1142 | 1182 | | | user: test |
|
1143 | 1183 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1144 | 1184 | | | summary: Last merge, related |
|
1145 | 1185 | | | |
|
1146 | 1186 | | o changeset: 9:7b35701b003e |
|
1147 | 1187 | | |\ parent: 8:e5416ad8a855 |
|
1148 | 1188 | | | | parent: 7:87fe3144dcfa |
|
1149 | 1189 | | | | user: test |
|
1150 | 1190 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1151 | 1191 | | | | summary: First merge, related |
|
1152 | 1192 | | | | |
|
1153 | 1193 | | | o changeset: 8:e5416ad8a855 |
|
1154 | 1194 | | | | parent: 6:dc6c325fe5ee |
|
1155 | 1195 | | | | user: test |
|
1156 | 1196 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1157 | 1197 | | | | summary: change foo in branch, related |
|
1158 | 1198 | | | | |
|
1159 | 1199 | | o | changeset: 7:87fe3144dcfa |
|
1160 | 1200 | | |/ user: test |
|
1161 | 1201 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1162 | 1202 | | | summary: change foo, related |
|
1163 | 1203 | | | |
|
1164 | 1204 | | o changeset: 6:dc6c325fe5ee |
|
1165 | 1205 | | | user: test |
|
1166 | 1206 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1167 | 1207 | | | summary: create foo, related |
|
1168 | 1208 | | | |
|
1169 | 1209 | | o changeset: 5:73db34516eb9 |
|
1170 | 1210 | | | parent: 0:e87515fd044a |
|
1171 | 1211 | | | user: test |
|
1172 | 1212 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1173 | 1213 | | | summary: first branch, unrelated |
|
1174 | 1214 | | | |
|
1175 | 1215 | o | changeset: 4:88176d361b69 |
|
1176 | 1216 | | | user: test |
|
1177 | 1217 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1178 | 1218 | | | summary: add foo, related |
|
1179 | 1219 | | | |
|
1180 | 1220 | o | changeset: 3:dd78ae4afb56 |
|
1181 | 1221 | | | user: test |
|
1182 | 1222 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1183 | 1223 | | | summary: delete foo, unrelated |
|
1184 | 1224 | | | |
|
1185 | 1225 | o | changeset: 2:c4c64aedf0f7 |
|
1186 | 1226 | | | user: test |
|
1187 | 1227 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1188 | 1228 | | | summary: add unrelated old foo |
|
1189 | 1229 | | | |
|
1190 | 1230 | o | changeset: 1:e5faa7440653 |
|
1191 | 1231 | |/ user: test |
|
1192 | 1232 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1193 | 1233 | | summary: change, unrelated |
|
1194 | 1234 | | |
|
1195 | 1235 | o changeset: 0:e87515fd044a |
|
1196 | 1236 | user: test |
|
1197 | 1237 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1198 | 1238 | summary: init, unrelated |
|
1199 | 1239 | |
|
1200 | 1240 | |
|
1201 | 1241 | $ hg --traceback log -f foo |
|
1202 | 1242 | changeset: 10:4dae8563d2c5 |
|
1203 | 1243 | tag: tip |
|
1204 | 1244 | parent: 9:7b35701b003e |
|
1205 | 1245 | parent: 4:88176d361b69 |
|
1206 | 1246 | user: test |
|
1207 | 1247 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1208 | 1248 | summary: Last merge, related |
|
1209 | 1249 | |
|
1210 | 1250 | changeset: 9:7b35701b003e |
|
1211 | 1251 | parent: 8:e5416ad8a855 |
|
1212 | 1252 | parent: 7:87fe3144dcfa |
|
1213 | 1253 | user: test |
|
1214 | 1254 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1215 | 1255 | summary: First merge, related |
|
1216 | 1256 | |
|
1217 | 1257 | changeset: 8:e5416ad8a855 |
|
1218 | 1258 | parent: 6:dc6c325fe5ee |
|
1219 | 1259 | user: test |
|
1220 | 1260 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1221 | 1261 | summary: change foo in branch, related |
|
1222 | 1262 | |
|
1223 | 1263 | changeset: 7:87fe3144dcfa |
|
1224 | 1264 | user: test |
|
1225 | 1265 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1226 | 1266 | summary: change foo, related |
|
1227 | 1267 | |
|
1228 | 1268 | changeset: 6:dc6c325fe5ee |
|
1229 | 1269 | user: test |
|
1230 | 1270 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1231 | 1271 | summary: create foo, related |
|
1232 | 1272 | |
|
1233 | 1273 | changeset: 4:88176d361b69 |
|
1234 | 1274 | user: test |
|
1235 | 1275 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1236 | 1276 | summary: add foo, related |
|
1237 | 1277 | |
|
1238 | 1278 | |
|
1239 | 1279 | Also check when maxrev < lastrevfilelog |
|
1240 | 1280 | |
|
1241 | 1281 | $ hg --traceback log -f -r4 foo |
|
1242 | 1282 | changeset: 4:88176d361b69 |
|
1243 | 1283 | user: test |
|
1244 | 1284 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1245 | 1285 | summary: add foo, related |
|
1246 | 1286 | |
|
1247 | 1287 | $ cd .. |
|
1248 | 1288 | |
|
1249 | 1289 | Issue2383: hg log showing _less_ differences than hg diff |
|
1250 | 1290 | |
|
1251 | 1291 | $ hg init issue2383 |
|
1252 | 1292 | $ cd issue2383 |
|
1253 | 1293 | |
|
1254 | 1294 | Create a test repo: |
|
1255 | 1295 | |
|
1256 | 1296 | $ echo a > a |
|
1257 | 1297 | $ hg ci -Am0 |
|
1258 | 1298 | adding a |
|
1259 | 1299 | $ echo b > b |
|
1260 | 1300 | $ hg ci -Am1 |
|
1261 | 1301 | adding b |
|
1262 | 1302 | $ hg co 0 |
|
1263 | 1303 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1264 | 1304 | $ echo b > a |
|
1265 | 1305 | $ hg ci -m2 |
|
1266 | 1306 | created new head |
|
1267 | 1307 | |
|
1268 | 1308 | Merge: |
|
1269 | 1309 | |
|
1270 | 1310 | $ hg merge |
|
1271 | 1311 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1272 | 1312 | (branch merge, don't forget to commit) |
|
1273 | 1313 | |
|
1274 | 1314 | Make sure there's a file listed in the merge to trigger the bug: |
|
1275 | 1315 | |
|
1276 | 1316 | $ echo c > a |
|
1277 | 1317 | $ hg ci -m3 |
|
1278 | 1318 | |
|
1279 | 1319 | Two files shown here in diff: |
|
1280 | 1320 | |
|
1281 | 1321 | $ hg diff --rev 2:3 |
|
1282 | 1322 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1283 | 1323 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1284 | 1324 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1285 | 1325 | @@ -1,1 +1,1 @@ |
|
1286 | 1326 | -b |
|
1287 | 1327 | +c |
|
1288 | 1328 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1289 | 1329 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1290 | 1330 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1291 | 1331 | @@ -0,0 +1,1 @@ |
|
1292 | 1332 | +b |
|
1293 | 1333 | |
|
1294 | 1334 | Diff here should be the same: |
|
1295 | 1335 | |
|
1296 | 1336 | $ hg log -vpr 3 |
|
1297 | 1337 | changeset: 3:8e07aafe1edc |
|
1298 | 1338 | tag: tip |
|
1299 | 1339 | parent: 2:b09be438c43a |
|
1300 | 1340 | parent: 1:925d80f479bb |
|
1301 | 1341 | user: test |
|
1302 | 1342 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1303 | 1343 | files: a |
|
1304 | 1344 | description: |
|
1305 | 1345 | 3 |
|
1306 | 1346 | |
|
1307 | 1347 | |
|
1308 | 1348 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1309 | 1349 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1310 | 1350 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1311 | 1351 | @@ -1,1 +1,1 @@ |
|
1312 | 1352 | -b |
|
1313 | 1353 | +c |
|
1314 | 1354 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1315 | 1355 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1316 | 1356 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1317 | 1357 | @@ -0,0 +1,1 @@ |
|
1318 | 1358 | +b |
|
1319 | 1359 | |
|
1320 | 1360 | $ cd .. |
|
1321 | 1361 | |
|
1322 | 1362 | 'hg log -r rev fn' when last(filelog(fn)) != rev |
|
1323 | 1363 | |
|
1324 | 1364 | $ hg init simplelog |
|
1325 | 1365 | $ cd simplelog |
|
1326 | 1366 | $ echo f > a |
|
1327 | 1367 | $ hg ci -Am'a' -d '0 0' |
|
1328 | 1368 | adding a |
|
1329 | 1369 | $ echo f >> a |
|
1330 | 1370 | $ hg ci -Am'a bis' -d '1 0' |
|
1331 | 1371 | |
|
1332 | 1372 | $ hg log -r0 a |
|
1333 | 1373 | changeset: 0:9f758d63dcde |
|
1334 | 1374 | user: test |
|
1335 | 1375 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1336 | 1376 | summary: a |
|
1337 | 1377 | |
|
1338 | 1378 | enable obsolete to test hidden feature |
|
1339 | 1379 | |
|
1340 | 1380 | $ cat > ${TESTTMP}/obs.py << EOF |
|
1341 | 1381 | > import mercurial.obsolete |
|
1342 | 1382 | > mercurial.obsolete._enabled = True |
|
1343 | 1383 | > EOF |
|
1344 | 1384 | $ echo '[extensions]' >> $HGRCPATH |
|
1345 | 1385 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
1346 | 1386 | |
|
1347 | 1387 | $ hg log --template='{rev}:{node}\n' |
|
1348 | 1388 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1349 | 1389 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1350 | 1390 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1351 | 1391 | $ hg up null -q |
|
1352 | 1392 | $ hg log --template='{rev}:{node}\n' |
|
1353 | 1393 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1354 | 1394 | $ hg log --template='{rev}:{node}\n' --hidden |
|
1355 | 1395 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1356 | 1396 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1357 | 1397 | $ hg log -r a |
|
1358 | 1398 | abort: unknown revision 'a'! |
|
1359 | 1399 | [255] |
|
1360 | 1400 | |
|
1361 | 1401 | test that parent prevent a changeset to be hidden |
|
1362 | 1402 | |
|
1363 | 1403 | $ hg up 1 -q --hidden |
|
1364 | 1404 | $ hg log --template='{rev}:{node}\n' |
|
1365 | 1405 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1366 | 1406 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1367 | 1407 | |
|
1368 | 1408 | test that second parent prevent a changeset to be hidden too |
|
1369 | 1409 | |
|
1370 | 1410 | $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
1371 | 1411 | $ hg log --template='{rev}:{node}\n' |
|
1372 | 1412 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1373 | 1413 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1374 | 1414 | $ hg debugsetparents 1 |
|
1375 | 1415 | $ hg up -q null |
|
1376 | 1416 | |
|
1377 | 1417 | bookmarks prevent a changeset being hidden |
|
1378 | 1418 | |
|
1379 | 1419 | $ hg bookmark --hidden -r 1 X |
|
1380 | 1420 | $ hg log --template '{rev}:{node}\n' |
|
1381 | 1421 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1382 | 1422 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1383 | 1423 | $ hg bookmark -d X |
|
1384 | 1424 | |
|
1385 | 1425 | divergent bookmarks are not hidden |
|
1386 | 1426 | |
|
1387 | 1427 | $ hg bookmark --hidden -r 1 X@foo |
|
1388 | 1428 | $ hg log --template '{rev}:{node}\n' |
|
1389 | 1429 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1390 | 1430 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1391 | 1431 | |
|
1392 | 1432 | clear extensions configuration |
|
1393 | 1433 | $ echo '[extensions]' >> $HGRCPATH |
|
1394 | 1434 | $ echo "obs=!" >> $HGRCPATH |
|
1395 | 1435 | $ cd .. |
|
1396 | 1436 | |
|
1397 | 1437 | test -u/-k for problematic encoding |
|
1398 | 1438 | # unicode: cp932: |
|
1399 | 1439 | # u30A2 0x83 0x41(= 'A') |
|
1400 | 1440 | # u30C2 0x83 0x61(= 'a') |
|
1401 | 1441 | |
|
1402 | 1442 | $ hg init problematicencoding |
|
1403 | 1443 | $ cd problematicencoding |
|
1404 | 1444 | |
|
1405 | 1445 | $ python > setup.sh <<EOF |
|
1406 | 1446 | > print u''' |
|
1407 | 1447 | > echo a > text |
|
1408 | 1448 | > hg add text |
|
1409 | 1449 | > hg --encoding utf-8 commit -u '\u30A2' -m none |
|
1410 | 1450 | > echo b > text |
|
1411 | 1451 | > hg --encoding utf-8 commit -u '\u30C2' -m none |
|
1412 | 1452 | > echo c > text |
|
1413 | 1453 | > hg --encoding utf-8 commit -u none -m '\u30A2' |
|
1414 | 1454 | > echo d > text |
|
1415 | 1455 | > hg --encoding utf-8 commit -u none -m '\u30C2' |
|
1416 | 1456 | > '''.encode('utf-8') |
|
1417 | 1457 | > EOF |
|
1418 | 1458 | $ sh < setup.sh |
|
1419 | 1459 | |
|
1420 | 1460 | test in problematic encoding |
|
1421 | 1461 | $ python > test.sh <<EOF |
|
1422 | 1462 | > print u''' |
|
1423 | 1463 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
|
1424 | 1464 | > echo ==== |
|
1425 | 1465 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
|
1426 | 1466 | > echo ==== |
|
1427 | 1467 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
|
1428 | 1468 | > echo ==== |
|
1429 | 1469 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
|
1430 | 1470 | > '''.encode('cp932') |
|
1431 | 1471 | > EOF |
|
1432 | 1472 | $ sh < test.sh |
|
1433 | 1473 | 0 |
|
1434 | 1474 | ==== |
|
1435 | 1475 | 1 |
|
1436 | 1476 | ==== |
|
1437 | 1477 | 2 |
|
1438 | 1478 | 0 |
|
1439 | 1479 | ==== |
|
1440 | 1480 | 3 |
|
1441 | 1481 | 1 |
|
1442 | 1482 | |
|
1443 | 1483 | $ cd .. |
|
1444 | 1484 | |
|
1445 | 1485 | test hg log on non-existent files and on directories |
|
1446 | 1486 | $ hg init issue1340 |
|
1447 | 1487 | $ cd issue1340 |
|
1448 | 1488 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
|
1449 | 1489 | $ echo 1 > d1/f1 |
|
1450 | 1490 | $ echo 1 > D2/f1 |
|
1451 | 1491 | $ echo 1 > D3.i/f1 |
|
1452 | 1492 | $ echo 1 > d4.hg/f1 |
|
1453 | 1493 | $ echo 1 > d5.d/f1 |
|
1454 | 1494 | $ echo 1 > .d6/f1 |
|
1455 | 1495 | $ hg -q add . |
|
1456 | 1496 | $ hg commit -m "a bunch of weird directories" |
|
1457 | 1497 | $ hg log -l1 d1/f1 | grep changeset |
|
1458 | 1498 | changeset: 0:65624cd9070a |
|
1459 | 1499 | $ hg log -l1 f1 |
|
1460 | 1500 | $ hg log -l1 . | grep changeset |
|
1461 | 1501 | changeset: 0:65624cd9070a |
|
1462 | 1502 | $ hg log -l1 ./ | grep changeset |
|
1463 | 1503 | changeset: 0:65624cd9070a |
|
1464 | 1504 | $ hg log -l1 d1 | grep changeset |
|
1465 | 1505 | changeset: 0:65624cd9070a |
|
1466 | 1506 | $ hg log -l1 D2 | grep changeset |
|
1467 | 1507 | changeset: 0:65624cd9070a |
|
1468 | 1508 | $ hg log -l1 D2/f1 | grep changeset |
|
1469 | 1509 | changeset: 0:65624cd9070a |
|
1470 | 1510 | $ hg log -l1 D3.i | grep changeset |
|
1471 | 1511 | changeset: 0:65624cd9070a |
|
1472 | 1512 | $ hg log -l1 D3.i/f1 | grep changeset |
|
1473 | 1513 | changeset: 0:65624cd9070a |
|
1474 | 1514 | $ hg log -l1 d4.hg | grep changeset |
|
1475 | 1515 | changeset: 0:65624cd9070a |
|
1476 | 1516 | $ hg log -l1 d4.hg/f1 | grep changeset |
|
1477 | 1517 | changeset: 0:65624cd9070a |
|
1478 | 1518 | $ hg log -l1 d5.d | grep changeset |
|
1479 | 1519 | changeset: 0:65624cd9070a |
|
1480 | 1520 | $ hg log -l1 d5.d/f1 | grep changeset |
|
1481 | 1521 | changeset: 0:65624cd9070a |
|
1482 | 1522 | $ hg log -l1 .d6 | grep changeset |
|
1483 | 1523 | changeset: 0:65624cd9070a |
|
1484 | 1524 | $ hg log -l1 .d6/f1 | grep changeset |
|
1485 | 1525 | changeset: 0:65624cd9070a |
|
1486 | 1526 | |
|
1487 | 1527 | issue3772: hg log -r :null showing revision 0 as well |
|
1488 | 1528 | |
|
1489 | 1529 | $ hg log -r :null |
|
1490 | 1530 | changeset: 0:65624cd9070a |
|
1491 | 1531 | tag: tip |
|
1492 | 1532 | user: test |
|
1493 | 1533 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1494 | 1534 | summary: a bunch of weird directories |
|
1495 | 1535 | |
|
1496 | 1536 | changeset: -1:000000000000 |
|
1497 | 1537 | user: |
|
1498 | 1538 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1499 | 1539 | |
|
1500 | 1540 | $ hg log -r null:null |
|
1501 | 1541 | changeset: -1:000000000000 |
|
1502 | 1542 | user: |
|
1503 | 1543 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1504 | 1544 | |
|
1505 | 1545 | |
|
1506 | 1546 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now