mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
1808 lines
38 KiB
Raku
1808 lines
38 KiB
Raku
#require py2
|
|
#chg-compatible
|
|
|
|
$ enable commitextras
|
|
$ setconfig ui.allowemptycommit=1
|
|
|
|
$ HGENCODING=utf-8
|
|
$ export HGENCODING
|
|
$ newext testrevset << EOF
|
|
> import edenscm.mercurial.revset
|
|
>
|
|
> baseset = edenscm.mercurial.revset.baseset
|
|
>
|
|
> def r3232(repo, subset, x):
|
|
> """"simple revset that return [3,2,3,2]
|
|
>
|
|
> revisions duplicated on purpose.
|
|
> """
|
|
> if 3 not in subset:
|
|
> if 2 in subset:
|
|
> return baseset([2,2])
|
|
> return baseset()
|
|
> return baseset([3,3,2,2])
|
|
>
|
|
> edenscm.mercurial.revset.symbols['r3232'] = r3232
|
|
> EOF
|
|
|
|
$ try() {
|
|
> hg debugrevspec --debug "$@"
|
|
> }
|
|
|
|
$ log() {
|
|
> hg log --template '{node}\n' -r "$1"
|
|
> }
|
|
|
|
$ setbranch() {
|
|
> BRANCH="$1"
|
|
> }
|
|
|
|
$ commit() {
|
|
> if [ -n "$BRANCH" ]; then
|
|
> hg commit --extra "branch=$BRANCH" "$@"
|
|
> if [[ $BRANCH =~ '^[0-9a-zA-Z]+$' ]]; then
|
|
> eval "export $BRANCH=`hg log -r . -T '{node}'`"
|
|
> fi
|
|
> else
|
|
> hg commit "$@"
|
|
> fi
|
|
> }
|
|
|
|
extension to build '_intlist()' and '_hexlist()', which is necessary because
|
|
these predicates use '\0' as a separator:
|
|
|
|
$ cat <<EOF > debugrevlistspec.py
|
|
> from __future__ import absolute_import
|
|
> from edenscm.mercurial import (
|
|
> node as nodemod,
|
|
> registrar,
|
|
> revset,
|
|
> revsetlang,
|
|
> smartset,
|
|
> )
|
|
> cmdtable = {}
|
|
> command = registrar.command(cmdtable)
|
|
> @command('debugrevlistspec',
|
|
> [('', 'optimize', None, 'print parsed tree after optimizing'),
|
|
> ('', 'bin', None, 'unhexlify arguments')])
|
|
> def debugrevlistspec(ui, repo, fmt, *args, **opts):
|
|
> if opts['bin']:
|
|
> args = map(nodemod.bin, args)
|
|
> expr = revsetlang.formatspec(fmt, list(args))
|
|
> if ui.verbose:
|
|
> tree = revsetlang.parse(expr, lookup=repo.__contains__)
|
|
> ui.note(revsetlang.prettyformat(tree), "\n")
|
|
> if opts["optimize"]:
|
|
> opttree = revsetlang.optimize(revsetlang.analyze(tree))
|
|
> ui.note("* optimized:\n", revsetlang.prettyformat(opttree),
|
|
> "\n")
|
|
> func = revset.match(ui, expr, repo)
|
|
> revs = func(repo)
|
|
> if ui.verbose:
|
|
> ui.note("* set:\n", smartset.prettyformat(revs), "\n")
|
|
> for c in revs:
|
|
> ui.write("%s\n" % c)
|
|
> EOF
|
|
$ cat <<EOF >> $HGRCPATH
|
|
> [extensions]
|
|
> debugrevlistspec = $TESTTMP/debugrevlistspec.py
|
|
> EOF
|
|
$ trylist() {
|
|
> hg debugrevlistspec --debug "$@"
|
|
> }
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo a > a
|
|
$ setbranch a
|
|
$ commit -Aqm0
|
|
|
|
$ echo b > b
|
|
$ setbranch b
|
|
$ commit -Aqm1
|
|
|
|
$ rm a
|
|
$ setbranch a-b-c-
|
|
$ commit -Aqm2 -u Bob
|
|
|
|
$ hg log -r "extra('branch', 'a-b-c-')" --template '{node}\n'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ hg log -r "extra('branch')" --template '{node}\n'
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ hg log -r "extra('branch', 're:a')" --template '{branch}\n'
|
|
a
|
|
a-b-c-
|
|
|
|
$ hg co 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ setbranch +a+b+c+
|
|
$ commit -Aqm3
|
|
|
|
$ hg co -C 2 # interleave
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo bb > b
|
|
$ setbranch -a-b-c-
|
|
$ commit -Aqm4 -d "May 12 2005"
|
|
|
|
$ hg co -C 3
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ setbranch !a/b/c/
|
|
$ commit -Aqm"5 bug"
|
|
|
|
$ hg merge 4
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ setbranch _a_b_c_
|
|
$ commit -Aqm"6 issue619"
|
|
|
|
$ setbranch .a.b.c.
|
|
$ commit -Aqm7
|
|
|
|
$ setbranch all
|
|
|
|
$ hg co 4
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ setbranch é
|
|
$ commit -Aqm9
|
|
|
|
$ hg book -fr 6 1.0
|
|
$ echo "e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0" >> .hgtags
|
|
$ hg add .hgtags
|
|
$ hg commit -Aqm "add 1.0 tag"
|
|
$ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
|
|
|
$ hg clone --quiet -U -r 7 . ../remote1
|
|
$ hg clone --quiet -U -r 8 . ../remote2
|
|
$ echo "[paths]" >> .hg/hgrc
|
|
$ echo "default = ../remote1" >> .hg/hgrc
|
|
|
|
test subtracting something from an addset
|
|
|
|
$ log '(outgoing() or removes(a)) - removes(a)'
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
|
|
test intersecting something with an addset
|
|
|
|
$ log 'parents(outgoing() or removes(a))'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
|
|
test that `or` operation:
|
|
order is no longer preserved with `idset`, which enforces DESC order internally.
|
|
|
|
$ log '3:4 or 2:5'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
$ log '3:4 or 5:2'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
$ log 'sort(3:4 or 2:5)'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
$ log 'sort(3:4 or 5:2)'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
|
|
test that more than one `-r`s are combined in the right order and deduplicated:
|
|
|
|
$ hg log -T '{node}\n' -r 3 -r 3 -r 4 -r 5:2 -r 'ancestors(4)'
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
|
|
test that `or` operation skips duplicated revisions from right-hand side
|
|
|
|
$ try 'reverse(1::5) or ancestors(4)'
|
|
(or
|
|
(list
|
|
(func
|
|
(symbol 'reverse')
|
|
(dagrange
|
|
(symbol '1')
|
|
(symbol '5')))
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '4'))))
|
|
* set:
|
|
<addset
|
|
<baseset- [1, 3, 5]>,
|
|
<generatorset+>>
|
|
5
|
|
3
|
|
1
|
|
0
|
|
2
|
|
4
|
|
$ try 'sort(ancestors(4) or reverse(1::5))'
|
|
(func
|
|
(symbol 'sort')
|
|
(or
|
|
(list
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '4'))
|
|
(func
|
|
(symbol 'reverse')
|
|
(dagrange
|
|
(symbol '1')
|
|
(symbol '5'))))))
|
|
* set:
|
|
<addset+
|
|
<generatorset+>,
|
|
<baseset- [1, 3, 5]>>
|
|
0
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
|
|
test optimization of trivial `or` operation
|
|
|
|
$ try --optimize '0|(1)|"2"|-2|tip|null'
|
|
(or
|
|
(list
|
|
(symbol '0')
|
|
(group
|
|
(symbol '1'))
|
|
(string '2')
|
|
(negate
|
|
(symbol '2'))
|
|
(symbol 'tip')
|
|
(symbol 'null')))
|
|
* optimized:
|
|
(func
|
|
(symbol '_list')
|
|
(string '0\x001\x002\x00-2\x00tip\x00null'))
|
|
* set:
|
|
<baseset [0, 1, 2, 8, 9, -1]>
|
|
0
|
|
1
|
|
2
|
|
8
|
|
9
|
|
-1
|
|
|
|
$ try --optimize '0|1|2:3'
|
|
(or
|
|
(list
|
|
(symbol '0')
|
|
(symbol '1')
|
|
(range
|
|
(symbol '2')
|
|
(symbol '3'))))
|
|
* optimized:
|
|
(or
|
|
(list
|
|
(func
|
|
(symbol '_list')
|
|
(string '0\x001'))
|
|
(range
|
|
(symbol '2')
|
|
(symbol '3'))))
|
|
* set:
|
|
<addset
|
|
<baseset [0, 1]>,
|
|
<idset+ [2 3]>>
|
|
0
|
|
1
|
|
2
|
|
3
|
|
|
|
$ try --optimize '0:1|2|3:4|5|6'
|
|
(or
|
|
(list
|
|
(range
|
|
(symbol '0')
|
|
(symbol '1'))
|
|
(symbol '2')
|
|
(range
|
|
(symbol '3')
|
|
(symbol '4'))
|
|
(symbol '5')
|
|
(symbol '6')))
|
|
* optimized:
|
|
(or
|
|
(list
|
|
(range
|
|
(symbol '0')
|
|
(symbol '1'))
|
|
(symbol '2')
|
|
(range
|
|
(symbol '3')
|
|
(symbol '4'))
|
|
(func
|
|
(symbol '_list')
|
|
(string '5\x006'))))
|
|
* set:
|
|
<idset+ [0..=6]>
|
|
0
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
6
|
|
|
|
unoptimized `or` looks like this
|
|
|
|
$ try --no-optimized -p analyzed '0|1|2|3|4'
|
|
* analyzed:
|
|
(or
|
|
(list
|
|
(symbol '0')
|
|
(symbol '1')
|
|
(symbol '2')
|
|
(symbol '3')
|
|
(symbol '4')))
|
|
* set:
|
|
<addset
|
|
<addset
|
|
<baseset [0]>,
|
|
<baseset [1]>>,
|
|
<addset
|
|
<baseset [2]>,
|
|
<addset
|
|
<baseset [3]>,
|
|
<baseset [4]>>>>
|
|
0
|
|
1
|
|
2
|
|
3
|
|
4
|
|
|
|
test that `_list` should be narrowed by provided `subset`
|
|
|
|
$ log '0:2 and (null|1|2|3)'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
|
|
test that `_list` should remove duplicates
|
|
|
|
$ log '0|1|2|1|2|-1|tip'
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
|
|
test unknown revision in `_list`
|
|
|
|
$ log '0|unknown'
|
|
abort: unknown revision 'unknown'!
|
|
[255]
|
|
|
|
test integer range in `_list`
|
|
|
|
$ log '-1|-10'
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
|
|
$ log '-10|-11'
|
|
abort: unknown revision '-11'!
|
|
[255]
|
|
|
|
$ log '9|11'
|
|
abort: unknown revision '11'!
|
|
[255]
|
|
|
|
test '0000' != '0' in `_list`
|
|
|
|
$ log '0|0000'
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
0000000000000000000000000000000000000000
|
|
|
|
test ',' in `_list`
|
|
$ log '0,1'
|
|
hg: parse error: can't use a list in this context
|
|
(see hg help "revsets.x or y")
|
|
[255]
|
|
$ try '0,1,2'
|
|
(list
|
|
(symbol '0')
|
|
(symbol '1')
|
|
(symbol '2'))
|
|
hg: parse error: can't use a list in this context
|
|
(see hg help "revsets.x or y")
|
|
[255]
|
|
|
|
test that chained `or` operations make balanced addsets
|
|
|
|
$ try '0:1|1:2|2:3|3:4|4:5'
|
|
(or
|
|
(list
|
|
(range
|
|
(symbol '0')
|
|
(symbol '1'))
|
|
(range
|
|
(symbol '1')
|
|
(symbol '2'))
|
|
(range
|
|
(symbol '2')
|
|
(symbol '3'))
|
|
(range
|
|
(symbol '3')
|
|
(symbol '4'))
|
|
(range
|
|
(symbol '4')
|
|
(symbol '5'))))
|
|
* set:
|
|
<idset+ [0..=5]>
|
|
0
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
|
|
no crash by empty group "()" while optimizing `or` operations
|
|
|
|
$ try --optimize '0|()'
|
|
(or
|
|
(list
|
|
(symbol '0')
|
|
(group
|
|
None)))
|
|
* optimized:
|
|
(or
|
|
(list
|
|
(symbol '0')
|
|
None))
|
|
hg: parse error: missing argument
|
|
[255]
|
|
|
|
test that chained `or` operations never eat up stack (issue4624)
|
|
(uses `0:1` instead of `0` to avoid future optimization of trivial revisions)
|
|
|
|
$ hg log -T '{node}\n' -r `hg debugsh -c "ui.write('+'.join(['0:1'] * 500))"`
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
|
|
test that repeated `-r` options never eat up stack (issue4565)
|
|
(uses `-r 0::1` to avoid possible optimization at old-style parser)
|
|
|
|
$ hg log -T '{node}\n' `hg debugsh -c "for i in range(500): ui.write('-r 0::1 '),"`
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
|
|
check that conversion to only works
|
|
$ try --optimize '::3 - ::1'
|
|
(minus
|
|
(dagrangepre
|
|
(symbol '3'))
|
|
(dagrangepre
|
|
(symbol '1')))
|
|
* optimized:
|
|
(func
|
|
(symbol 'only')
|
|
(list
|
|
(symbol '3')
|
|
(symbol '1')))
|
|
* set:
|
|
<baseset+ [3]>
|
|
3
|
|
$ try --optimize 'ancestors(1) - ancestors(3)'
|
|
(minus
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '1'))
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '3')))
|
|
* optimized:
|
|
(func
|
|
(symbol 'only')
|
|
(list
|
|
(symbol '1')
|
|
(symbol '3')))
|
|
* set:
|
|
<baseset+ []>
|
|
$ try --optimize 'not ::2 and ::6'
|
|
(and
|
|
(not
|
|
(dagrangepre
|
|
(symbol '2')))
|
|
(dagrangepre
|
|
(symbol '6')))
|
|
* optimized:
|
|
(func
|
|
(symbol 'only')
|
|
(list
|
|
(symbol '6')
|
|
(symbol '2')))
|
|
* set:
|
|
<baseset+ [3, 4, 5, 6]>
|
|
3
|
|
4
|
|
5
|
|
6
|
|
$ try --optimize 'ancestors(6) and not ancestors(4)'
|
|
(and
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '6'))
|
|
(not
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '4'))))
|
|
* optimized:
|
|
(func
|
|
(symbol 'only')
|
|
(list
|
|
(symbol '6')
|
|
(symbol '4')))
|
|
* set:
|
|
<baseset+ [3, 5, 6]>
|
|
3
|
|
5
|
|
6
|
|
|
|
no crash by empty group "()" while optimizing to "only()"
|
|
|
|
$ try --optimize '::1 and ()'
|
|
(and
|
|
(dagrangepre
|
|
(symbol '1'))
|
|
(group
|
|
None))
|
|
* optimized:
|
|
(andsmally
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '1'))
|
|
None)
|
|
hg: parse error: missing argument
|
|
[255]
|
|
|
|
optimization to only() works only if ancestors() takes only one argument
|
|
|
|
$ hg debugrevspec -p optimized 'ancestors(6) - ancestors(4, 1)'
|
|
* optimized:
|
|
(difference
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '6'))
|
|
(func
|
|
(symbol 'ancestors')
|
|
(list
|
|
(symbol '4')
|
|
(symbol '1'))))
|
|
0
|
|
1
|
|
3
|
|
5
|
|
6
|
|
$ hg debugrevspec -p optimized 'ancestors(6, 1) - ancestors(4)'
|
|
* optimized:
|
|
(difference
|
|
(func
|
|
(symbol 'ancestors')
|
|
(list
|
|
(symbol '6')
|
|
(symbol '1')))
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '4')))
|
|
5
|
|
6
|
|
|
|
optimization disabled if keyword arguments passed (because we're too lazy
|
|
to support it)
|
|
|
|
$ hg debugrevspec -p optimized 'ancestors(set=6) - ancestors(set=4)'
|
|
* optimized:
|
|
(difference
|
|
(func
|
|
(symbol 'ancestors')
|
|
(keyvalue
|
|
(symbol 'set')
|
|
(symbol '6')))
|
|
(func
|
|
(symbol 'ancestors')
|
|
(keyvalue
|
|
(symbol 'set')
|
|
(symbol '4'))))
|
|
3
|
|
5
|
|
6
|
|
|
|
invalid function call should not be optimized to only()
|
|
|
|
$ log '"ancestors"(6) and not ancestors(4)'
|
|
hg: parse error: not a symbol
|
|
[255]
|
|
|
|
$ log 'ancestors(6) and not "ancestors"(4)'
|
|
hg: parse error: not a symbol
|
|
[255]
|
|
|
|
$ log 'user(bob)'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
|
|
$ log '4::8'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
$ log '4:8'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
013af1973af4a1932911a575960a876af6c02aaa
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
|
|
$ log 'sort(!merge() & (modifies(b) | user(bob) | keyword(bug) | keyword(issue) & 1::9), "-date")'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
|
|
$ log 'not 0 and 0:2'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ log 'not 1 and 0:2'
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ log 'not 2 and 0:2'
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
$ log '(1 and 2)::'
|
|
$ log '(1 and 2):'
|
|
$ log '(1 and 2):3'
|
|
$ log 'sort(head(), -rev)'
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
013af1973af4a1932911a575960a876af6c02aaa
|
|
$ log '4::8 - 8'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
|
|
matching() should preserve the order of the input set:
|
|
|
|
$ log '(2 or 3 or 1) and matching(1 or 2 or 3)'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
|
|
$ log 'named("unknown")'
|
|
abort: namespace 'unknown' does not exist!
|
|
[255]
|
|
$ log 'named("re:unknown")'
|
|
abort: no namespace exists that match 'unknown'!
|
|
[255]
|
|
$ log 'present(named("unknown"))'
|
|
$ log 'present(named("re:unknown"))'
|
|
|
|
issue2437
|
|
|
|
$ log '3 and p1(5)'
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
$ log '4 and p2(6)'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
$ log '1 and parents(:2)'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
$ log '2 and children(1:)'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ log 'roots(all()) or roots(all())'
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
$ hg debugrevspec 'roots(all()) or roots(all())'
|
|
0
|
|
|
|
issue2654: report a parse error if the revset was not completely parsed
|
|
|
|
$ log '1 OR 2'
|
|
hg: parse error at 2: invalid token
|
|
(1 OR 2
|
|
^ here)
|
|
[255]
|
|
|
|
or operator should preserve ordering:
|
|
$ log 'reverse(2::4) or tip'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
|
|
parentrevspec
|
|
|
|
$ log 'merge()^0'
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
$ log 'merge()^'
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
$ log 'merge()^1'
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
$ log 'merge()^2'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
$ log '(not merge())^2'
|
|
$ log 'merge()^^'
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
$ log 'merge()^1^'
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
$ log 'merge()^^^'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
|
|
$ hg debugrevspec -s '(merge() | 0)~-1'
|
|
* set:
|
|
<baseset+ [1, 7]>
|
|
1
|
|
7
|
|
$ log 'merge()~-1'
|
|
013af1973af4a1932911a575960a876af6c02aaa
|
|
$ log 'tip~-1'
|
|
$ log '(tip | merge())~-1'
|
|
013af1973af4a1932911a575960a876af6c02aaa
|
|
$ log 'merge()~0'
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
$ log 'merge()~1'
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
$ log 'merge()~2'
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
$ log 'merge()~2^1'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
$ log 'merge()~3'
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
|
|
$ log '(-3:tip)^'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
|
|
$ log 'tip^foo'
|
|
hg: parse error: ^ expects a number 0, 1, or 2
|
|
[255]
|
|
|
|
Bogus function gets suggestions
|
|
$ log 'add()'
|
|
hg: parse error: unknown identifier: add
|
|
(did you mean adds?)
|
|
[255]
|
|
$ log 'added()'
|
|
hg: parse error: unknown identifier: added
|
|
(did you mean adds?)
|
|
[255]
|
|
$ log 'remo()'
|
|
hg: parse error: unknown identifier: remo
|
|
(did you mean one of remote, removes?)
|
|
[255]
|
|
$ log 'babar()'
|
|
hg: parse error: unknown identifier: babar
|
|
[255]
|
|
|
|
Bogus function with a similar internal name doesn't suggest the internal name
|
|
$ log 'matches()'
|
|
hg: parse error: unknown identifier: matches
|
|
(did you mean matching?)
|
|
[255]
|
|
|
|
Undocumented functions aren't suggested as similar either
|
|
$ log 'tagged2()'
|
|
hg: parse error: unknown identifier: tagged2
|
|
[255]
|
|
|
|
multiple revspecs
|
|
(idset does not preserve '+' order for optimization)
|
|
|
|
$ hg log -r 'tip~1:tip' -r 'tip~2:tip~1' --template '{node}\n'
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
013af1973af4a1932911a575960a876af6c02aaa
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
|
|
test usage in revpair (with "+")
|
|
|
|
(real pair)
|
|
|
|
$ hg diff -r 'tip^^' -r 'tip'
|
|
diff -r 2326846efdab -r 6a4f54cc779b .hgtags
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -0,0 +1,1 @@
|
|
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
|
|
$ hg diff -r 'tip^^::tip'
|
|
diff -r 2326846efdab -r 6a4f54cc779b .hgtags
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -0,0 +1,1 @@
|
|
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
|
|
|
|
(single rev)
|
|
|
|
$ hg diff -r 'tip^' -r 'tip^'
|
|
$ hg diff -r 'tip^:tip^'
|
|
|
|
(single rev that does not looks like a range)
|
|
|
|
$ hg diff -r 'tip^::tip^ or tip^'
|
|
diff -r d5d0dcbdc4d9 .hgtags
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/.hgtags * (glob)
|
|
@@ -0,0 +1,1 @@
|
|
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
|
|
$ hg diff -r 'tip^ or tip^'
|
|
diff -r d5d0dcbdc4d9 .hgtags
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/.hgtags * (glob)
|
|
@@ -0,0 +1,1 @@
|
|
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0
|
|
|
|
(no rev)
|
|
|
|
$ hg diff -r 'author("babar") or author("celeste")'
|
|
abort: empty revision range
|
|
[255]
|
|
|
|
aliases:
|
|
|
|
$ echo '[revsetalias]' >> .hg/hgrc
|
|
$ echo 'm = merge()' >> .hg/hgrc
|
|
(revset aliases can override builtin revsets)
|
|
$ echo 'p2($1) = p1($1)' >> .hg/hgrc
|
|
$ echo 'sincem = descendants(m)' >> .hg/hgrc
|
|
$ echo 'd($1) = reverse(sort($1, date))' >> .hg/hgrc
|
|
$ echo 'rs(ARG1, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc
|
|
$ echo 'rs4(ARG1, ARGA, ARGB, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc
|
|
|
|
$ try m
|
|
(symbol 'm')
|
|
* expanded:
|
|
(func
|
|
(symbol 'merge')
|
|
None)
|
|
* set:
|
|
<filteredset
|
|
<fullreposet+ [0..=9]>,
|
|
<merge>>
|
|
6
|
|
|
|
$ HGPLAIN=1
|
|
$ export HGPLAIN
|
|
$ try m
|
|
(symbol 'm')
|
|
abort: unknown revision 'm'!
|
|
[255]
|
|
|
|
$ HGPLAINEXCEPT=revsetalias
|
|
$ export HGPLAINEXCEPT
|
|
$ try m
|
|
(symbol 'm')
|
|
* expanded:
|
|
(func
|
|
(symbol 'merge')
|
|
None)
|
|
* set:
|
|
<filteredset
|
|
<fullreposet+ [0..=9]>,
|
|
<merge>>
|
|
6
|
|
|
|
$ unset HGPLAIN
|
|
$ unset HGPLAINEXCEPT
|
|
|
|
$ try 'p2(.)'
|
|
(func
|
|
(symbol 'p2')
|
|
(symbol '.'))
|
|
* expanded:
|
|
(func
|
|
(symbol 'p1')
|
|
(symbol '.'))
|
|
* set:
|
|
<baseset+ [8]>
|
|
8
|
|
|
|
$ HGPLAIN=1
|
|
$ export HGPLAIN
|
|
$ try 'p2(.)'
|
|
(func
|
|
(symbol 'p2')
|
|
(symbol '.'))
|
|
* set:
|
|
<baseset+ []>
|
|
|
|
$ HGPLAINEXCEPT=revsetalias
|
|
$ export HGPLAINEXCEPT
|
|
$ try 'p2(.)'
|
|
(func
|
|
(symbol 'p2')
|
|
(symbol '.'))
|
|
* expanded:
|
|
(func
|
|
(symbol 'p1')
|
|
(symbol '.'))
|
|
* set:
|
|
<baseset+ [8]>
|
|
8
|
|
|
|
$ unset HGPLAIN
|
|
$ unset HGPLAINEXCEPT
|
|
|
|
test alias recursion
|
|
|
|
$ try sincem
|
|
(symbol 'sincem')
|
|
* expanded:
|
|
(func
|
|
(symbol 'descendants')
|
|
(func
|
|
(symbol 'merge')
|
|
None))
|
|
* set:
|
|
<generatorset+>
|
|
6
|
|
7
|
|
|
|
test infinite recursion
|
|
|
|
$ echo 'recurse1 = recurse2' >> .hg/hgrc
|
|
$ echo 'recurse2 = recurse1' >> .hg/hgrc
|
|
$ try recurse1
|
|
(symbol 'recurse1')
|
|
hg: parse error: infinite expansion of revset alias "recurse1" detected
|
|
[255]
|
|
|
|
$ echo 'level1($1, $2) = $1 or $2' >> .hg/hgrc
|
|
$ echo 'level2($1, $2) = level1($2, $1)' >> .hg/hgrc
|
|
$ try "level2(level1(1, 2), 3)"
|
|
(func
|
|
(symbol 'level2')
|
|
(list
|
|
(func
|
|
(symbol 'level1')
|
|
(list
|
|
(symbol '1')
|
|
(symbol '2')))
|
|
(symbol '3')))
|
|
* expanded:
|
|
(or
|
|
(list
|
|
(symbol '3')
|
|
(or
|
|
(list
|
|
(symbol '1')
|
|
(symbol '2')))))
|
|
* set:
|
|
<addset
|
|
<baseset [3]>,
|
|
<baseset [1, 2]>>
|
|
3
|
|
1
|
|
2
|
|
|
|
test nesting and variable passing
|
|
|
|
$ echo 'nested($1) = nested2($1)' >> .hg/hgrc
|
|
$ echo 'nested2($1) = nested3($1)' >> .hg/hgrc
|
|
$ echo 'nested3($1) = max($1)' >> .hg/hgrc
|
|
$ try 'nested(2:5)'
|
|
(func
|
|
(symbol 'nested')
|
|
(range
|
|
(symbol '2')
|
|
(symbol '5')))
|
|
* expanded:
|
|
(func
|
|
(symbol 'max')
|
|
(range
|
|
(symbol '2')
|
|
(symbol '5')))
|
|
* set:
|
|
<baseset
|
|
<max
|
|
<fullreposet+ [0..=9]>,
|
|
<idset+ [2..=5]>>>
|
|
5
|
|
|
|
test chained `or` operations are flattened at parsing phase
|
|
|
|
$ echo 'chainedorops($1, $2, $3) = $1|$2|$3' >> .hg/hgrc
|
|
$ try 'chainedorops(0:1, 1:2, 2:3)'
|
|
(func
|
|
(symbol 'chainedorops')
|
|
(list
|
|
(range
|
|
(symbol '0')
|
|
(symbol '1'))
|
|
(range
|
|
(symbol '1')
|
|
(symbol '2'))
|
|
(range
|
|
(symbol '2')
|
|
(symbol '3'))))
|
|
* expanded:
|
|
(or
|
|
(list
|
|
(range
|
|
(symbol '0')
|
|
(symbol '1'))
|
|
(range
|
|
(symbol '1')
|
|
(symbol '2'))
|
|
(range
|
|
(symbol '2')
|
|
(symbol '3'))))
|
|
* set:
|
|
<idset+ [0..=3]>
|
|
0
|
|
1
|
|
2
|
|
3
|
|
|
|
test variable isolation, variable placeholders are rewritten as string
|
|
then parsed and matched again as string. Check they do not leak too
|
|
far away.
|
|
|
|
$ echo 'injectparamasstring = max("$1")' >> .hg/hgrc
|
|
$ echo 'callinjection($1) = descendants(injectparamasstring)' >> .hg/hgrc
|
|
$ try 'callinjection(2:5)'
|
|
(func
|
|
(symbol 'callinjection')
|
|
(range
|
|
(symbol '2')
|
|
(symbol '5')))
|
|
* expanded:
|
|
(func
|
|
(symbol 'descendants')
|
|
(func
|
|
(symbol 'max')
|
|
(string '$1')))
|
|
abort: unknown revision '$1'!
|
|
[255]
|
|
|
|
test scope of alias expansion: 'universe' is expanded prior to 'shadowall(0)',
|
|
but 'all()' should never be substituted to '0()'.
|
|
|
|
$ echo 'universe = all()' >> .hg/hgrc
|
|
$ echo 'shadowall(all) = all and universe' >> .hg/hgrc
|
|
$ try 'shadowall(0)'
|
|
(func
|
|
(symbol 'shadowall')
|
|
(symbol '0'))
|
|
* expanded:
|
|
(and
|
|
(symbol '0')
|
|
(func
|
|
(symbol 'all')
|
|
None))
|
|
* set:
|
|
<filteredset
|
|
<baseset [0]>,
|
|
<idset+ [0..=9]>>
|
|
0
|
|
|
|
test unknown reference:
|
|
|
|
$ try "unknownref(0)" --config 'revsetalias.unknownref($1)=$1:$2'
|
|
(func
|
|
(symbol 'unknownref')
|
|
(symbol '0'))
|
|
abort: bad definition of revset alias "unknownref": invalid symbol '$2'
|
|
[255]
|
|
|
|
$ hg debugrevspec --debug --config revsetalias.anotherbadone='branch(' "tip"
|
|
(symbol 'tip')
|
|
warning: bad definition of revset alias "anotherbadone": at 7: not a prefix: end
|
|
* set:
|
|
<baseset [9]>
|
|
9
|
|
|
|
$ try 'tip'
|
|
(symbol 'tip')
|
|
* set:
|
|
<baseset [9]>
|
|
9
|
|
|
|
$ hg debugrevspec --debug --config revsetalias.'bad name'='tip' "tip"
|
|
(symbol 'tip')
|
|
warning: bad declaration of revset alias "bad name": at 4: invalid token
|
|
* set:
|
|
<baseset [9]>
|
|
9
|
|
$ echo 'strictreplacing($1, $10) = $10 or desc("$1")' >> .hg/hgrc
|
|
$ try 'strictreplacing("foo", tip)'
|
|
(func
|
|
(symbol 'strictreplacing')
|
|
(list
|
|
(string 'foo')
|
|
(symbol 'tip')))
|
|
* expanded:
|
|
(or
|
|
(list
|
|
(symbol 'tip')
|
|
(func
|
|
(symbol 'desc')
|
|
(string '$1'))))
|
|
* set:
|
|
<addset
|
|
<baseset [9]>,
|
|
<filteredset
|
|
<fullreposet+ [0..=9]>,
|
|
<desc '$1'>>>
|
|
9
|
|
|
|
$ try 'd(2:5)'
|
|
(func
|
|
(symbol 'd')
|
|
(range
|
|
(symbol '2')
|
|
(symbol '5')))
|
|
* expanded:
|
|
(func
|
|
(symbol 'reverse')
|
|
(func
|
|
(symbol 'sort')
|
|
(list
|
|
(range
|
|
(symbol '2')
|
|
(symbol '5'))
|
|
(symbol 'date'))))
|
|
* set:
|
|
<baseset [4, 5, 3, 2]>
|
|
4
|
|
5
|
|
3
|
|
2
|
|
$ try 'rs(2 or 3, date)'
|
|
(func
|
|
(symbol 'rs')
|
|
(list
|
|
(or
|
|
(list
|
|
(symbol '2')
|
|
(symbol '3')))
|
|
(symbol 'date')))
|
|
* expanded:
|
|
(func
|
|
(symbol 'reverse')
|
|
(func
|
|
(symbol 'sort')
|
|
(list
|
|
(or
|
|
(list
|
|
(symbol '2')
|
|
(symbol '3')))
|
|
(symbol 'date'))))
|
|
* set:
|
|
<baseset [3, 2]>
|
|
3
|
|
2
|
|
$ try 'rs()'
|
|
(func
|
|
(symbol 'rs')
|
|
None)
|
|
hg: parse error: invalid number of arguments: 0
|
|
[255]
|
|
$ try 'rs(2)'
|
|
(func
|
|
(symbol 'rs')
|
|
(symbol '2'))
|
|
hg: parse error: invalid number of arguments: 1
|
|
[255]
|
|
$ try 'rs(2, data, 7)'
|
|
(func
|
|
(symbol 'rs')
|
|
(list
|
|
(symbol '2')
|
|
(symbol 'data')
|
|
(symbol '7')))
|
|
hg: parse error: invalid number of arguments: 3
|
|
[255]
|
|
$ try 'rs4(2 or 3, x, x, date)'
|
|
(func
|
|
(symbol 'rs4')
|
|
(list
|
|
(or
|
|
(list
|
|
(symbol '2')
|
|
(symbol '3')))
|
|
(symbol 'x')
|
|
(symbol 'x')
|
|
(symbol 'date')))
|
|
* expanded:
|
|
(func
|
|
(symbol 'reverse')
|
|
(func
|
|
(symbol 'sort')
|
|
(list
|
|
(or
|
|
(list
|
|
(symbol '2')
|
|
(symbol '3')))
|
|
(symbol 'date'))))
|
|
* set:
|
|
<baseset [3, 2]>
|
|
3
|
|
2
|
|
|
|
issue4553: check that revset aliases override existing hash prefix
|
|
|
|
$ hg log -qr e
|
|
e0cc66ef77e8
|
|
|
|
$ hg log -qr e --config revsetalias.e="all()"
|
|
2785f51eece5
|
|
d75937da8da0
|
|
5ed5505e9f1c
|
|
8528aa5637f2
|
|
2326846efdab
|
|
904fa392b941
|
|
e0cc66ef77e8
|
|
013af1973af4
|
|
d5d0dcbdc4d9
|
|
6a4f54cc779b
|
|
|
|
$ hg log -qr e: --config revsetalias.e="0"
|
|
2785f51eece5
|
|
d75937da8da0
|
|
5ed5505e9f1c
|
|
8528aa5637f2
|
|
2326846efdab
|
|
904fa392b941
|
|
e0cc66ef77e8
|
|
013af1973af4
|
|
d5d0dcbdc4d9
|
|
6a4f54cc779b
|
|
|
|
$ hg log -qr :e --config revsetalias.e="9"
|
|
2785f51eece5
|
|
d75937da8da0
|
|
5ed5505e9f1c
|
|
8528aa5637f2
|
|
2326846efdab
|
|
904fa392b941
|
|
e0cc66ef77e8
|
|
013af1973af4
|
|
d5d0dcbdc4d9
|
|
6a4f54cc779b
|
|
|
|
$ hg log -qr e:
|
|
e0cc66ef77e8
|
|
013af1973af4
|
|
d5d0dcbdc4d9
|
|
6a4f54cc779b
|
|
|
|
$ hg log -qr :e
|
|
2785f51eece5
|
|
d75937da8da0
|
|
5ed5505e9f1c
|
|
8528aa5637f2
|
|
2326846efdab
|
|
904fa392b941
|
|
e0cc66ef77e8
|
|
|
|
issue2549 - correct optimizations
|
|
|
|
$ try 'limit(1 or 2 or 3, 2) and not 2'
|
|
(and
|
|
(func
|
|
(symbol 'limit')
|
|
(list
|
|
(or
|
|
(list
|
|
(symbol '1')
|
|
(symbol '2')
|
|
(symbol '3')))
|
|
(symbol '2')))
|
|
(not
|
|
(symbol '2')))
|
|
* set:
|
|
<filteredset
|
|
<baseset [1, 2]>,
|
|
<not
|
|
<baseset [2]>>>
|
|
1
|
|
$ try 'max(1 or 2) and not 2'
|
|
(and
|
|
(func
|
|
(symbol 'max')
|
|
(or
|
|
(list
|
|
(symbol '1')
|
|
(symbol '2'))))
|
|
(not
|
|
(symbol '2')))
|
|
* set:
|
|
<filteredset
|
|
<baseset
|
|
<max
|
|
<fullreposet+ [0..=9]>,
|
|
<baseset [1, 2]>>>,
|
|
<not
|
|
<baseset [2]>>>
|
|
$ try 'min(1 or 2) and not 1'
|
|
(and
|
|
(func
|
|
(symbol 'min')
|
|
(or
|
|
(list
|
|
(symbol '1')
|
|
(symbol '2'))))
|
|
(not
|
|
(symbol '1')))
|
|
* set:
|
|
<filteredset
|
|
<baseset
|
|
<min
|
|
<fullreposet+ [0..=9]>,
|
|
<baseset [1, 2]>>>,
|
|
<not
|
|
<baseset [1]>>>
|
|
$ try 'last(1 or 2, 1) and not 2'
|
|
(and
|
|
(func
|
|
(symbol 'last')
|
|
(list
|
|
(or
|
|
(list
|
|
(symbol '1')
|
|
(symbol '2')))
|
|
(symbol '1')))
|
|
(not
|
|
(symbol '2')))
|
|
* set:
|
|
<filteredset
|
|
<baseset [2]>,
|
|
<not
|
|
<baseset [2]>>>
|
|
|
|
issue4289 - ordering of built-ins
|
|
$ hg log -M -q -r 3:2
|
|
8528aa5637f2
|
|
5ed5505e9f1c
|
|
|
|
test revsets started with 40-chars hash (issue3669)
|
|
|
|
$ ISSUE3669_TIP=`hg tip --template '{node}'`
|
|
$ hg log -r "${ISSUE3669_TIP}" --template '{node}\n'
|
|
6a4f54cc779b5949146617ba046459baab4a496f
|
|
$ hg log -r "${ISSUE3669_TIP}^" --template '{node}\n'
|
|
d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c
|
|
|
|
test or-ed indirect predicates (issue3775)
|
|
|
|
$ log '6 or 6^1' | sort
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
$ log '6^1 or 6' | sort
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
$ log '4 or 4~1' | sort
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ log '4~1 or 4' | sort
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ log '(0 or 2):(4 or 6) or 0 or 6' | sort
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
$ log '0 or 6 or (0 or 2):(4 or 6)' | sort
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
8528aa5637f252b36e034c373e36890ace37524c
|
|
904fa392b9415cad2ad08ac82d39bed6cfbcaa1c
|
|
d75937da8da0322d18c3771fb029ffd88b996c89
|
|
e0cc66ef77e8b6f711815af4e001a6594fde3ba5
|
|
|
|
tests for 'remote()' predicate:
|
|
#. (csets in remote) (id) (remote)
|
|
1. less than local current branch "default"
|
|
2. same with local specified "default"
|
|
3. more than local specified specified
|
|
|
|
$ hg clone --quiet -U . ../remote3
|
|
$ hg book -r 7 ".a.b.c."
|
|
$ hg book -r 2 "a-b-c-"
|
|
$ cd ../remote3
|
|
$ hg update -q 7
|
|
$ echo r > r
|
|
$ hg ci -Aqm 10
|
|
$ log 'remote()'
|
|
013af1973af4a1932911a575960a876af6c02aaa
|
|
$ log 'remote("a-b-c-")'
|
|
5ed5505e9f1c21de2345daabdd7913fe53e4acd2
|
|
$ cd ../repo
|
|
|
|
tests for concatenation of strings/symbols by "##"
|
|
|
|
$ try "278 ## '5f5' ## 1ee ## 'ce5'"
|
|
(_concat
|
|
(_concat
|
|
(_concat
|
|
(symbol '278')
|
|
(string '5f5'))
|
|
(symbol '1ee'))
|
|
(string 'ce5'))
|
|
* concatenated:
|
|
(string '2785f51eece5')
|
|
* set:
|
|
<baseset [0]>
|
|
0
|
|
|
|
$ echo 'cat4($1, $2, $3, $4) = $1 ## $2 ## $3 ## $4' >> .hg/hgrc
|
|
$ try "cat4(278, '5f5', 1ee, 'ce5')"
|
|
(func
|
|
(symbol 'cat4')
|
|
(list
|
|
(symbol '278')
|
|
(string '5f5')
|
|
(symbol '1ee')
|
|
(string 'ce5')))
|
|
* expanded:
|
|
(_concat
|
|
(_concat
|
|
(_concat
|
|
(symbol '278')
|
|
(string '5f5'))
|
|
(symbol '1ee'))
|
|
(string 'ce5'))
|
|
* concatenated:
|
|
(string '2785f51eece5')
|
|
* set:
|
|
<baseset [0]>
|
|
0
|
|
|
|
(check concatenation in alias nesting)
|
|
|
|
$ echo 'cat2($1, $2) = $1 ## $2' >> .hg/hgrc
|
|
$ echo 'cat2x2($1, $2, $3, $4) = cat2($1 ## $2, $3 ## $4)' >> .hg/hgrc
|
|
$ log "cat2x2(278, '5f5', 1ee, 'ce5')"
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
|
|
(check operator priority)
|
|
|
|
$ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc
|
|
$ log "cat2n2(2785f5, 1eece5, 6a4f54, cc779b)"
|
|
2785f51eece5a23075c6f1d74702d8d9cb8bf0d4
|
|
2326846efdab34abffaf5ad2e7831f64a8ebb017
|
|
|
|
$ cd ..
|
|
|
|
prepare repository that has "default" branches of multiple roots
|
|
|
|
$ hg init namedbranch
|
|
$ cd namedbranch
|
|
|
|
$ echo default0 >> a
|
|
$ hg ci -Aqm0
|
|
$ echo default1 >> a
|
|
$ hg ci -m1
|
|
|
|
$ setbranch stable
|
|
$ echo stable2 >> a
|
|
$ commit -m2
|
|
$ echo stable3 >> a
|
|
$ commit -m3
|
|
|
|
$ hg update -q null
|
|
$ echo default4 >> a
|
|
$ hg ci -Aqm4
|
|
$ echo default5 >> a
|
|
$ hg ci -m5
|
|
|
|
$ cd ..
|
|
|
|
test author/desc/keyword in problematic encoding
|
|
# unicode: cp932:
|
|
# u30A2 0x83 0x41(= 'A')
|
|
# u30C2 0x83 0x61(= 'a')
|
|
|
|
$ hg init problematicencoding
|
|
$ cd problematicencoding
|
|
|
|
$ $PYTHON > setup.sh <<EOF
|
|
> print(u'''
|
|
> echo a > text
|
|
> hg add text
|
|
> hg --encoding utf-8 commit -u '\\\u30A2' -m none
|
|
> echo b > text
|
|
> hg --encoding utf-8 commit -u '\\\u30C2' -m none
|
|
> echo c > text
|
|
> hg --encoding utf-8 commit -u none -m '\\\u30A2'
|
|
> echo d > text
|
|
> hg --encoding utf-8 commit -u none -m '\\\u30C2'
|
|
> ''')
|
|
> EOF
|
|
$ sh < setup.sh
|
|
|
|
test error message of bad revset
|
|
$ hg log -r 'foo\\'
|
|
hg: parse error at 3: syntax error in revset 'foo\\'
|
|
(foo\\
|
|
^ here)
|
|
[255]
|
|
|
|
$ cd ..
|
|
|
|
Test that revset predicate of extension isn't loaded at failure of
|
|
loading it
|
|
|
|
$ cd repo
|
|
|
|
$ cat <<EOF > $TESTTMP/custompredicate.py
|
|
> from edenscm.mercurial import error, registrar, revset
|
|
>
|
|
> revsetpredicate = registrar.revsetpredicate()
|
|
>
|
|
> @revsetpredicate('custom1()')
|
|
> def custom1(repo, subset, x):
|
|
> return revset.baseset([1])
|
|
>
|
|
> raise error.Abort('intentional failure of loading extension')
|
|
> EOF
|
|
$ cat <<EOF > .hg/hgrc
|
|
> [extensions]
|
|
> custompredicate = $TESTTMP/custompredicate.py
|
|
> EOF
|
|
|
|
$ hg debugrevspec "custom1()"
|
|
warning: extension custompredicate is disabled because it cannot be imported from $TESTTMP/custompredicate.py: intentional failure of loading extension
|
|
hg: parse error: unknown identifier: custom1
|
|
[255]
|
|
|
|
Test repo.anyrevs with customized revset overrides
|
|
|
|
$ cat > $TESTTMP/printprevset.py <<EOF
|
|
> from edenscm.mercurial import encoding, registrar
|
|
> cmdtable = {}
|
|
> command = registrar.command(cmdtable)
|
|
> @command('printprevset')
|
|
> def printprevset(ui, repo):
|
|
> alias = {}
|
|
> p = encoding.environ.get('P')
|
|
> if p:
|
|
> alias['P'] = p
|
|
> revs = repo.anyrevs(['P'], user=True, localalias=alias)
|
|
> ui.write('P=%r\n' % list(revs))
|
|
> EOF
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> custompredicate = !
|
|
> printprevset = $TESTTMP/printprevset.py
|
|
> EOF
|
|
|
|
$ hg --config revsetalias.P=1 printprevset
|
|
P=[1]
|
|
$ P=3 hg --config revsetalias.P=2 printprevset
|
|
P=[3]
|
|
|
|
$ cd ..
|
|
|
|
Test obsstore related revsets
|
|
|
|
$ hg init repo1
|
|
$ cd repo1
|
|
$ cat <<EOF >> .hg/hgrc
|
|
> [experimental]
|
|
> evolution.createmarkers=True
|
|
> EOF
|
|
|
|
$ drawdag <<'EOS'
|
|
> H F G
|
|
> | |/ # split: B -> E, F
|
|
> B C D E # amend: B -> C -> D
|
|
> \|/ | # amend: F -> G
|
|
> A A Z # amend: A -> Z
|
|
> EOS
|
|
|
|
$ hg log -G -r "all()" -T '{desc}\n'
|
|
o H
|
|
│
|
|
│ o G
|
|
│ │
|
|
│ │ x F
|
|
│ ├─╯
|
|
│ o E
|
|
│ │
|
|
│ │ o D
|
|
│ ├─╯
|
|
│ │ x C
|
|
│ ├─╯
|
|
x │ B
|
|
├─╯
|
|
│ o Z
|
|
│
|
|
x A
|
|
|
|
|
|
$ hg log -r "successors($Z)" -T '{desc}\n'
|
|
Z
|
|
|
|
$ hg log -r "successors($F)" -T '{desc}\n' --hidden
|
|
F
|
|
G
|
|
|
|
$ hg log -r "predecessors($Z)" -T '{desc}\n'
|
|
A
|
|
Z
|
|
|
|
$ hg log -r "predecessors($A)" -T '{desc}\n'
|
|
A
|
|
|
|
$ hg log -r "successors($B)" -T '{desc}\n'
|
|
B
|
|
C
|
|
D
|
|
E
|
|
F
|
|
G
|
|
|
|
$ hg log -r "successors($B)" -T '{desc}\n' --hidden
|
|
B
|
|
C
|
|
D
|
|
E
|
|
F
|
|
G
|
|
|
|
$ hg log -r "successors($B,1)" -T '{desc}\n' --hidden
|
|
B
|
|
C
|
|
E
|
|
F
|
|
|
|
$ hg log -r "predecessors($D)" -T '{desc}\n'
|
|
B
|
|
C
|
|
D
|
|
|
|
$ hg log -r "predecessors($D)" -T '{desc}\n' --hidden
|
|
B
|
|
C
|
|
D
|
|
|
|
$ hg log -r "predecessors($D,1)" -T '{desc}\n' --hidden
|
|
C
|
|
D
|
|
|
|
$ hg log -r "successors($B)-obsolete()" -T '{desc}\n' --hidden
|
|
D
|
|
E
|
|
G
|
|
|
|
$ hg log -r "successors($B+$A)-contentdivergent()" -T '{desc}\n'
|
|
A
|
|
Z
|
|
B
|
|
C
|
|
F
|
|
|
|
$ hg log -r "successors($B+$A)-contentdivergent()-obsolete()" -T '{desc}\n'
|
|
Z
|
|
|
|
Test `draft() & ::x` optimization
|
|
|
|
$ hg init $TESTTMP/repo2
|
|
$ cd $TESTTMP/repo2
|
|
$ hg debugdrawdag <<'EOS'
|
|
> P5 S1
|
|
> | |
|
|
> S2 | D3
|
|
> \|/
|
|
> P4
|
|
> |
|
|
> P3 D2
|
|
> | |
|
|
> P2 D1
|
|
> |/
|
|
> P1
|
|
> |
|
|
> P0
|
|
> EOS
|
|
$ hg debugmakepublic -r P5
|
|
$ hg phase --force --secret -r S1+S2
|
|
$ hg log -G -T '{desc} {phase}' -r 'sort(all(), topo, topo.firstbranch=P5)'
|
|
o P5 public
|
|
│
|
|
│ o S1 secret
|
|
│ │
|
|
│ o D3 draft
|
|
├─╯
|
|
│ o S2 secret
|
|
├─╯
|
|
o P4 public
|
|
│
|
|
o P3 public
|
|
│
|
|
o P2 public
|
|
│
|
|
│ o D2 draft
|
|
│ │
|
|
│ o D1 draft
|
|
├─╯
|
|
o P1 public
|
|
│
|
|
o P0 public
|
|
|
|
$ hg debugrevspec --verify -p analyzed -p optimized 'draft() & ::(((S1+D1+P5)-D3)+S2)'
|
|
* analyzed:
|
|
(and
|
|
(func
|
|
(symbol 'draft')
|
|
None)
|
|
(func
|
|
(symbol 'ancestors')
|
|
(or
|
|
(list
|
|
(and
|
|
(or
|
|
(list
|
|
(symbol 'S1')
|
|
(symbol 'D1')
|
|
(symbol 'P5')))
|
|
(not
|
|
(symbol 'D3')))
|
|
(symbol 'S2')))))
|
|
* optimized:
|
|
(func
|
|
(symbol '_phaseandancestors')
|
|
(list
|
|
(symbol 'draft')
|
|
(or
|
|
(list
|
|
(difference
|
|
(func
|
|
(symbol '_list')
|
|
(string 'S1\x00D1\x00P5'))
|
|
(symbol 'D3'))
|
|
(symbol 'S2')))))
|
|
$ hg debugrevspec --verify -p analyzed -p optimized 'secret() & ::9'
|
|
* analyzed:
|
|
(and
|
|
(func
|
|
(symbol 'secret')
|
|
None)
|
|
(func
|
|
(symbol 'ancestors')
|
|
(symbol '9')))
|
|
* optimized:
|
|
(func
|
|
(symbol '_phaseandancestors')
|
|
(list
|
|
(symbol 'secret')
|
|
(symbol '9')))
|
|
$ hg debugrevspec --verify -p optimized '(not public()) & ancestors(S1+D2+P5, 1)'
|
|
* optimized:
|
|
(and
|
|
(func
|
|
(symbol '_notpublic')
|
|
None)
|
|
(func
|
|
(symbol 'ancestors')
|
|
(list
|
|
(func
|
|
(symbol '_list')
|
|
(string 'S1\x00D2\x00P5'))
|
|
(symbol '1'))))
|
|
$ hg debugrevspec --verify -p optimized '(not public()) & ancestors(S1+D2+P5, depth=1)'
|
|
* optimized:
|
|
(and
|
|
(func
|
|
(symbol '_notpublic')
|
|
None)
|
|
(func
|
|
(symbol 'ancestors')
|
|
(list
|
|
(func
|
|
(symbol '_list')
|
|
(string 'S1\x00D2\x00P5'))
|
|
(keyvalue
|
|
(symbol 'depth')
|
|
(symbol '1')))))
|