Show More
@@ -1,322 +1,323 b'' | |||
|
1 | 1 | # archival.py - revision archival for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.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 i18n import _ |
|
9 | 9 | import match as matchmod |
|
10 | 10 | import cmdutil |
|
11 | 11 | import scmutil, util, encoding |
|
12 | 12 | import cStringIO, os, tarfile, time, zipfile |
|
13 | 13 | import zlib, gzip |
|
14 | 14 | import struct |
|
15 | 15 | import error |
|
16 | 16 | |
|
17 | 17 | # from unzip source code: |
|
18 | 18 | _UNX_IFREG = 0x8000 |
|
19 | 19 | _UNX_IFLNK = 0xa000 |
|
20 | 20 | |
|
21 | 21 | def tidyprefix(dest, kind, prefix): |
|
22 | 22 | '''choose prefix to use for names in archive. make sure prefix is |
|
23 | 23 | safe for consumers.''' |
|
24 | 24 | |
|
25 | 25 | if prefix: |
|
26 | 26 | prefix = util.normpath(prefix) |
|
27 | 27 | else: |
|
28 | 28 | if not isinstance(dest, str): |
|
29 | 29 | raise ValueError('dest must be string if no prefix') |
|
30 | 30 | prefix = os.path.basename(dest) |
|
31 | 31 | lower = prefix.lower() |
|
32 | 32 | for sfx in exts.get(kind, []): |
|
33 | 33 | if lower.endswith(sfx): |
|
34 | 34 | prefix = prefix[:-len(sfx)] |
|
35 | 35 | break |
|
36 | 36 | lpfx = os.path.normpath(util.localpath(prefix)) |
|
37 | 37 | prefix = util.pconvert(lpfx) |
|
38 | 38 | if not prefix.endswith('/'): |
|
39 | 39 | prefix += '/' |
|
40 | 40 | if prefix.startswith('../') or os.path.isabs(lpfx) or '/../' in prefix: |
|
41 | 41 | raise util.Abort(_('archive prefix contains illegal components')) |
|
42 | 42 | return prefix |
|
43 | 43 | |
|
44 | 44 | exts = { |
|
45 | 45 | 'tar': ['.tar'], |
|
46 | 46 | 'tbz2': ['.tbz2', '.tar.bz2'], |
|
47 | 47 | 'tgz': ['.tgz', '.tar.gz'], |
|
48 | 48 | 'zip': ['.zip'], |
|
49 | 49 | } |
|
50 | 50 | |
|
51 | 51 | def guesskind(dest): |
|
52 | 52 | for kind, extensions in exts.iteritems(): |
|
53 | 53 | if util.any(dest.endswith(ext) for ext in extensions): |
|
54 | 54 | return kind |
|
55 | 55 | return None |
|
56 | 56 | |
|
57 | 57 | def _rootctx(repo): |
|
58 | 58 | # repo[0] may be hidden |
|
59 | 59 | for rev in repo: |
|
60 | 60 | return repo[rev] |
|
61 | 61 | return repo['null'] |
|
62 | 62 | |
|
63 | 63 | def buildmetadata(ctx): |
|
64 | 64 | '''build content of .hg_archival.txt''' |
|
65 | 65 | repo = ctx.repo() |
|
66 | 66 | base = 'repo: %s\nnode: %s\nbranch: %s\n' % ( |
|
67 | 67 | _rootctx(repo).hex(), ctx.hex(), encoding.fromlocal(ctx.branch())) |
|
68 | 68 | |
|
69 | 69 | tags = ''.join('tag: %s\n' % t for t in ctx.tags() |
|
70 | 70 | if repo.tagtype(t) == 'global') |
|
71 | 71 | if not tags: |
|
72 | 72 | repo.ui.pushbuffer() |
|
73 | 73 | opts = {'template': '{latesttag}\n{latesttagdistance}', |
|
74 | 74 | 'style': '', 'patch': None, 'git': None} |
|
75 | 75 | cmdutil.show_changeset(repo.ui, repo, opts).show(ctx) |
|
76 | 76 | ltags, dist = repo.ui.popbuffer().split('\n') |
|
77 | 77 | ltags = ltags.split(':') |
|
78 | changessince = len(repo.revs('only(.,%s)', ltags[0])) | |
|
78 | # XXX: ctx.rev() needs to be handled differently with wdir() | |
|
79 | changessince = len(repo.revs('only(%d,%s)', ctx.rev(), ltags[0])) | |
|
79 | 80 | tags = ''.join('latesttag: %s\n' % t for t in ltags) |
|
80 | 81 | tags += 'latesttagdistance: %s\n' % dist |
|
81 | 82 | tags += 'changessincelatesttag: %s\n' % changessince |
|
82 | 83 | |
|
83 | 84 | return base + tags |
|
84 | 85 | |
|
85 | 86 | class tarit(object): |
|
86 | 87 | '''write archive to tar file or stream. can write uncompressed, |
|
87 | 88 | or compress with gzip or bzip2.''' |
|
88 | 89 | |
|
89 | 90 | class GzipFileWithTime(gzip.GzipFile): |
|
90 | 91 | |
|
91 | 92 | def __init__(self, *args, **kw): |
|
92 | 93 | timestamp = None |
|
93 | 94 | if 'timestamp' in kw: |
|
94 | 95 | timestamp = kw.pop('timestamp') |
|
95 | 96 | if timestamp is None: |
|
96 | 97 | self.timestamp = time.time() |
|
97 | 98 | else: |
|
98 | 99 | self.timestamp = timestamp |
|
99 | 100 | gzip.GzipFile.__init__(self, *args, **kw) |
|
100 | 101 | |
|
101 | 102 | def _write_gzip_header(self): |
|
102 | 103 | self.fileobj.write('\037\213') # magic header |
|
103 | 104 | self.fileobj.write('\010') # compression method |
|
104 | 105 | # Python 2.6 introduced self.name and deprecated self.filename |
|
105 | 106 | try: |
|
106 | 107 | fname = self.name |
|
107 | 108 | except AttributeError: |
|
108 | 109 | fname = self.filename |
|
109 | 110 | if fname and fname.endswith('.gz'): |
|
110 | 111 | fname = fname[:-3] |
|
111 | 112 | flags = 0 |
|
112 | 113 | if fname: |
|
113 | 114 | flags = gzip.FNAME |
|
114 | 115 | self.fileobj.write(chr(flags)) |
|
115 | 116 | gzip.write32u(self.fileobj, long(self.timestamp)) |
|
116 | 117 | self.fileobj.write('\002') |
|
117 | 118 | self.fileobj.write('\377') |
|
118 | 119 | if fname: |
|
119 | 120 | self.fileobj.write(fname + '\000') |
|
120 | 121 | |
|
121 | 122 | def __init__(self, dest, mtime, kind=''): |
|
122 | 123 | self.mtime = mtime |
|
123 | 124 | self.fileobj = None |
|
124 | 125 | |
|
125 | 126 | def taropen(name, mode, fileobj=None): |
|
126 | 127 | if kind == 'gz': |
|
127 | 128 | mode = mode[0] |
|
128 | 129 | if not fileobj: |
|
129 | 130 | fileobj = open(name, mode + 'b') |
|
130 | 131 | gzfileobj = self.GzipFileWithTime(name, mode + 'b', |
|
131 | 132 | zlib.Z_BEST_COMPRESSION, |
|
132 | 133 | fileobj, timestamp=mtime) |
|
133 | 134 | self.fileobj = gzfileobj |
|
134 | 135 | return tarfile.TarFile.taropen(name, mode, gzfileobj) |
|
135 | 136 | else: |
|
136 | 137 | return tarfile.open(name, mode + kind, fileobj) |
|
137 | 138 | |
|
138 | 139 | if isinstance(dest, str): |
|
139 | 140 | self.z = taropen(dest, mode='w:') |
|
140 | 141 | else: |
|
141 | 142 | # Python 2.5-2.5.1 have a regression that requires a name arg |
|
142 | 143 | self.z = taropen(name='', mode='w|', fileobj=dest) |
|
143 | 144 | |
|
144 | 145 | def addfile(self, name, mode, islink, data): |
|
145 | 146 | i = tarfile.TarInfo(name) |
|
146 | 147 | i.mtime = self.mtime |
|
147 | 148 | i.size = len(data) |
|
148 | 149 | if islink: |
|
149 | 150 | i.type = tarfile.SYMTYPE |
|
150 | 151 | i.mode = 0777 |
|
151 | 152 | i.linkname = data |
|
152 | 153 | data = None |
|
153 | 154 | i.size = 0 |
|
154 | 155 | else: |
|
155 | 156 | i.mode = mode |
|
156 | 157 | data = cStringIO.StringIO(data) |
|
157 | 158 | self.z.addfile(i, data) |
|
158 | 159 | |
|
159 | 160 | def done(self): |
|
160 | 161 | self.z.close() |
|
161 | 162 | if self.fileobj: |
|
162 | 163 | self.fileobj.close() |
|
163 | 164 | |
|
164 | 165 | class tellable(object): |
|
165 | 166 | '''provide tell method for zipfile.ZipFile when writing to http |
|
166 | 167 | response file object.''' |
|
167 | 168 | |
|
168 | 169 | def __init__(self, fp): |
|
169 | 170 | self.fp = fp |
|
170 | 171 | self.offset = 0 |
|
171 | 172 | |
|
172 | 173 | def __getattr__(self, key): |
|
173 | 174 | return getattr(self.fp, key) |
|
174 | 175 | |
|
175 | 176 | def write(self, s): |
|
176 | 177 | self.fp.write(s) |
|
177 | 178 | self.offset += len(s) |
|
178 | 179 | |
|
179 | 180 | def tell(self): |
|
180 | 181 | return self.offset |
|
181 | 182 | |
|
182 | 183 | class zipit(object): |
|
183 | 184 | '''write archive to zip file or stream. can write uncompressed, |
|
184 | 185 | or compressed with deflate.''' |
|
185 | 186 | |
|
186 | 187 | def __init__(self, dest, mtime, compress=True): |
|
187 | 188 | if not isinstance(dest, str): |
|
188 | 189 | try: |
|
189 | 190 | dest.tell() |
|
190 | 191 | except (AttributeError, IOError): |
|
191 | 192 | dest = tellable(dest) |
|
192 | 193 | self.z = zipfile.ZipFile(dest, 'w', |
|
193 | 194 | compress and zipfile.ZIP_DEFLATED or |
|
194 | 195 | zipfile.ZIP_STORED) |
|
195 | 196 | |
|
196 | 197 | # Python's zipfile module emits deprecation warnings if we try |
|
197 | 198 | # to store files with a date before 1980. |
|
198 | 199 | epoch = 315532800 # calendar.timegm((1980, 1, 1, 0, 0, 0, 1, 1, 0)) |
|
199 | 200 | if mtime < epoch: |
|
200 | 201 | mtime = epoch |
|
201 | 202 | |
|
202 | 203 | self.mtime = mtime |
|
203 | 204 | self.date_time = time.gmtime(mtime)[:6] |
|
204 | 205 | |
|
205 | 206 | def addfile(self, name, mode, islink, data): |
|
206 | 207 | i = zipfile.ZipInfo(name, self.date_time) |
|
207 | 208 | i.compress_type = self.z.compression |
|
208 | 209 | # unzip will not honor unix file modes unless file creator is |
|
209 | 210 | # set to unix (id 3). |
|
210 | 211 | i.create_system = 3 |
|
211 | 212 | ftype = _UNX_IFREG |
|
212 | 213 | if islink: |
|
213 | 214 | mode = 0777 |
|
214 | 215 | ftype = _UNX_IFLNK |
|
215 | 216 | i.external_attr = (mode | ftype) << 16L |
|
216 | 217 | # add "extended-timestamp" extra block, because zip archives |
|
217 | 218 | # without this will be extracted with unexpected timestamp, |
|
218 | 219 | # if TZ is not configured as GMT |
|
219 | 220 | i.extra += struct.pack('<hhBl', |
|
220 | 221 | 0x5455, # block type: "extended-timestamp" |
|
221 | 222 | 1 + 4, # size of this block |
|
222 | 223 | 1, # "modification time is present" |
|
223 | 224 | int(self.mtime)) # last modification (UTC) |
|
224 | 225 | self.z.writestr(i, data) |
|
225 | 226 | |
|
226 | 227 | def done(self): |
|
227 | 228 | self.z.close() |
|
228 | 229 | |
|
229 | 230 | class fileit(object): |
|
230 | 231 | '''write archive as files in directory.''' |
|
231 | 232 | |
|
232 | 233 | def __init__(self, name, mtime): |
|
233 | 234 | self.basedir = name |
|
234 | 235 | self.opener = scmutil.opener(self.basedir) |
|
235 | 236 | |
|
236 | 237 | def addfile(self, name, mode, islink, data): |
|
237 | 238 | if islink: |
|
238 | 239 | self.opener.symlink(data, name) |
|
239 | 240 | return |
|
240 | 241 | f = self.opener(name, "w", atomictemp=True) |
|
241 | 242 | f.write(data) |
|
242 | 243 | f.close() |
|
243 | 244 | destfile = os.path.join(self.basedir, name) |
|
244 | 245 | os.chmod(destfile, mode) |
|
245 | 246 | |
|
246 | 247 | def done(self): |
|
247 | 248 | pass |
|
248 | 249 | |
|
249 | 250 | archivers = { |
|
250 | 251 | 'files': fileit, |
|
251 | 252 | 'tar': tarit, |
|
252 | 253 | 'tbz2': lambda name, mtime: tarit(name, mtime, 'bz2'), |
|
253 | 254 | 'tgz': lambda name, mtime: tarit(name, mtime, 'gz'), |
|
254 | 255 | 'uzip': lambda name, mtime: zipit(name, mtime, False), |
|
255 | 256 | 'zip': zipit, |
|
256 | 257 | } |
|
257 | 258 | |
|
258 | 259 | def archive(repo, dest, node, kind, decode=True, matchfn=None, |
|
259 | 260 | prefix='', mtime=None, subrepos=False): |
|
260 | 261 | '''create archive of repo as it was at node. |
|
261 | 262 | |
|
262 | 263 | dest can be name of directory, name of archive file, or file |
|
263 | 264 | object to write archive to. |
|
264 | 265 | |
|
265 | 266 | kind is type of archive to create. |
|
266 | 267 | |
|
267 | 268 | decode tells whether to put files through decode filters from |
|
268 | 269 | hgrc. |
|
269 | 270 | |
|
270 | 271 | matchfn is function to filter names of files to write to archive. |
|
271 | 272 | |
|
272 | 273 | prefix is name of path to put before every archive member.''' |
|
273 | 274 | |
|
274 | 275 | if kind == 'files': |
|
275 | 276 | if prefix: |
|
276 | 277 | raise util.Abort(_('cannot give prefix when archiving to files')) |
|
277 | 278 | else: |
|
278 | 279 | prefix = tidyprefix(dest, kind, prefix) |
|
279 | 280 | |
|
280 | 281 | def write(name, mode, islink, getdata): |
|
281 | 282 | data = getdata() |
|
282 | 283 | if decode: |
|
283 | 284 | data = repo.wwritedata(name, data) |
|
284 | 285 | archiver.addfile(prefix + name, mode, islink, data) |
|
285 | 286 | |
|
286 | 287 | if kind not in archivers: |
|
287 | 288 | raise util.Abort(_("unknown archive type '%s'") % kind) |
|
288 | 289 | |
|
289 | 290 | ctx = repo[node] |
|
290 | 291 | archiver = archivers[kind](dest, mtime or ctx.date()[0]) |
|
291 | 292 | |
|
292 | 293 | if repo.ui.configbool("ui", "archivemeta", True): |
|
293 | 294 | name = '.hg_archival.txt' |
|
294 | 295 | if not matchfn or matchfn(name): |
|
295 | 296 | write(name, 0644, False, lambda: buildmetadata(ctx)) |
|
296 | 297 | |
|
297 | 298 | if matchfn: |
|
298 | 299 | files = [f for f in ctx.manifest().keys() if matchfn(f)] |
|
299 | 300 | else: |
|
300 | 301 | files = ctx.manifest().keys() |
|
301 | 302 | total = len(files) |
|
302 | 303 | if total: |
|
303 | 304 | files.sort() |
|
304 | 305 | repo.ui.progress(_('archiving'), 0, unit=_('files'), total=total) |
|
305 | 306 | for i, f in enumerate(files): |
|
306 | 307 | ff = ctx.flags(f) |
|
307 | 308 | write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data) |
|
308 | 309 | repo.ui.progress(_('archiving'), i + 1, item=f, |
|
309 | 310 | unit=_('files'), total=total) |
|
310 | 311 | repo.ui.progress(_('archiving'), None) |
|
311 | 312 | |
|
312 | 313 | if subrepos: |
|
313 | 314 | for subpath in sorted(ctx.substate): |
|
314 | 315 | sub = ctx.sub(subpath) |
|
315 | 316 | submatch = matchmod.narrowmatcher(subpath, matchfn) |
|
316 | 317 | total += sub.archive(archiver, prefix, submatch) |
|
317 | 318 | |
|
318 | 319 | if total == 0: |
|
319 | 320 | raise error.Abort(_('no files match the archive pattern')) |
|
320 | 321 | |
|
321 | 322 | archiver.done() |
|
322 | 323 | return total |
@@ -1,2386 +1,2396 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 | $ testlog -rnull |
|
1545 | 1545 | ['null'] |
|
1546 | 1546 | [] |
|
1547 | 1547 | $ echo a > a |
|
1548 | 1548 | $ echo aa > aa |
|
1549 | 1549 | $ echo f > f |
|
1550 | 1550 | $ hg ci -Am "add a" a aa f |
|
1551 | 1551 | $ hg cp a b |
|
1552 | 1552 | $ hg cp f g |
|
1553 | 1553 | $ hg ci -m "copy a b" |
|
1554 | 1554 | $ mkdir dir |
|
1555 | 1555 | $ hg mv b dir |
|
1556 | 1556 | $ echo g >> g |
|
1557 | 1557 | $ echo f >> f |
|
1558 | 1558 | $ hg ci -m "mv b dir/b" |
|
1559 | 1559 | $ hg mv a b |
|
1560 | 1560 | $ hg cp -f f g |
|
1561 | 1561 | $ echo a > d |
|
1562 | 1562 | $ hg add d |
|
1563 | 1563 | $ hg ci -m "mv a b; add d" |
|
1564 | 1564 | $ hg mv dir/b e |
|
1565 | 1565 | $ hg ci -m "mv dir/b e" |
|
1566 | 1566 | $ hg log -G --template '({rev}) {desc|firstline}\n' |
|
1567 | 1567 | @ (4) mv dir/b e |
|
1568 | 1568 | | |
|
1569 | 1569 | o (3) mv a b; add d |
|
1570 | 1570 | | |
|
1571 | 1571 | o (2) mv b dir/b |
|
1572 | 1572 | | |
|
1573 | 1573 | o (1) copy a b |
|
1574 | 1574 | | |
|
1575 | 1575 | o (0) add a |
|
1576 | 1576 | |
|
1577 | 1577 | |
|
1578 | 1578 | $ testlog a |
|
1579 | 1579 | [] |
|
1580 | 1580 | (group |
|
1581 | 1581 | (group |
|
1582 | 1582 | (func |
|
1583 | 1583 | ('symbol', 'filelog') |
|
1584 | 1584 | ('string', 'a')))) |
|
1585 | 1585 | $ testlog a b |
|
1586 | 1586 | [] |
|
1587 | 1587 | (group |
|
1588 | 1588 | (group |
|
1589 | 1589 | (or |
|
1590 | 1590 | (func |
|
1591 | 1591 | ('symbol', 'filelog') |
|
1592 | 1592 | ('string', 'a')) |
|
1593 | 1593 | (func |
|
1594 | 1594 | ('symbol', 'filelog') |
|
1595 | 1595 | ('string', 'b'))))) |
|
1596 | 1596 | |
|
1597 | 1597 | Test falling back to slow path for non-existing files |
|
1598 | 1598 | |
|
1599 | 1599 | $ testlog a c |
|
1600 | 1600 | [] |
|
1601 | 1601 | (group |
|
1602 | 1602 | (func |
|
1603 | 1603 | ('symbol', '_matchfiles') |
|
1604 | 1604 | (list |
|
1605 | 1605 | (list |
|
1606 | 1606 | (list |
|
1607 | 1607 | ('string', 'r:') |
|
1608 | 1608 | ('string', 'd:relpath')) |
|
1609 | 1609 | ('string', 'p:a')) |
|
1610 | 1610 | ('string', 'p:c')))) |
|
1611 | 1611 | |
|
1612 | 1612 | Test multiple --include/--exclude/paths |
|
1613 | 1613 | |
|
1614 | 1614 | $ testlog --include a --include e --exclude b --exclude e a e |
|
1615 | 1615 | [] |
|
1616 | 1616 | (group |
|
1617 | 1617 | (func |
|
1618 | 1618 | ('symbol', '_matchfiles') |
|
1619 | 1619 | (list |
|
1620 | 1620 | (list |
|
1621 | 1621 | (list |
|
1622 | 1622 | (list |
|
1623 | 1623 | (list |
|
1624 | 1624 | (list |
|
1625 | 1625 | (list |
|
1626 | 1626 | ('string', 'r:') |
|
1627 | 1627 | ('string', 'd:relpath')) |
|
1628 | 1628 | ('string', 'p:a')) |
|
1629 | 1629 | ('string', 'p:e')) |
|
1630 | 1630 | ('string', 'i:a')) |
|
1631 | 1631 | ('string', 'i:e')) |
|
1632 | 1632 | ('string', 'x:b')) |
|
1633 | 1633 | ('string', 'x:e')))) |
|
1634 | 1634 | |
|
1635 | 1635 | Test glob expansion of pats |
|
1636 | 1636 | |
|
1637 | 1637 | $ expandglobs=`$PYTHON -c "import mercurial.util; \ |
|
1638 | 1638 | > print mercurial.util.expandglobs and 'true' or 'false'"` |
|
1639 | 1639 | $ if [ $expandglobs = "true" ]; then |
|
1640 | 1640 | > testlog 'a*'; |
|
1641 | 1641 | > else |
|
1642 | 1642 | > testlog a*; |
|
1643 | 1643 | > fi; |
|
1644 | 1644 | [] |
|
1645 | 1645 | (group |
|
1646 | 1646 | (group |
|
1647 | 1647 | (func |
|
1648 | 1648 | ('symbol', 'filelog') |
|
1649 | 1649 | ('string', 'aa')))) |
|
1650 | 1650 | |
|
1651 | 1651 | Test --follow on a non-existent directory |
|
1652 | 1652 | |
|
1653 | 1653 | $ testlog -f dir |
|
1654 | 1654 | abort: cannot follow file not in parent revision: "dir" |
|
1655 | 1655 | abort: cannot follow file not in parent revision: "dir" |
|
1656 | 1656 | abort: cannot follow file not in parent revision: "dir" |
|
1657 | 1657 | |
|
1658 | 1658 | Test --follow on a directory |
|
1659 | 1659 | |
|
1660 | 1660 | $ hg up -q '.^' |
|
1661 | 1661 | $ testlog -f dir |
|
1662 | 1662 | [] |
|
1663 | 1663 | (group |
|
1664 | 1664 | (and |
|
1665 | 1665 | (func |
|
1666 | 1666 | ('symbol', 'ancestors') |
|
1667 | 1667 | ('symbol', '.')) |
|
1668 | 1668 | (func |
|
1669 | 1669 | ('symbol', '_matchfiles') |
|
1670 | 1670 | (list |
|
1671 | 1671 | (list |
|
1672 | 1672 | ('string', 'r:') |
|
1673 | 1673 | ('string', 'd:relpath')) |
|
1674 | 1674 | ('string', 'p:dir'))))) |
|
1675 | 1675 | $ hg up -q tip |
|
1676 | 1676 | |
|
1677 | 1677 | Test --follow on file not in parent revision |
|
1678 | 1678 | |
|
1679 | 1679 | $ testlog -f a |
|
1680 | 1680 | abort: cannot follow file not in parent revision: "a" |
|
1681 | 1681 | abort: cannot follow file not in parent revision: "a" |
|
1682 | 1682 | abort: cannot follow file not in parent revision: "a" |
|
1683 | 1683 | |
|
1684 | 1684 | Test --follow and patterns |
|
1685 | 1685 | |
|
1686 | 1686 | $ testlog -f 'glob:*' |
|
1687 | 1687 | [] |
|
1688 | 1688 | (group |
|
1689 | 1689 | (and |
|
1690 | 1690 | (func |
|
1691 | 1691 | ('symbol', 'ancestors') |
|
1692 | 1692 | ('symbol', '.')) |
|
1693 | 1693 | (func |
|
1694 | 1694 | ('symbol', '_matchfiles') |
|
1695 | 1695 | (list |
|
1696 | 1696 | (list |
|
1697 | 1697 | ('string', 'r:') |
|
1698 | 1698 | ('string', 'd:relpath')) |
|
1699 | 1699 | ('string', 'p:glob:*'))))) |
|
1700 | 1700 | |
|
1701 | 1701 | Test --follow on a single rename |
|
1702 | 1702 | |
|
1703 | 1703 | $ hg up -q 2 |
|
1704 | 1704 | $ testlog -f a |
|
1705 | 1705 | [] |
|
1706 | 1706 | (group |
|
1707 | 1707 | (group |
|
1708 | 1708 | (func |
|
1709 | 1709 | ('symbol', 'follow') |
|
1710 | 1710 | ('string', 'a')))) |
|
1711 | 1711 | |
|
1712 | 1712 | Test --follow and multiple renames |
|
1713 | 1713 | |
|
1714 | 1714 | $ hg up -q tip |
|
1715 | 1715 | $ testlog -f e |
|
1716 | 1716 | [] |
|
1717 | 1717 | (group |
|
1718 | 1718 | (group |
|
1719 | 1719 | (func |
|
1720 | 1720 | ('symbol', 'follow') |
|
1721 | 1721 | ('string', 'e')))) |
|
1722 | 1722 | |
|
1723 | 1723 | Test --follow and multiple filelog heads |
|
1724 | 1724 | |
|
1725 | 1725 | $ hg up -q 2 |
|
1726 | 1726 | $ testlog -f g |
|
1727 | 1727 | [] |
|
1728 | 1728 | (group |
|
1729 | 1729 | (group |
|
1730 | 1730 | (func |
|
1731 | 1731 | ('symbol', 'follow') |
|
1732 | 1732 | ('string', 'g')))) |
|
1733 | 1733 | $ cat log.nodes |
|
1734 | 1734 | nodetag 2 |
|
1735 | 1735 | nodetag 1 |
|
1736 | 1736 | nodetag 0 |
|
1737 | 1737 | $ hg up -q tip |
|
1738 | 1738 | $ testlog -f g |
|
1739 | 1739 | [] |
|
1740 | 1740 | (group |
|
1741 | 1741 | (group |
|
1742 | 1742 | (func |
|
1743 | 1743 | ('symbol', 'follow') |
|
1744 | 1744 | ('string', 'g')))) |
|
1745 | 1745 | $ cat log.nodes |
|
1746 | 1746 | nodetag 3 |
|
1747 | 1747 | nodetag 2 |
|
1748 | 1748 | nodetag 0 |
|
1749 | 1749 | |
|
1750 | 1750 | Test --follow and multiple files |
|
1751 | 1751 | |
|
1752 | 1752 | $ testlog -f g e |
|
1753 | 1753 | [] |
|
1754 | 1754 | (group |
|
1755 | 1755 | (group |
|
1756 | 1756 | (or |
|
1757 | 1757 | (func |
|
1758 | 1758 | ('symbol', 'follow') |
|
1759 | 1759 | ('string', 'g')) |
|
1760 | 1760 | (func |
|
1761 | 1761 | ('symbol', 'follow') |
|
1762 | 1762 | ('string', 'e'))))) |
|
1763 | 1763 | $ cat log.nodes |
|
1764 | 1764 | nodetag 4 |
|
1765 | 1765 | nodetag 3 |
|
1766 | 1766 | nodetag 2 |
|
1767 | 1767 | nodetag 1 |
|
1768 | 1768 | nodetag 0 |
|
1769 | 1769 | |
|
1770 | 1770 | Test --follow null parent |
|
1771 | 1771 | |
|
1772 | 1772 | $ hg up -q null |
|
1773 | 1773 | $ testlog -f |
|
1774 | 1774 | [] |
|
1775 | 1775 | [] |
|
1776 | 1776 | |
|
1777 | 1777 | Test --follow-first |
|
1778 | 1778 | |
|
1779 | 1779 | $ hg up -q 3 |
|
1780 | 1780 | $ echo ee > e |
|
1781 | 1781 | $ hg ci -Am "add another e" e |
|
1782 | 1782 | created new head |
|
1783 | 1783 | $ hg merge --tool internal:other 4 |
|
1784 | 1784 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
1785 | 1785 | (branch merge, don't forget to commit) |
|
1786 | 1786 | $ echo merge > e |
|
1787 | 1787 | $ hg ci -m "merge 5 and 4" |
|
1788 | 1788 | $ testlog --follow-first |
|
1789 | 1789 | [] |
|
1790 | 1790 | (group |
|
1791 | 1791 | (func |
|
1792 | 1792 | ('symbol', '_firstancestors') |
|
1793 | 1793 | (func |
|
1794 | 1794 | ('symbol', 'rev') |
|
1795 | 1795 | ('symbol', '6')))) |
|
1796 | 1796 | |
|
1797 | 1797 | Cannot compare with log --follow-first FILE as it never worked |
|
1798 | 1798 | |
|
1799 | 1799 | $ hg log -G --print-revset --follow-first e |
|
1800 | 1800 | [] |
|
1801 | 1801 | (group |
|
1802 | 1802 | (group |
|
1803 | 1803 | (func |
|
1804 | 1804 | ('symbol', '_followfirst') |
|
1805 | 1805 | ('string', 'e')))) |
|
1806 | 1806 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
|
1807 | 1807 | @ 6 merge 5 and 4 |
|
1808 | 1808 | |\ |
|
1809 | 1809 | o | 5 add another e |
|
1810 | 1810 | | | |
|
1811 | 1811 | |
|
1812 | 1812 | Test --copies |
|
1813 | 1813 | |
|
1814 | 1814 | $ hg log -G --copies --template "{rev} {desc|firstline} \ |
|
1815 | 1815 | > copies: {file_copies_switch}\n" |
|
1816 | 1816 | @ 6 merge 5 and 4 copies: |
|
1817 | 1817 | |\ |
|
1818 | 1818 | | o 5 add another e copies: |
|
1819 | 1819 | | | |
|
1820 | 1820 | o | 4 mv dir/b e copies: e (dir/b) |
|
1821 | 1821 | |/ |
|
1822 | 1822 | o 3 mv a b; add d copies: b (a)g (f) |
|
1823 | 1823 | | |
|
1824 | 1824 | o 2 mv b dir/b copies: dir/b (b) |
|
1825 | 1825 | | |
|
1826 | 1826 | o 1 copy a b copies: b (a)g (f) |
|
1827 | 1827 | | |
|
1828 | 1828 | o 0 add a copies: |
|
1829 | 1829 | |
|
1830 | 1830 | Test "set:..." and parent revision |
|
1831 | 1831 | |
|
1832 | 1832 | $ hg up -q 4 |
|
1833 | 1833 | $ testlog "set:copied()" |
|
1834 | 1834 | [] |
|
1835 | 1835 | (group |
|
1836 | 1836 | (func |
|
1837 | 1837 | ('symbol', '_matchfiles') |
|
1838 | 1838 | (list |
|
1839 | 1839 | (list |
|
1840 | 1840 | ('string', 'r:') |
|
1841 | 1841 | ('string', 'd:relpath')) |
|
1842 | 1842 | ('string', 'p:set:copied()')))) |
|
1843 | 1843 | $ testlog --include "set:copied()" |
|
1844 | 1844 | [] |
|
1845 | 1845 | (group |
|
1846 | 1846 | (func |
|
1847 | 1847 | ('symbol', '_matchfiles') |
|
1848 | 1848 | (list |
|
1849 | 1849 | (list |
|
1850 | 1850 | ('string', 'r:') |
|
1851 | 1851 | ('string', 'd:relpath')) |
|
1852 | 1852 | ('string', 'i:set:copied()')))) |
|
1853 | 1853 | $ testlog -r "sort(file('set:copied()'), -rev)" |
|
1854 | 1854 | ["sort(file('set:copied()'), -rev)"] |
|
1855 | 1855 | [] |
|
1856 | 1856 | |
|
1857 | 1857 | Test --removed |
|
1858 | 1858 | |
|
1859 | 1859 | $ testlog --removed |
|
1860 | 1860 | [] |
|
1861 | 1861 | [] |
|
1862 | 1862 | $ testlog --removed a |
|
1863 | 1863 | [] |
|
1864 | 1864 | (group |
|
1865 | 1865 | (func |
|
1866 | 1866 | ('symbol', '_matchfiles') |
|
1867 | 1867 | (list |
|
1868 | 1868 | (list |
|
1869 | 1869 | ('string', 'r:') |
|
1870 | 1870 | ('string', 'd:relpath')) |
|
1871 | 1871 | ('string', 'p:a')))) |
|
1872 | 1872 | $ testlog --removed --follow a |
|
1873 | 1873 | [] |
|
1874 | 1874 | (group |
|
1875 | 1875 | (and |
|
1876 | 1876 | (func |
|
1877 | 1877 | ('symbol', 'ancestors') |
|
1878 | 1878 | ('symbol', '.')) |
|
1879 | 1879 | (func |
|
1880 | 1880 | ('symbol', '_matchfiles') |
|
1881 | 1881 | (list |
|
1882 | 1882 | (list |
|
1883 | 1883 | ('string', 'r:') |
|
1884 | 1884 | ('string', 'd:relpath')) |
|
1885 | 1885 | ('string', 'p:a'))))) |
|
1886 | 1886 | |
|
1887 | 1887 | Test --patch and --stat with --follow and --follow-first |
|
1888 | 1888 | |
|
1889 | 1889 | $ hg up -q 3 |
|
1890 | 1890 | $ hg log -G --git --patch b |
|
1891 | 1891 | o changeset: 1:216d4c92cf98 |
|
1892 | 1892 | | user: test |
|
1893 | 1893 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1894 | 1894 | | summary: copy a b |
|
1895 | 1895 | | |
|
1896 | 1896 | | diff --git a/a b/b |
|
1897 | 1897 | | copy from a |
|
1898 | 1898 | | copy to b |
|
1899 | 1899 | | |
|
1900 | 1900 | |
|
1901 | 1901 | $ hg log -G --git --stat b |
|
1902 | 1902 | o changeset: 1:216d4c92cf98 |
|
1903 | 1903 | | user: test |
|
1904 | 1904 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1905 | 1905 | | summary: copy a b |
|
1906 | 1906 | | |
|
1907 | 1907 | | b | 0 |
|
1908 | 1908 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
1909 | 1909 | | |
|
1910 | 1910 | |
|
1911 | 1911 | $ hg log -G --git --patch --follow b |
|
1912 | 1912 | o changeset: 1:216d4c92cf98 |
|
1913 | 1913 | | user: test |
|
1914 | 1914 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1915 | 1915 | | summary: copy a b |
|
1916 | 1916 | | |
|
1917 | 1917 | | diff --git a/a b/b |
|
1918 | 1918 | | copy from a |
|
1919 | 1919 | | copy to b |
|
1920 | 1920 | | |
|
1921 | 1921 | o changeset: 0:f8035bb17114 |
|
1922 | 1922 | user: test |
|
1923 | 1923 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1924 | 1924 | summary: add a |
|
1925 | 1925 | |
|
1926 | 1926 | diff --git a/a b/a |
|
1927 | 1927 | new file mode 100644 |
|
1928 | 1928 | --- /dev/null |
|
1929 | 1929 | +++ b/a |
|
1930 | 1930 | @@ -0,0 +1,1 @@ |
|
1931 | 1931 | +a |
|
1932 | 1932 | |
|
1933 | 1933 | |
|
1934 | 1934 | $ hg log -G --git --stat --follow b |
|
1935 | 1935 | o changeset: 1:216d4c92cf98 |
|
1936 | 1936 | | user: test |
|
1937 | 1937 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1938 | 1938 | | summary: copy a b |
|
1939 | 1939 | | |
|
1940 | 1940 | | b | 0 |
|
1941 | 1941 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
1942 | 1942 | | |
|
1943 | 1943 | o changeset: 0:f8035bb17114 |
|
1944 | 1944 | user: test |
|
1945 | 1945 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1946 | 1946 | summary: add a |
|
1947 | 1947 | |
|
1948 | 1948 | a | 1 + |
|
1949 | 1949 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
1950 | 1950 | |
|
1951 | 1951 | |
|
1952 | 1952 | $ hg up -q 6 |
|
1953 | 1953 | $ hg log -G --git --patch --follow-first e |
|
1954 | 1954 | @ changeset: 6:fc281d8ff18d |
|
1955 | 1955 | |\ tag: tip |
|
1956 | 1956 | | | parent: 5:99b31f1c2782 |
|
1957 | 1957 | | | parent: 4:17d952250a9d |
|
1958 | 1958 | | | user: test |
|
1959 | 1959 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1960 | 1960 | | | summary: merge 5 and 4 |
|
1961 | 1961 | | | |
|
1962 | 1962 | | | diff --git a/e b/e |
|
1963 | 1963 | | | --- a/e |
|
1964 | 1964 | | | +++ b/e |
|
1965 | 1965 | | | @@ -1,1 +1,1 @@ |
|
1966 | 1966 | | | -ee |
|
1967 | 1967 | | | +merge |
|
1968 | 1968 | | | |
|
1969 | 1969 | o | changeset: 5:99b31f1c2782 |
|
1970 | 1970 | | | parent: 3:5918b8d165d1 |
|
1971 | 1971 | | | user: test |
|
1972 | 1972 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1973 | 1973 | | | summary: add another e |
|
1974 | 1974 | | | |
|
1975 | 1975 | | | diff --git a/e b/e |
|
1976 | 1976 | | | new file mode 100644 |
|
1977 | 1977 | | | --- /dev/null |
|
1978 | 1978 | | | +++ b/e |
|
1979 | 1979 | | | @@ -0,0 +1,1 @@ |
|
1980 | 1980 | | | +ee |
|
1981 | 1981 | | | |
|
1982 | 1982 | |
|
1983 | 1983 | Test old-style --rev |
|
1984 | 1984 | |
|
1985 | 1985 | $ hg tag 'foo-bar' |
|
1986 | 1986 | $ testlog -r 'foo-bar' |
|
1987 | 1987 | ['foo-bar'] |
|
1988 | 1988 | [] |
|
1989 | 1989 | |
|
1990 | 1990 | Test --follow and forward --rev |
|
1991 | 1991 | |
|
1992 | 1992 | $ hg up -q 6 |
|
1993 | 1993 | $ echo g > g |
|
1994 | 1994 | $ hg ci -Am 'add g' g |
|
1995 | 1995 | created new head |
|
1996 | 1996 | $ hg up -q 2 |
|
1997 | 1997 | $ hg log -G --template "{rev} {desc|firstline}\n" |
|
1998 | 1998 | o 8 add g |
|
1999 | 1999 | | |
|
2000 | 2000 | | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
2001 | 2001 | |/ |
|
2002 | 2002 | o 6 merge 5 and 4 |
|
2003 | 2003 | |\ |
|
2004 | 2004 | | o 5 add another e |
|
2005 | 2005 | | | |
|
2006 | 2006 | o | 4 mv dir/b e |
|
2007 | 2007 | |/ |
|
2008 | 2008 | o 3 mv a b; add d |
|
2009 | 2009 | | |
|
2010 | 2010 | @ 2 mv b dir/b |
|
2011 | 2011 | | |
|
2012 | 2012 | o 1 copy a b |
|
2013 | 2013 | | |
|
2014 | 2014 | o 0 add a |
|
2015 | 2015 | |
|
2016 | $ hg archive -r 7 archive | |
|
2017 | $ grep changessincelatesttag archive/.hg_archival.txt | |
|
2018 | changessincelatesttag: 1 | |
|
2019 | $ rm -r archive | |
|
2020 | ||
|
2021 | changessincelatesttag with no prior tag | |
|
2022 | $ hg archive -r 4 archive | |
|
2023 | $ grep changessincelatesttag archive/.hg_archival.txt | |
|
2024 | changessincelatesttag: 5 | |
|
2025 | ||
|
2016 | 2026 | $ hg export 'all()' |
|
2017 | 2027 | # HG changeset patch |
|
2018 | 2028 | # User test |
|
2019 | 2029 | # Date 0 0 |
|
2020 | 2030 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2021 | 2031 | # Node ID f8035bb17114da16215af3436ec5222428ace8ee |
|
2022 | 2032 | # Parent 0000000000000000000000000000000000000000 |
|
2023 | 2033 | add a |
|
2024 | 2034 | |
|
2025 | 2035 | diff -r 000000000000 -r f8035bb17114 a |
|
2026 | 2036 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2027 | 2037 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
2028 | 2038 | @@ -0,0 +1,1 @@ |
|
2029 | 2039 | +a |
|
2030 | 2040 | diff -r 000000000000 -r f8035bb17114 aa |
|
2031 | 2041 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2032 | 2042 | +++ b/aa Thu Jan 01 00:00:00 1970 +0000 |
|
2033 | 2043 | @@ -0,0 +1,1 @@ |
|
2034 | 2044 | +aa |
|
2035 | 2045 | diff -r 000000000000 -r f8035bb17114 f |
|
2036 | 2046 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2037 | 2047 | +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
|
2038 | 2048 | @@ -0,0 +1,1 @@ |
|
2039 | 2049 | +f |
|
2040 | 2050 | # HG changeset patch |
|
2041 | 2051 | # User test |
|
2042 | 2052 | # Date 0 0 |
|
2043 | 2053 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2044 | 2054 | # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92 |
|
2045 | 2055 | # Parent f8035bb17114da16215af3436ec5222428ace8ee |
|
2046 | 2056 | copy a b |
|
2047 | 2057 | |
|
2048 | 2058 | diff -r f8035bb17114 -r 216d4c92cf98 b |
|
2049 | 2059 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2050 | 2060 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
2051 | 2061 | @@ -0,0 +1,1 @@ |
|
2052 | 2062 | +a |
|
2053 | 2063 | diff -r f8035bb17114 -r 216d4c92cf98 g |
|
2054 | 2064 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2055 | 2065 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2056 | 2066 | @@ -0,0 +1,1 @@ |
|
2057 | 2067 | +f |
|
2058 | 2068 | # HG changeset patch |
|
2059 | 2069 | # User test |
|
2060 | 2070 | # Date 0 0 |
|
2061 | 2071 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2062 | 2072 | # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3 |
|
2063 | 2073 | # Parent 216d4c92cf98ff2b4641d508b76b529f3d424c92 |
|
2064 | 2074 | mv b dir/b |
|
2065 | 2075 | |
|
2066 | 2076 | diff -r 216d4c92cf98 -r bb573313a9e8 b |
|
2067 | 2077 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
2068 | 2078 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2069 | 2079 | @@ -1,1 +0,0 @@ |
|
2070 | 2080 | -a |
|
2071 | 2081 | diff -r 216d4c92cf98 -r bb573313a9e8 dir/b |
|
2072 | 2082 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2073 | 2083 | +++ b/dir/b Thu Jan 01 00:00:00 1970 +0000 |
|
2074 | 2084 | @@ -0,0 +1,1 @@ |
|
2075 | 2085 | +a |
|
2076 | 2086 | diff -r 216d4c92cf98 -r bb573313a9e8 f |
|
2077 | 2087 | --- a/f Thu Jan 01 00:00:00 1970 +0000 |
|
2078 | 2088 | +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
|
2079 | 2089 | @@ -1,1 +1,2 @@ |
|
2080 | 2090 | f |
|
2081 | 2091 | +f |
|
2082 | 2092 | diff -r 216d4c92cf98 -r bb573313a9e8 g |
|
2083 | 2093 | --- a/g Thu Jan 01 00:00:00 1970 +0000 |
|
2084 | 2094 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2085 | 2095 | @@ -1,1 +1,2 @@ |
|
2086 | 2096 | f |
|
2087 | 2097 | +g |
|
2088 | 2098 | # HG changeset patch |
|
2089 | 2099 | # User test |
|
2090 | 2100 | # Date 0 0 |
|
2091 | 2101 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2092 | 2102 | # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
|
2093 | 2103 | # Parent bb573313a9e8349099b6ea2b2fb1fc7f424446f3 |
|
2094 | 2104 | mv a b; add d |
|
2095 | 2105 | |
|
2096 | 2106 | diff -r bb573313a9e8 -r 5918b8d165d1 a |
|
2097 | 2107 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
2098 | 2108 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2099 | 2109 | @@ -1,1 +0,0 @@ |
|
2100 | 2110 | -a |
|
2101 | 2111 | diff -r bb573313a9e8 -r 5918b8d165d1 b |
|
2102 | 2112 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2103 | 2113 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
2104 | 2114 | @@ -0,0 +1,1 @@ |
|
2105 | 2115 | +a |
|
2106 | 2116 | diff -r bb573313a9e8 -r 5918b8d165d1 d |
|
2107 | 2117 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2108 | 2118 | +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
2109 | 2119 | @@ -0,0 +1,1 @@ |
|
2110 | 2120 | +a |
|
2111 | 2121 | diff -r bb573313a9e8 -r 5918b8d165d1 g |
|
2112 | 2122 | --- a/g Thu Jan 01 00:00:00 1970 +0000 |
|
2113 | 2123 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2114 | 2124 | @@ -1,2 +1,2 @@ |
|
2115 | 2125 | f |
|
2116 | 2126 | -g |
|
2117 | 2127 | +f |
|
2118 | 2128 | # HG changeset patch |
|
2119 | 2129 | # User test |
|
2120 | 2130 | # Date 0 0 |
|
2121 | 2131 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2122 | 2132 | # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
|
2123 | 2133 | # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
|
2124 | 2134 | mv dir/b e |
|
2125 | 2135 | |
|
2126 | 2136 | diff -r 5918b8d165d1 -r 17d952250a9d dir/b |
|
2127 | 2137 | --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
|
2128 | 2138 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2129 | 2139 | @@ -1,1 +0,0 @@ |
|
2130 | 2140 | -a |
|
2131 | 2141 | diff -r 5918b8d165d1 -r 17d952250a9d e |
|
2132 | 2142 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2133 | 2143 | +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
2134 | 2144 | @@ -0,0 +1,1 @@ |
|
2135 | 2145 | +a |
|
2136 | 2146 | # HG changeset patch |
|
2137 | 2147 | # User test |
|
2138 | 2148 | # Date 0 0 |
|
2139 | 2149 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2140 | 2150 | # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b |
|
2141 | 2151 | # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
|
2142 | 2152 | add another e |
|
2143 | 2153 | |
|
2144 | 2154 | diff -r 5918b8d165d1 -r 99b31f1c2782 e |
|
2145 | 2155 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2146 | 2156 | +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
2147 | 2157 | @@ -0,0 +1,1 @@ |
|
2148 | 2158 | +ee |
|
2149 | 2159 | # HG changeset patch |
|
2150 | 2160 | # User test |
|
2151 | 2161 | # Date 0 0 |
|
2152 | 2162 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2153 | 2163 | # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
|
2154 | 2164 | # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
|
2155 | 2165 | # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
|
2156 | 2166 | merge 5 and 4 |
|
2157 | 2167 | |
|
2158 | 2168 | diff -r 99b31f1c2782 -r fc281d8ff18d dir/b |
|
2159 | 2169 | --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
|
2160 | 2170 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2161 | 2171 | @@ -1,1 +0,0 @@ |
|
2162 | 2172 | -a |
|
2163 | 2173 | diff -r 99b31f1c2782 -r fc281d8ff18d e |
|
2164 | 2174 | --- a/e Thu Jan 01 00:00:00 1970 +0000 |
|
2165 | 2175 | +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
2166 | 2176 | @@ -1,1 +1,1 @@ |
|
2167 | 2177 | -ee |
|
2168 | 2178 | +merge |
|
2169 | 2179 | # HG changeset patch |
|
2170 | 2180 | # User test |
|
2171 | 2181 | # Date 0 0 |
|
2172 | 2182 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2173 | 2183 | # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd |
|
2174 | 2184 | # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
|
2175 | 2185 | Added tag foo-bar for changeset fc281d8ff18d |
|
2176 | 2186 | |
|
2177 | 2187 | diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags |
|
2178 | 2188 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
2179 | 2189 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
2180 | 2190 | @@ -0,0 +1,1 @@ |
|
2181 | 2191 | +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar |
|
2182 | 2192 | # HG changeset patch |
|
2183 | 2193 | # User test |
|
2184 | 2194 | # Date 0 0 |
|
2185 | 2195 | # Thu Jan 01 00:00:00 1970 +0000 |
|
2186 | 2196 | # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 |
|
2187 | 2197 | # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
|
2188 | 2198 | add g |
|
2189 | 2199 | |
|
2190 | 2200 | diff -r fc281d8ff18d -r 24c2e826ddeb g |
|
2191 | 2201 | --- a/g Thu Jan 01 00:00:00 1970 +0000 |
|
2192 | 2202 | +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
|
2193 | 2203 | @@ -1,2 +1,1 @@ |
|
2194 | 2204 | -f |
|
2195 | 2205 | -f |
|
2196 | 2206 | +g |
|
2197 | 2207 | $ testlog --follow -r6 -r8 -r5 -r7 -r4 |
|
2198 | 2208 | ['6', '8', '5', '7', '4'] |
|
2199 | 2209 | (group |
|
2200 | 2210 | (func |
|
2201 | 2211 | ('symbol', 'descendants') |
|
2202 | 2212 | (func |
|
2203 | 2213 | ('symbol', 'rev') |
|
2204 | 2214 | ('symbol', '6')))) |
|
2205 | 2215 | |
|
2206 | 2216 | Test --follow-first and forward --rev |
|
2207 | 2217 | |
|
2208 | 2218 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 |
|
2209 | 2219 | ['6', '8', '5', '7', '4'] |
|
2210 | 2220 | (group |
|
2211 | 2221 | (func |
|
2212 | 2222 | ('symbol', '_firstdescendants') |
|
2213 | 2223 | (func |
|
2214 | 2224 | ('symbol', 'rev') |
|
2215 | 2225 | ('symbol', '6')))) |
|
2216 | 2226 | --- log.nodes * (glob) |
|
2217 | 2227 | +++ glog.nodes * (glob) |
|
2218 | 2228 | @@ -1,3 +1,3 @@ |
|
2219 | 2229 | -nodetag 6 |
|
2220 | 2230 | nodetag 8 |
|
2221 | 2231 | nodetag 7 |
|
2222 | 2232 | +nodetag 6 |
|
2223 | 2233 | |
|
2224 | 2234 | Test --follow and backward --rev |
|
2225 | 2235 | |
|
2226 | 2236 | $ testlog --follow -r6 -r5 -r7 -r8 -r4 |
|
2227 | 2237 | ['6', '5', '7', '8', '4'] |
|
2228 | 2238 | (group |
|
2229 | 2239 | (func |
|
2230 | 2240 | ('symbol', 'ancestors') |
|
2231 | 2241 | (func |
|
2232 | 2242 | ('symbol', 'rev') |
|
2233 | 2243 | ('symbol', '6')))) |
|
2234 | 2244 | |
|
2235 | 2245 | Test --follow-first and backward --rev |
|
2236 | 2246 | |
|
2237 | 2247 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 |
|
2238 | 2248 | ['6', '5', '7', '8', '4'] |
|
2239 | 2249 | (group |
|
2240 | 2250 | (func |
|
2241 | 2251 | ('symbol', '_firstancestors') |
|
2242 | 2252 | (func |
|
2243 | 2253 | ('symbol', 'rev') |
|
2244 | 2254 | ('symbol', '6')))) |
|
2245 | 2255 | |
|
2246 | 2256 | Test --follow with --rev of graphlog extension |
|
2247 | 2257 | |
|
2248 | 2258 | $ hg --config extensions.graphlog= glog -qfr1 |
|
2249 | 2259 | o 1:216d4c92cf98 |
|
2250 | 2260 | | |
|
2251 | 2261 | o 0:f8035bb17114 |
|
2252 | 2262 | |
|
2253 | 2263 | |
|
2254 | 2264 | Test subdir |
|
2255 | 2265 | |
|
2256 | 2266 | $ hg up -q 3 |
|
2257 | 2267 | $ cd dir |
|
2258 | 2268 | $ testlog . |
|
2259 | 2269 | [] |
|
2260 | 2270 | (group |
|
2261 | 2271 | (func |
|
2262 | 2272 | ('symbol', '_matchfiles') |
|
2263 | 2273 | (list |
|
2264 | 2274 | (list |
|
2265 | 2275 | ('string', 'r:') |
|
2266 | 2276 | ('string', 'd:relpath')) |
|
2267 | 2277 | ('string', 'p:.')))) |
|
2268 | 2278 | $ testlog ../b |
|
2269 | 2279 | [] |
|
2270 | 2280 | (group |
|
2271 | 2281 | (group |
|
2272 | 2282 | (func |
|
2273 | 2283 | ('symbol', 'filelog') |
|
2274 | 2284 | ('string', '../b')))) |
|
2275 | 2285 | $ testlog -f ../b |
|
2276 | 2286 | [] |
|
2277 | 2287 | (group |
|
2278 | 2288 | (group |
|
2279 | 2289 | (func |
|
2280 | 2290 | ('symbol', 'follow') |
|
2281 | 2291 | ('string', 'b')))) |
|
2282 | 2292 | $ cd .. |
|
2283 | 2293 | |
|
2284 | 2294 | Test --hidden |
|
2285 | 2295 | (enable obsolete) |
|
2286 | 2296 | |
|
2287 | 2297 | $ cat >> $HGRCPATH << EOF |
|
2288 | 2298 | > [experimental] |
|
2289 | 2299 | > evolution=createmarkers |
|
2290 | 2300 | > EOF |
|
2291 | 2301 | |
|
2292 | 2302 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2293 | 2303 | $ testlog |
|
2294 | 2304 | [] |
|
2295 | 2305 | [] |
|
2296 | 2306 | $ testlog --hidden |
|
2297 | 2307 | [] |
|
2298 | 2308 | [] |
|
2299 | 2309 | $ hg log -G --template '{rev} {desc}\n' |
|
2300 | 2310 | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
2301 | 2311 | | |
|
2302 | 2312 | o 6 merge 5 and 4 |
|
2303 | 2313 | |\ |
|
2304 | 2314 | | o 5 add another e |
|
2305 | 2315 | | | |
|
2306 | 2316 | o | 4 mv dir/b e |
|
2307 | 2317 | |/ |
|
2308 | 2318 | @ 3 mv a b; add d |
|
2309 | 2319 | | |
|
2310 | 2320 | o 2 mv b dir/b |
|
2311 | 2321 | | |
|
2312 | 2322 | o 1 copy a b |
|
2313 | 2323 | | |
|
2314 | 2324 | o 0 add a |
|
2315 | 2325 | |
|
2316 | 2326 | |
|
2317 | 2327 | A template without trailing newline should do something sane |
|
2318 | 2328 | |
|
2319 | 2329 | $ hg log -G -r ::2 --template '{rev} {desc}' |
|
2320 | 2330 | o 2 mv b dir/b |
|
2321 | 2331 | | |
|
2322 | 2332 | o 1 copy a b |
|
2323 | 2333 | | |
|
2324 | 2334 | o 0 add a |
|
2325 | 2335 | |
|
2326 | 2336 | |
|
2327 | 2337 | Extra newlines must be preserved |
|
2328 | 2338 | |
|
2329 | 2339 | $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n' |
|
2330 | 2340 | o |
|
2331 | 2341 | | 2 mv b dir/b |
|
2332 | 2342 | | |
|
2333 | 2343 | o |
|
2334 | 2344 | | 1 copy a b |
|
2335 | 2345 | | |
|
2336 | 2346 | o |
|
2337 | 2347 | 0 add a |
|
2338 | 2348 | |
|
2339 | 2349 | |
|
2340 | 2350 | The almost-empty template should do something sane too ... |
|
2341 | 2351 | |
|
2342 | 2352 | $ hg log -G -r ::2 --template '\n' |
|
2343 | 2353 | o |
|
2344 | 2354 | | |
|
2345 | 2355 | o |
|
2346 | 2356 | | |
|
2347 | 2357 | o |
|
2348 | 2358 | |
|
2349 | 2359 | |
|
2350 | 2360 | issue3772 |
|
2351 | 2361 | |
|
2352 | 2362 | $ hg log -G -r :null |
|
2353 | 2363 | o changeset: 0:f8035bb17114 |
|
2354 | 2364 | | user: test |
|
2355 | 2365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2356 | 2366 | | summary: add a |
|
2357 | 2367 | | |
|
2358 | 2368 | o changeset: -1:000000000000 |
|
2359 | 2369 | user: |
|
2360 | 2370 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2361 | 2371 | |
|
2362 | 2372 | $ hg log -G -r null:null |
|
2363 | 2373 | o changeset: -1:000000000000 |
|
2364 | 2374 | user: |
|
2365 | 2375 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2366 | 2376 | |
|
2367 | 2377 | |
|
2368 | 2378 | should not draw line down to null due to the magic of fullreposet |
|
2369 | 2379 | |
|
2370 | 2380 | $ hg log -G -r 'all()' | tail -6 |
|
2371 | 2381 | | |
|
2372 | 2382 | o changeset: 0:f8035bb17114 |
|
2373 | 2383 | user: test |
|
2374 | 2384 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2375 | 2385 | summary: add a |
|
2376 | 2386 | |
|
2377 | 2387 | |
|
2378 | 2388 | $ hg log -G -r 'branch(default)' | tail -6 |
|
2379 | 2389 | | |
|
2380 | 2390 | o changeset: 0:f8035bb17114 |
|
2381 | 2391 | user: test |
|
2382 | 2392 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2383 | 2393 | summary: add a |
|
2384 | 2394 | |
|
2385 | 2395 | |
|
2386 | 2396 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now