Show More
@@ -254,7 +254,7 b' def revset(pats, opts):' | |||
|
254 | 254 | 'only_merges': ('merge()', None), |
|
255 | 255 | 'removed': ('removes("*")', None), |
|
256 | 256 | 'date': ('date($)', None), |
|
257 |
'branch': ('branch($)', ' |
|
|
257 | 'branch': ('branch($)', ' or '), | |
|
258 | 258 | 'exclude': ('not file($)', ' and '), |
|
259 | 259 | 'include': ('file($)', ' and '), |
|
260 | 260 | 'keyword': ('keyword($)', ' and '), |
@@ -1377,9 +1377,13 b' File + limit + -ra:b, b < tip, (b - a) <' | |||
|
1377 | 1377 | |
|
1378 | 1378 | Do not crash or produce strange graphs if history is buggy |
|
1379 | 1379 | |
|
1380 | $ hg branch branch | |
|
1381 | marked working directory as branch branch | |
|
1382 | (branches are permanent and global, did you want a bookmark?) | |
|
1380 | 1383 | $ commit 36 "buggy merge: identical parents" 35 35 |
|
1381 | 1384 | $ hg glog -l5 |
|
1382 |
@ changeset: 36: |
|
|
1385 | @ changeset: 36:08a19a744424 | |
|
1386 | | branch: branch | |
|
1383 | 1387 | | tag: tip |
|
1384 | 1388 | | parent: 35:9159c3644c5e |
|
1385 | 1389 | | parent: 35:9159c3644c5e |
@@ -1425,9 +1429,12 b' Test log -G options' | |||
|
1425 | 1429 | |
|
1426 | 1430 | $ testlog -u test -u not-a-user |
|
1427 | 1431 | ('group', ('group', ('or', ('func', ('symbol', 'user'), ('string', 'test')), ('func', ('symbol', 'user'), ('string', 'not-a-user'))))) |
|
1428 | $ hg log -G -b 'something nice' | |
|
1429 | abort: unknown revision 'something nice'! | |
|
1430 | [255] | |
|
1432 | $ testlog -b not-a-branch | |
|
1433 | ('group', ('group', ('func', ('symbol', 'branch'), ('string', 'not-a-branch')))) | |
|
1434 | abort: unknown revision 'not-a-branch'! | |
|
1435 | abort: unknown revision 'not-a-branch'! | |
|
1436 | $ testlog -b default -b branch | |
|
1437 | ('group', ('group', ('or', ('func', ('symbol', 'branch'), ('string', 'default')), ('func', ('symbol', 'branch'), ('string', 'branch'))))) | |
|
1431 | 1438 | $ hg log -G --print-revset -k 'something' -k 'nice' |
|
1432 | 1439 | ('group', ('group', ('and', ('func', ('symbol', 'keyword'), ('string', 'something')), ('func', ('symbol', 'keyword'), ('string', 'nice'))))) |
|
1433 | 1440 | $ hg log -G --only-branch 'something nice' |
General Comments 0
You need to be logged in to leave comments.
Login now