##// END OF EJS Templates
wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

File last commit:

r39525:f1186c29 default
r39595:07b58266 default
Show More
test-commandserver.t
1030 lines | 30.5 KiB | text/troff | Tads3Lexer
/ tests / test-commandserver.t
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 #if windows
$ PYTHONPATH="$TESTDIR/../contrib;$PYTHONPATH"
#else
$ PYTHONPATH="$TESTDIR/../contrib:$PYTHONPATH"
#endif
$ export PYTHONPATH
Yuya Nishihara
ui: separate option to show prompt echo, enabled only in tests (issue4417)...
r23053 typical client does not want echo-back messages, so test without it:
$ grep -v '^promptecho ' < $HGRCPATH >> $HGRCPATH.new
$ mv $HGRCPATH.new $HGRCPATH
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 $ hg init repo
$ cd repo
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from __future__ import absolute_import, print_function
>>> import os
>>> import sys
>>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def hellomessage(server):
... ch, data = readchannel(server)
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('%c, %r' % (ch, data))
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 ... # run an arbitrary command to make sure the next thing the server
... # sends isn't part of the hello message
... runcommand(server, ['id'])
Yuya Nishihara
cmdserver: include pid of server handling requests in hello message...
r23036 o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 000000000000 tip
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
>>> from hgclient import check
>>> @check
... def unknowncommand(server):
... server.stdin.write('unknowncommand\n')
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 abort: unknown command unknowncommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def checkruncommand(server):
... # hello block
... readchannel(server)
...
... # no args
... runcommand(server, [])
...
... # global options
... runcommand(server, ['id', '--quiet'])
...
... # make sure global options don't stick through requests
... runcommand(server, ['id'])
...
... # --config
... runcommand(server, ['id', '--config', 'ui.quiet=True'])
...
... # make sure --config doesn't stick
... runcommand(server, ['id'])
...
... # negative return code should be masked
... runcommand(server, ['id', '-runknown'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 Mercurial Distributed SCM
basic commands:
add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
anatoly techtonik
merge: be precise about what merged into what in short desc
r23400 merge merge another revision into working directory
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
timeless
help: use single quotes in use warning
r29974 (use 'hg help' for the full list of commands or 'hg -v' for details)
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id --quiet
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 000000000000
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 000000000000 tip
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id --config ui.quiet=True
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 000000000000
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 000000000000 tip
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id -runknown
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 abort: unknown revision 'unknown'!
[255]
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def inputeof(server):
... readchannel(server)
... server.stdin.write('runcommand\n')
... # close stdin while server is waiting for input
... server.stdin.close()
...
... # server exits with 1 if the pipe closed while reading the command
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('server exit code =', server.wait())
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 server exit code = 1
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, stringio
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def serverinput(server):
... readchannel(server)
...
... patch = """
... # HG changeset patch
... # User test
... # Date 0 0
... # Node ID c103a3dec114d882c98382d684d8af798d09d857
... # Parent 0000000000000000000000000000000000000000
... 1
...
... diff -r 000000000000 -r c103a3dec114 a
... --- /dev/null Thu Jan 01 00:00:00 1970 +0000
... +++ b/a Thu Jan 01 00:00:00 1970 +0000
... @@ -0,0 +1,1 @@
... +1
... """
...
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 ... runcommand(server, ['import', '-'], input=stringio(patch))
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 ... runcommand(server, ['log'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand import -
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 applying patch from stdin
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand log
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 changeset: 0:eff892de26ec
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Yuya Nishihara
dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options...
r35180 check strict parsing of early options:
>>> import os
>>> from hgclient import check, readchannel, runcommand
>>> os.environ['HGPLAIN'] = '+strictflags'
>>> @check
... def cwd(server):
... readchannel(server)
... runcommand(server, ['log', '-b', '--config=alias.log=!echo pwned',
... 'default'])
*** runcommand log -b --config=alias.log=!echo pwned default
abort: unknown revision '--config=alias.log=!echo pwned'!
[255]
Yuya Nishihara
histedit: use ui.fin to read commands from stdin...
r30262 check that "histedit --commands=-" can read rules from the input channel:
>>> import cStringIO
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
histedit: use ui.fin to read commands from stdin...
r30262 >>> @check
... def serverinput(server):
... readchannel(server)
... rules = 'pick eff892de26ec\n'
... runcommand(server, ['histedit', '0', '--commands=-',
... '--config', 'extensions.histedit='],
... input=cStringIO.StringIO(rules))
*** runcommand histedit 0 --commands=- --config extensions.histedit=
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 check that --cwd doesn't persist between requests:
$ mkdir foo
$ touch foo/bar
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def cwd(server):
... readchannel(server)
... runcommand(server, ['--cwd', 'foo', 'st', 'bar'])
... runcommand(server, ['st', 'foo/bar'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand --cwd foo st bar
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 ? bar
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand st foo/bar
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 ? foo/bar
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ rm foo/bar
check that local configs for the cached repo aren't inherited when -R is used:
$ cat <<EOF >> .hg/hgrc
> [ui]
> foo = bar
> EOF
Gregory Szorc
tests: conditionalize test-commandserver.t based on extra extensions...
r37445 #if no-extraextensions
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, sep
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def localhgrc(server):
... readchannel(server)
...
... # the cached repo local hgrc contains ui.foo=bar, so showconfig should
... # show it
... runcommand(server, ['showconfig'], outfilter=sep)
...
... # but not for this repo
... runcommand(server, ['init', 'foo'])
... runcommand(server, ['-R', 'foo', 'showconfig', 'ui', 'defaults'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand showconfig
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 bundle.mainreporoot=$TESTTMP/repo
Pierre-Yves David
devel: rename 'all' to 'all-warnings' (BC)...
r25290 devel.all-warnings=true
devel: activate default-date in tests...
r32410 devel.default-date=0 0
FUJIWARA Katsunori
tests: add extra output for fsmonitor at showconfig
r33426 extensions.fsmonitor= (fsmonitor !)
Matt Harbison
run-tests: set a default largefiles usercache in the default hgrc file...
r23388 largefiles.usercache=$TESTTMP/.cache/largefiles
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281 lfs.usercache=$TESTTMP/.cache/lfs
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 ui.slash=True
ui.interactive=False
ui.mergemarkers=detailed
ui.foo=bar
ui.nontty=true
Jun Wu
runtests: set web.address to localhost...
r31009 web.address=localhost
Jun Wu
runtests: always set web.ipv6...
r31010 web\.ipv6=(?:True|False) (re)
Gregory Szorc
hgweb: allow defining Server response header for HTTP server...
r37027 web.server-header=testing stub value
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand init foo
*** runcommand -R foo showconfig ui defaults
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 ui.slash=True
ui.interactive=False
ui.mergemarkers=detailed
ui.nontty=true
Gregory Szorc
tests: conditionalize test-commandserver.t based on extra extensions...
r37445 #endif
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ rm -R foo
#if windows
$ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH"
#else
$ PYTHONPATH="$TESTTMP/repo:$PYTHONPATH"
#endif
$ cat <<EOF > hook.py
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 > from __future__ import print_function
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 > import sys
> def hook(**args):
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 > print('hook talking')
> print('now try to read something: %r' % sys.stdin.read())
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 > EOF
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, stringio
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def hookoutput(server):
... readchannel(server)
... runcommand(server, ['--config',
... 'hooks.pre-identify=python:hook.hook',
... 'id'],
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 ... input=stringio('some input'))
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand --config hooks.pre-identify=python:hook.hook id
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 eff892de26ec tip
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 hook talking
now try to read something: ''
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Boris Feld
pypy: fix failing test files with Pypy5.6.0...
r33609 Clean hook cached version
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 $ rm hook.py*
Boris Feld
pypy: fix failing test files with Pypy5.6.0...
r33609 $ rm -Rf __pycache__
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ echo a >> a
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def outsidechanges(server):
... readchannel(server)
... runcommand(server, ['status'])
... os.system('hg ci -Am2')
... runcommand(server, ['tip'])
... runcommand(server, ['status'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand status
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 M a
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand tip
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 changeset: 1:d3a0a68be6de
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand status
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def bookmarks(server):
... readchannel(server)
... runcommand(server, ['bookmarks'])
...
... # changes .hg/bookmarks
... os.system('hg bookmark -i bm1')
... os.system('hg bookmark -i bm2')
... runcommand(server, ['bookmarks'])
...
... # changes .hg/bookmarks.current
... os.system('hg upd bm1 -q')
... runcommand(server, ['bookmarks'])
...
... runcommand(server, ['bookmarks', 'bm3'])
... f = open('a', 'ab')
... f.write('a\n')
... f.close()
... runcommand(server, ['commit', '-Amm'])
... runcommand(server, ['bookmarks'])
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922 ... print('')
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand bookmarks
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 no bookmarks set
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand bookmarks
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 bm1 1:d3a0a68be6de
bm2 1:d3a0a68be6de
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand bookmarks
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 * bm1 1:d3a0a68be6de
bm2 1:d3a0a68be6de
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand bookmarks bm3
*** runcommand commit -Amm
*** runcommand bookmarks
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 bm1 1:d3a0a68be6de
bm2 1:d3a0a68be6de
* bm3 2:aef17e88f5f0
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def tagscache(server):
... readchannel(server)
... runcommand(server, ['id', '-t', '-r', '0'])
... os.system('hg tag -r 0 foo')
... runcommand(server, ['id', '-t', '-r', '0'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id -t -r 0
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id -t -r 0
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 foo
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def setphase(server):
... readchannel(server)
... runcommand(server, ['phase', '-r', '.'])
... os.system('hg phase -r . -p')
... runcommand(server, ['phase', '-r', '.'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand phase -r .
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 3: draft
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand phase -r .
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 3: public
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ echo a >> a
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def rollback(server):
... readchannel(server)
... runcommand(server, ['phase', '-r', '.', '-p'])
... runcommand(server, ['commit', '-Am.'])
... runcommand(server, ['rollback'])
... runcommand(server, ['phase', '-r', '.'])
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922 ... print('')
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand phase -r . -p
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 no phases changed
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand commit -Am.
*** runcommand rollback
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 repository tip rolled back to revision 3 (undo commit)
working directory now based on revision 3
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand phase -r .
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 3: public
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def branch(server):
... readchannel(server)
... runcommand(server, ['branch'])
... os.system('hg branch foo')
... runcommand(server, ['branch'])
... os.system('hg branch default')
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand branch
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 default
marked working directory as branch foo
(branches are permanent and global, did you want a bookmark?)
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand branch
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 foo
marked working directory as branch default
(branches are permanent and global, did you want a bookmark?)
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ touch .hgignore
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def hgignore(server):
... readchannel(server)
... runcommand(server, ['commit', '-Am.'])
... f = open('ignored-file', 'ab')
... f.write('')
... f.close()
... f = open('.hgignore', 'ab')
... f.write('ignored-file')
... f.close()
... runcommand(server, ['status', '-i', '-u'])
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922 ... print('')
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand commit -Am.
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 adding .hgignore
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand status -i -u
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 I ignored-file
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405 cache of non-public revisions should be invalidated on repository change
(issue4855):
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405 >>> @check
... def phasesetscacheaftercommit(server):
... readchannel(server)
... # load _phasecache._phaserevs and _phasesets
... runcommand(server, ['log', '-qr', 'draft()'])
... # create draft commits by another process
Pulkit Goyal
py3: use range instead of xrange in tests/test-commandserver.t...
r36303 ... for i in range(5, 7):
Matt Harbison
test-commandserver: generate files with a fixed EOL for test stability...
r26431 ... f = open('a', 'ab')
... f.seek(0, os.SEEK_END)
... f.write('a\n')
... f.close()
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405 ... os.system('hg commit -Aqm%d' % i)
... # new commits should be listed as draft revisions
... runcommand(server, ['log', '-qr', 'draft()'])
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922 ... print('')
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405 *** runcommand log -qr draft()
4:7966c8e3734d
*** runcommand log -qr draft()
4:7966c8e3734d
5:41f6602d1c4f
6:10501e202c35
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405 >>> @check
... def phasesetscacheafterstrip(server):
... readchannel(server)
... # load _phasecache._phaserevs and _phasesets
... runcommand(server, ['log', '-qr', 'draft()'])
... # strip cached revisions by another process
... os.system('hg --config extensions.strip= strip -q 5')
... # shouldn't abort by "unknown revision '6'"
... runcommand(server, ['log', '-qr', 'draft()'])
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922 ... print('')
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405 *** runcommand log -qr draft()
4:7966c8e3734d
5:41f6602d1c4f
6:10501e202c35
*** runcommand log -qr draft()
4:7966c8e3734d
Augie Fackler
tests: add blank output lines to test-commandserver...
r33922
Yuya Nishihara
localrepo: recreate phasecache if changelog was modified (issue4855)...
r26405
cache of phase roots should be invalidated on strip (issue3827):
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, sep
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def phasecacheafterstrip(server):
... readchannel(server)
...
... # create new head, 5:731265503d86
... runcommand(server, ['update', '-C', '0'])
... f = open('a', 'ab')
... f.write('a\n')
... f.close()
... runcommand(server, ['commit', '-Am.', 'a'])
... runcommand(server, ['log', '-Gq'])
...
... # make it public; draft marker moves to 4:7966c8e3734d
... runcommand(server, ['phase', '-p', '.'])
... # load _phasecache.phaseroots
... runcommand(server, ['phase', '.'], outfilter=sep)
...
... # strip 1::4 outside server
... os.system('hg -q --config extensions.mq= strip 1')
...
... # shouldn't raise "7966c8e3734d: no node!"
... runcommand(server, ['branches'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand update -C 0
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
(leaving bookmark bm3)
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand commit -Am. a
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 created new head
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand log -Gq
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 @ 5:731265503d86
|
| o 4:7966c8e3734d
| |
| o 3:b9b85890c400
| |
| o 2:aef17e88f5f0
| |
| o 1:d3a0a68be6de
|/
o 0:eff892de26ec
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand phase -p .
*** runcommand phase .
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 5: public
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand branches
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 default 1:731265503d86
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Yuya Nishihara
localrepo: refresh filecache stats only if transaction finished successfully...
r26251 in-memory cache must be reloaded if transaction is aborted. otherwise
changelog and manifest would have invalid node:
$ echo a >> a
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
localrepo: refresh filecache stats only if transaction finished successfully...
r26251 >>> @check
... def txabort(server):
... readchannel(server)
... runcommand(server, ['commit', '--config', 'hooks.pretxncommit=false',
... '-mfoo'])
... runcommand(server, ['verify'])
*** runcommand commit --config hooks.pretxncommit=false -mfoo
transaction abort!
rollback completed
abort: pretxncommit hook exited with status 1
[255]
*** runcommand verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 2 changesets with 2 changes to 1 files
Yuya Nishihara
localrepo: refresh filecache stats only if transaction finished successfully...
r26251 $ hg revert --no-backup -aq
Durham Goode
obsolete: update tests to use obsolete options...
r22955 $ cat >> .hg/hgrc << EOF
> [experimental]
Boris Feld
config: use 'experimental.evolution.create-markers'...
r34867 > evolution.createmarkers=True
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 > EOF
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def obsolete(server):
... readchannel(server)
...
... runcommand(server, ['up', 'null'])
... runcommand(server, ['phase', '-df', 'tip'])
... cmd = 'hg debugobsolete `hg log -r tip --template {node}`'
... if os.name == 'nt':
... cmd = 'sh -c "%s"' % cmd # run in sh, not cmd.exe
... os.system(cmd)
... runcommand(server, ['log', '--hidden'])
... runcommand(server, ['log'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand up null
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand phase -df tip
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand log --hidden
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 changeset: 1:731265503d86
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
Boris Feld
obsfate: rename obsfate into obsolete in changeset_printer...
r34901 obsolete: pruned
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 summary: .
changeset: 0:eff892de26ec
bookmark: bm1
bookmark: bm2
bookmark: bm3
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand log
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 changeset: 0:eff892de26ec
bookmark: bm1
bookmark: bm2
bookmark: bm3
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ cat <<EOF >> .hg/hgrc
> [extensions]
> mq =
> EOF
>>> import os
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def mqoutsidechanges(server):
... readchannel(server)
...
... # load repo.mq
... runcommand(server, ['qapplied'])
... os.system('hg qnew 0.diff')
... # repo.mq should be invalidated
... runcommand(server, ['qapplied'])
...
... runcommand(server, ['qpop', '--all'])
... os.system('hg qqueue --create foo')
... # repo.mq should be recreated to point to new queue
... runcommand(server, ['qqueue', '--active'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand qapplied
*** runcommand qapplied
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 0.diff
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand qpop --all
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 popping 0.diff
patch queue now empty
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand qqueue --active
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 foo
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
$ cat <<EOF > dbgui.py
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 > import os
> import sys
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 > from mercurial import commands, registrar
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 > cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 > command = registrar.command(cmdtable)
Pulkit Goyal
py3: make sure commands name are bytes in tests
r33097 > @command(b"debuggetpass", norepo=True)
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 > def debuggetpass(ui):
> ui.write("%s\\n" % ui.getpass())
Pulkit Goyal
py3: make sure commands name are bytes in tests
r33097 > @command(b"debugprompt", norepo=True)
Yuya Nishihara
ui: disable echo back of prompt input if ui is set to non-tty purposely...
r22783 > def debugprompt(ui):
> ui.write("%s\\n" % ui.prompt("prompt:"))
Pulkit Goyal
py3: make sure commands name are bytes in tests
r33097 > @command(b"debugreadstdin", norepo=True)
Yuya Nishihara
cmdserver: protect pipe server streams against corruption caused by direct io...
r23324 > def debugreadstdin(ui):
> ui.write("read: %r\n" % sys.stdin.read(1))
Pulkit Goyal
py3: make sure commands name are bytes in tests
r33097 > @command(b"debugwritestdout", norepo=True)
Yuya Nishihara
cmdserver: protect pipe server streams against corruption caused by direct io...
r23324 > def debugwritestdout(ui):
> os.write(1, "low-level stdout fd and\n")
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 > sys.stdout.write("stdout should be redirected to stderr\n")
Yuya Nishihara
cmdserver: protect pipe server streams against corruption caused by direct io...
r23324 > sys.stdout.flush()
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 > EOF
$ cat <<EOF >> .hg/hgrc
> [extensions]
> dbgui = dbgui.py
> EOF
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, stringio
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def getpass(server):
... readchannel(server)
... runcommand(server, ['debuggetpass', '--config',
... 'ui.interactive=True'],
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 ... input=stringio('1234\n'))
Yuya Nishihara
ui: check EOF of getpass() response read from command-server channel...
r30814 ... runcommand(server, ['debuggetpass', '--config',
... 'ui.interactive=True'],
... input=stringio('\n'))
... runcommand(server, ['debuggetpass', '--config',
... 'ui.interactive=True'],
... input=stringio(''))
Yuya Nishihara
ui: disable echo back of prompt input if ui is set to non-tty purposely...
r22783 ... runcommand(server, ['debugprompt', '--config',
... 'ui.interactive=True'],
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 ... input=stringio('5678\n'))
Yuya Nishihara
cmdserver: protect pipe server streams against corruption caused by direct io...
r23324 ... runcommand(server, ['debugreadstdin'])
... runcommand(server, ['debugwritestdout'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand debuggetpass --config ui.interactive=True
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 password: 1234
Yuya Nishihara
ui: check EOF of getpass() response read from command-server channel...
r30814 *** runcommand debuggetpass --config ui.interactive=True
password:
*** runcommand debuggetpass --config ui.interactive=True
password: abort: response expected
[255]
Yuya Nishihara
ui: disable echo back of prompt input if ui is set to non-tty purposely...
r22783 *** runcommand debugprompt --config ui.interactive=True
prompt: 5678
Yuya Nishihara
cmdserver: protect pipe server streams against corruption caused by direct io...
r23324 *** runcommand debugreadstdin
read: ''
*** runcommand debugwritestdout
Yuya Nishihara
procutil: redirect ui.fout to stderr while stdio is protected...
r37237 low-level stdout fd and
stdout should be redirected to stderr
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Yuya Nishihara
cmdserver: use given streams as pipe channels like other commands...
r23322 run commandserver in commandserver, which is silly but should work:
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 >>> from __future__ import print_function
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, stringio
Yuya Nishihara
cmdserver: use given streams as pipe channels like other commands...
r23322 >>> @check
... def nested(server):
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('%c, %r' % readchannel(server))
Yuya Nishihara
cmdserver: use given streams as pipe channels like other commands...
r23322 ... class nestedserver(object):
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 ... stdin = stringio('getencoding\n')
... stdout = stringio()
Yuya Nishihara
cmdserver: use given streams as pipe channels like other commands...
r23322 ... runcommand(server, ['serve', '--cmdserver', 'pipe'],
... output=nestedserver.stdout, input=nestedserver.stdin)
... nestedserver.stdout.seek(0)
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('%c, %r' % readchannel(nestedserver)) # hello
... print('%c, %r' % readchannel(nestedserver)) # getencoding
Yuya Nishihara
cmdserver: use given streams as pipe channels like other commands...
r23322 o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
*** runcommand serve --cmdserver pipe
o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
r, '*' (glob)
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
start without repository:
$ cd ..
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 >>> from __future__ import print_function
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def hellomessage(server):
... ch, data = readchannel(server)
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('%c, %r' % (ch, data))
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 ... # run an arbitrary command to make sure the next thing the server
... # sends isn't part of the hello message
... runcommand(server, ['id'])
Yuya Nishihara
cmdserver: include pid of server handling requests in hello message...
r23036 o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand id
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 abort: there is no Mercurial repository here (.hg not found)
[255]
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
test-commandserver: port test functions from .py to .t...
r22568 >>> @check
... def startwithoutrepo(server):
... readchannel(server)
... runcommand(server, ['init', 'repo2'])
... runcommand(server, ['id', '-R', 'repo2'])
Yuya Nishihara
test-commandserver: make runcommand message bolder...
r22572 *** runcommand init repo2
*** runcommand id -R repo2
Yuya Nishihara
test-commandserver: add stub for .t test by copying .out with 2-space indent...
r22567 000000000000 tip
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994
Yuya Nishihara
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)...
r26142 don't fall back to cwd if invalid -R path is specified (issue4805):
$ cd repo
$ hg serve --cmdserver pipe -R ../nonexistent
abort: repository ../nonexistent not found!
[255]
$ cd ..
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994 unix domain socket:
$ cd repo
$ hg update -q
Matt Mackall
tests: don't try to test unix sockets on vfat
r23095 #if unix-socket unix-permissions
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 >>> from __future__ import print_function
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand, stringio, unixserver
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994 >>> server = unixserver('.hg/server.sock', '.hg/server.log')
>>> def hellomessage(conn):
... ch, data = readchannel(conn)
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('%c, %r' % (ch, data))
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994 ... runcommand(conn, ['id'])
>>> check(hellomessage, server.connect)
Yuya Nishihara
cmdserver: include pid of server handling requests in hello message...
r23036 o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994 *** runcommand id
eff892de26ec tip bm1/bm2/bm3
>>> def unknowncommand(conn):
... readchannel(conn)
... conn.stdin.write('unknowncommand\n')
>>> check(unknowncommand, server.connect) # error sent to server.log
>>> def serverinput(conn):
... readchannel(conn)
... patch = """
... # HG changeset patch
... # User test
... # Date 0 0
... 2
...
... diff -r eff892de26ec -r 1ed24be7e7a0 a
... --- a/a
... +++ b/a
... @@ -1,1 +1,2 @@
... 1
... +2
... """
timeless
test-commandserver: handle cStringIO.StringIO/io.StringIO divergence
r28836 ... runcommand(conn, ['import', '-'], input=stringio(patch))
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994 ... runcommand(conn, ['log', '-rtip', '-q'])
>>> check(serverinput, server.connect)
*** runcommand import -
applying patch from stdin
*** runcommand log -rtip -q
2:1ed24be7e7a0
>>> server.shutdown()
$ cat .hg/server.log
listening at .hg/server.sock
abort: unknown command unknowncommand
killed!
Yuya Nishihara
cmdserver: write early exception to 'e' channel in 'unix' mode...
r28511 $ rm .hg/server.log
if server crashed before hello, traceback will be sent to 'e' channel as
last ditch:
$ cat <<EOF >> .hg/hgrc
> [cmdserver]
> log = inexistent/path.log
> EOF
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 >>> from __future__ import print_function
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, unixserver
Yuya Nishihara
cmdserver: write early exception to 'e' channel in 'unix' mode...
r28511 >>> server = unixserver('.hg/server.sock', '.hg/server.log')
>>> def earlycrash(conn):
... while True:
... try:
... ch, data = readchannel(conn)
... if not data.startswith(' '):
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 ... print('%c, %r' % (ch, data))
Yuya Nishihara
cmdserver: write early exception to 'e' channel in 'unix' mode...
r28511 ... except EOFError:
... break
>>> check(earlycrash, server.connect)
e, 'Traceback (most recent call last):\n'
e, "IOError: *" (glob)
>>> server.shutdown()
$ cat .hg/server.log | grep -v '^ '
listening at .hg/server.sock
Traceback (most recent call last):
IOError: * (glob)
killed!
Matt Mackall
tests: don't try to test unix sockets on vfat
r23095 #endif
#if no-unix-socket
Yuya Nishihara
cmdserver: add service that listens on unix domain socket and forks process...
r22994
$ hg serve --cmdserver unix -a .hg/server.sock
abort: unsupported platform
[255]
#endif
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265
$ cd ..
Test that accessing to invalid changelog cache is avoided at
subsequent operations even if repo object is reused even after failure
of transaction (see 0a7610758c42 also)
"hg log" after failure of transaction is needed to detect invalid
cache in repoview: this can't detect by "hg verify" only.
Combination of "finalization" and "empty-ness of changelog" (2 x 2 =
4) are tested, because '00changelog.i' are differently changed in each
cases.
$ cat > $TESTTMP/failafterfinalize.py <<EOF
> # extension to abort transaction after finalization forcibly
> from mercurial import commands, error, extensions, lock as lockmod
Boris Feld
configitems: register the test 'failafterfinalize.fail' config
r34766 > from mercurial import registrar
> cmdtable = {}
> command = registrar.command(cmdtable)
> configtable = {}
> configitem = registrar.configitem(configtable)
> configitem('failafterfinalize', 'fail',
> default=None,
> )
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265 > def fail(tr):
> raise error.Abort('fail after finalization')
> def reposetup(ui, repo):
> class failrepo(repo.__class__):
> def commitctx(self, ctx, error=False):
> if self.ui.configbool('failafterfinalize', 'fail'):
> # 'sorted()' by ASCII code on category names causes
> # invoking 'fail' after finalization of changelog
> # using "'cl-%i' % id(self)" as category name
> self.currenttransaction().addfinalize('zzzzzzzz', fail)
> return super(failrepo, self).commitctx(ctx, error)
> repo.__class__ = failrepo
> EOF
$ hg init repo3
$ cd repo3
$ cat <<EOF >> $HGRCPATH
> [ui]
> logtemplate = {rev} {desc|firstline} ({files})\n
>
> [extensions]
> failafterfinalize = $TESTTMP/failafterfinalize.py
> EOF
- test failure with "empty changelog"
$ echo foo > foo
$ hg add foo
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 (failure before finalization)
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265 >>> @check
... def abort(server):
... readchannel(server)
... runcommand(server, ['commit',
... '--config', 'hooks.pretxncommit=false',
... '-mfoo'])
... runcommand(server, ['log'])
... runcommand(server, ['verify', '-q'])
*** runcommand commit --config hooks.pretxncommit=false -mfoo
transaction abort!
rollback completed
abort: pretxncommit hook exited with status 1
[255]
*** runcommand log
*** runcommand verify -q
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 (failure after finalization)
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265 >>> @check
... def abort(server):
... readchannel(server)
... runcommand(server, ['commit',
... '--config', 'failafterfinalize.fail=true',
... '-mfoo'])
... runcommand(server, ['log'])
... runcommand(server, ['verify', '-q'])
*** runcommand commit --config failafterfinalize.fail=true -mfoo
transaction abort!
rollback completed
abort: fail after finalization
[255]
*** runcommand log
*** runcommand verify -q
- test failure with "not-empty changelog"
$ echo bar > bar
$ hg add bar
$ hg commit -mbar bar
(failure before finalization)
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265 >>> @check
... def abort(server):
... readchannel(server)
... runcommand(server, ['commit',
... '--config', 'hooks.pretxncommit=false',
... '-mfoo', 'foo'])
... runcommand(server, ['log'])
... runcommand(server, ['verify', '-q'])
*** runcommand commit --config hooks.pretxncommit=false -mfoo foo
transaction abort!
rollback completed
abort: pretxncommit hook exited with status 1
[255]
*** runcommand log
0 bar (bar)
*** runcommand verify -q
(failure after finalization)
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
FUJIWARA Katsunori
repoview: discard filtered changelog if index isn't shared with unfiltered...
r28265 >>> @check
... def abort(server):
... readchannel(server)
... runcommand(server, ['commit',
... '--config', 'failafterfinalize.fail=true',
... '-mfoo', 'foo'])
... runcommand(server, ['log'])
... runcommand(server, ['verify', '-q'])
*** runcommand commit --config failafterfinalize.fail=true -mfoo foo
transaction abort!
rollback completed
abort: fail after finalization
[255]
*** runcommand log
0 bar (bar)
*** runcommand verify -q
Yuya Nishihara
tests: show cache of audited paths is never invalidated
r33721
$ cd ..
Test symlink traversal over cached audited paths:
-------------------------------------------------
#if symlink
set up symlink hell
$ mkdir merge-symlink-out
$ hg init merge-symlink
$ cd merge-symlink
$ touch base
$ hg commit -qAm base
$ ln -s ../merge-symlink-out a
$ hg commit -qAm 'symlink a -> ../merge-symlink-out'
$ hg up -q 0
$ mkdir a
$ touch a/poisoned
$ hg commit -qAm 'file a/poisoned'
$ hg log -G -T '{rev}: {desc}\n'
@ 2: file a/poisoned
|
| o 1: symlink a -> ../merge-symlink-out
|/
o 0: base
try trivial merge after update: cache of audited paths should be discarded,
and the merge should fail (issue5628)
$ hg up -q null
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
tests: show cache of audited paths is never invalidated
r33721 >>> @check
... def merge(server):
... readchannel(server)
... # audit a/poisoned as a good path
... runcommand(server, ['up', '-qC', '2'])
... runcommand(server, ['up', '-qC', '1'])
... # here a is a symlink, so a/poisoned is bad
... runcommand(server, ['merge', '2'])
*** runcommand up -qC 2
*** runcommand up -qC 1
*** runcommand merge 2
Siddharth Agarwal
merge: disable path conflict checking by default (issue5716)...
r34943 abort: path 'a/poisoned' traverses symbolic link 'a'
[255]
Yuya Nishihara
tests: show cache of audited paths is never invalidated
r33721 $ ls ../merge-symlink-out
cache of repo.auditor should be discarded, so matcher would never traverse
symlinks:
$ hg up -qC 0
$ touch ../merge-symlink-out/poisoned
Augie Fackler
tests: update test-commandserver to pass our import checker
r33923 >>> from hgclient import check, readchannel, runcommand
Yuya Nishihara
tests: show cache of audited paths is never invalidated
r33721 >>> @check
... def files(server):
... readchannel(server)
... runcommand(server, ['up', '-qC', '2'])
... # audit a/poisoned as a good path
... runcommand(server, ['files', 'a/poisoned'])
... runcommand(server, ['up', '-qC', '0'])
... runcommand(server, ['up', '-qC', '1'])
... # here 'a' is a symlink, so a/poisoned should be warned
... runcommand(server, ['files', 'a/poisoned'])
*** runcommand up -qC 2
*** runcommand files a/poisoned
a/poisoned
*** runcommand up -qC 0
*** runcommand up -qC 1
*** runcommand files a/poisoned
Yuya Nishihara
pathauditor: disable cache of audited paths by default (issue5628)...
r33722 abort: path 'a/poisoned' traverses symbolic link 'a'
[255]
Yuya Nishihara
tests: show cache of audited paths is never invalidated
r33721
$ cd ..
#endif