2014-09-28 11:05:37 +04:00
|
|
|
#if windows
|
|
|
|
$ PYTHONPATH="$TESTDIR/../contrib;$PYTHONPATH"
|
|
|
|
#else
|
|
|
|
$ PYTHONPATH="$TESTDIR/../contrib:$PYTHONPATH"
|
|
|
|
#endif
|
|
|
|
$ export PYTHONPATH
|
|
|
|
|
2014-10-21 18:16:46 +04:00
|
|
|
typical client does not want echo-back messages, so test without it:
|
|
|
|
|
|
|
|
$ grep -v '^promptecho ' < $HGRCPATH >> $HGRCPATH.new
|
|
|
|
$ mv $HGRCPATH.new $HGRCPATH
|
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
$ hg init repo
|
|
|
|
$ cd repo
|
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from __future__ import absolute_import, print_function
|
|
|
|
>>> import os
|
|
|
|
>>> import sys
|
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def hellomessage(server):
|
|
|
|
... ch, data = readchannel(server)
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('%c, %r' % (ch, data))
|
2014-09-28 11:05:37 +04:00
|
|
|
... # run an arbitrary command to make sure the next thing the server
|
|
|
|
... # sends isn't part of the hello message
|
|
|
|
... runcommand(server, ['id'])
|
2014-10-18 07:24:50 +04:00
|
|
|
o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id
|
2014-09-28 09:27:40 +04:00
|
|
|
000000000000 tip
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
>>> from hgclient import check
|
|
|
|
>>> @check
|
|
|
|
... def unknowncommand(server):
|
|
|
|
... server.stdin.write('unknowncommand\n')
|
2014-09-28 09:27:40 +04:00
|
|
|
abort: unknown command unknowncommand
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand
|
2014-09-28 09:27:40 +04:00
|
|
|
Mercurial Distributed SCM
|
|
|
|
|
2018-10-15 19:35:15 +03:00
|
|
|
hg COMMAND [OPTIONS]
|
|
|
|
|
|
|
|
These are some common Mercurial commands. Use 'hg help commands' to list all
|
|
|
|
commands, and 'hg help COMMAND' to get help on a specific command.
|
|
|
|
|
2018-10-18 21:05:39 +03:00
|
|
|
Get the latest commits from the server:
|
2014-09-28 09:27:40 +04:00
|
|
|
|
2018-10-18 21:05:39 +03:00
|
|
|
pull pull changes from the specified source
|
2018-10-15 19:35:15 +03:00
|
|
|
|
2018-10-18 21:05:39 +03:00
|
|
|
View commits:
|
2018-10-15 19:35:15 +03:00
|
|
|
|
2018-10-18 21:05:39 +03:00
|
|
|
show show commit in detail
|
|
|
|
diff show differences between commits
|
|
|
|
|
|
|
|
Check out a commit:
|
2018-10-15 19:35:15 +03:00
|
|
|
|
2018-11-08 06:57:38 +03:00
|
|
|
checkout check out a specific commit
|
2018-10-15 19:35:15 +03:00
|
|
|
|
2018-10-18 21:05:39 +03:00
|
|
|
Work with your checkout:
|
|
|
|
|
2018-11-08 06:57:38 +03:00
|
|
|
status list files with pending changes
|
|
|
|
add start tracking the specified files
|
|
|
|
remove delete the specified tracked files
|
|
|
|
forget stop tracking the specified files
|
|
|
|
revert change the specified files to match a commit
|
2018-10-15 19:35:15 +03:00
|
|
|
|
|
|
|
Commit changes and modify commits:
|
|
|
|
|
2018-11-08 06:57:38 +03:00
|
|
|
commit save all pending changes or specified files in a new commit
|
2018-10-15 19:35:15 +03:00
|
|
|
|
|
|
|
Rearrange commits:
|
|
|
|
|
2018-10-15 19:35:15 +03:00
|
|
|
graft copy commits from a different location
|
2018-10-15 19:35:15 +03:00
|
|
|
|
2018-10-30 17:58:06 +03:00
|
|
|
Undo changes:
|
|
|
|
|
|
|
|
uncommit uncommit part or all of the current commit
|
|
|
|
|
2018-10-18 21:05:39 +03:00
|
|
|
Other commands:
|
2018-10-15 19:35:15 +03:00
|
|
|
|
2018-11-08 06:57:38 +03:00
|
|
|
config show config settings
|
2018-10-26 04:04:16 +03:00
|
|
|
grep search for a pattern in tracked files in the working directory
|
2018-10-15 19:35:15 +03:00
|
|
|
|
|
|
|
Additional help topics:
|
|
|
|
|
2018-11-08 06:57:38 +03:00
|
|
|
filesets specifying files by their characteristics
|
|
|
|
glossary common terms
|
|
|
|
patterns specifying files by file name pattern
|
|
|
|
revisions specifying commits
|
|
|
|
templating customizing output with templates
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id --quiet
|
2014-09-28 09:27:40 +04:00
|
|
|
000000000000
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id
|
2014-09-28 09:27:40 +04:00
|
|
|
000000000000 tip
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id --config ui.quiet=True
|
2014-09-28 09:27:40 +04:00
|
|
|
000000000000
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id
|
2014-09-28 09:27:40 +04:00
|
|
|
000000000000 tip
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id -runknown
|
2014-09-28 09:27:40 +04:00
|
|
|
abort: unknown revision 'unknown'!
|
|
|
|
[255]
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('server exit code =', server.wait())
|
2014-09-28 09:27:40 +04:00
|
|
|
server exit code = 1
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, stringio
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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
|
|
|
|
... """
|
|
|
|
...
|
2016-04-06 23:34:34 +03:00
|
|
|
... runcommand(server, ['import', '-'], input=stringio(patch))
|
2014-09-28 11:05:37 +04:00
|
|
|
... runcommand(server, ['log'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand import -
|
2014-09-28 09:27:40 +04:00
|
|
|
applying patch from stdin
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand log
|
2014-09-28 09:27:40 +04:00
|
|
|
changeset: 0:eff892de26ec
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 1
|
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2017-11-23 16:17:03 +03:00
|
|
|
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]
|
|
|
|
|
2016-03-19 03:15:06 +03:00
|
|
|
check that "histedit --commands=-" can read rules from the input channel:
|
|
|
|
|
|
|
|
>>> import cStringIO
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2016-03-19 03:15:06 +03:00
|
|
|
>>> @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=
|
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
check that --cwd doesn't persist between requests:
|
|
|
|
|
|
|
|
$ mkdir foo
|
|
|
|
$ touch foo/bar
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def cwd(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['--cwd', 'foo', 'st', 'bar'])
|
|
|
|
... runcommand(server, ['st', 'foo/bar'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand --cwd foo st bar
|
2014-09-28 09:27:40 +04:00
|
|
|
? bar
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand st foo/bar
|
2014-09-28 09:27:40 +04:00
|
|
|
? foo/bar
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
$ 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
|
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, sep
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand showconfig
|
2014-09-28 09:27:40 +04:00
|
|
|
bundle.mainreporoot=$TESTTMP/repo
|
2015-05-27 00:14:36 +03:00
|
|
|
devel.all-warnings=true
|
2017-05-22 17:59:57 +03:00
|
|
|
devel.default-date=0 0
|
2017-07-12 21:17:58 +03:00
|
|
|
extensions.fsmonitor= (fsmonitor !)
|
2018-06-26 05:34:37 +03:00
|
|
|
fsmonitor.detectrace=1 (fsmonitor !)
|
2014-09-28 09:27:40 +04:00
|
|
|
ui.slash=True
|
|
|
|
ui.interactive=False
|
|
|
|
ui.mergemarkers=detailed
|
2016-04-21 07:30:18 +03:00
|
|
|
ui.usehttp2=true (?)
|
2014-09-28 09:27:40 +04:00
|
|
|
ui.foo=bar
|
|
|
|
ui.nontty=true
|
2017-02-16 11:13:29 +03:00
|
|
|
web.address=localhost
|
2017-02-16 19:43:59 +03:00
|
|
|
web\.ipv6=(?:True|False) (re)
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand init foo
|
|
|
|
*** runcommand -R foo showconfig ui defaults
|
2014-09-28 09:27:40 +04:00
|
|
|
ui.slash=True
|
|
|
|
ui.interactive=False
|
|
|
|
ui.mergemarkers=detailed
|
2016-04-21 07:30:18 +03:00
|
|
|
ui.usehttp2=true (?)
|
2014-09-28 09:27:40 +04:00
|
|
|
ui.nontty=true
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
$ rm -R foo
|
|
|
|
|
|
|
|
#if windows
|
|
|
|
$ PYTHONPATH="$TESTTMP/repo;$PYTHONPATH"
|
|
|
|
#else
|
|
|
|
$ PYTHONPATH="$TESTTMP/repo:$PYTHONPATH"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
$ cat <<EOF > hook.py
|
2016-07-03 19:58:24 +03:00
|
|
|
> from __future__ import print_function
|
2014-09-28 11:05:37 +04:00
|
|
|
> import sys
|
|
|
|
> def hook(**args):
|
2016-07-03 19:58:24 +03:00
|
|
|
> print('hook talking')
|
|
|
|
> print('now try to read something: %r' % sys.stdin.read())
|
2014-09-28 11:05:37 +04:00
|
|
|
> EOF
|
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, stringio
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def hookoutput(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['--config',
|
|
|
|
... 'hooks.pre-identify=python:hook.hook',
|
|
|
|
... 'id'],
|
2016-04-06 23:34:34 +03:00
|
|
|
... input=stringio('some input'))
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand --config hooks.pre-identify=python:hook.hook id
|
2014-09-28 09:27:40 +04:00
|
|
|
eff892de26ec tip
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2017-07-31 18:43:45 +03:00
|
|
|
Clean hook cached version
|
2014-09-28 11:05:37 +04:00
|
|
|
$ rm hook.py*
|
2017-07-31 18:43:45 +03:00
|
|
|
$ rm -Rf __pycache__
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
$ echo a >> a
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def outsidechanges(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['status'])
|
|
|
|
... os.system('hg ci -Am2')
|
|
|
|
... runcommand(server, ['tip'])
|
|
|
|
... runcommand(server, ['status'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand status
|
2014-09-28 09:27:40 +04:00
|
|
|
M a
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand tip
|
2014-09-28 09:27:40 +04:00
|
|
|
changeset: 1:d3a0a68be6de
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand status
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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'])
|
2017-08-22 23:37:56 +03:00
|
|
|
... print('')
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand bookmarks
|
2014-09-28 09:27:40 +04:00
|
|
|
no bookmarks set
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand bookmarks
|
2014-09-28 09:27:40 +04:00
|
|
|
bm1 1:d3a0a68be6de
|
|
|
|
bm2 1:d3a0a68be6de
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand bookmarks
|
2014-09-28 09:27:40 +04:00
|
|
|
* bm1 1:d3a0a68be6de
|
|
|
|
bm2 1:d3a0a68be6de
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand bookmarks bm3
|
|
|
|
*** runcommand commit -Amm
|
|
|
|
*** runcommand bookmarks
|
2014-09-28 09:27:40 +04:00
|
|
|
bm1 1:d3a0a68be6de
|
|
|
|
bm2 1:d3a0a68be6de
|
|
|
|
* bm3 2:aef17e88f5f0
|
2017-08-22 23:37:56 +03:00
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id -t -r 0
|
2014-09-28 09:27:40 +04:00
|
|
|
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id -t -r 0
|
2014-09-28 09:27:40 +04:00
|
|
|
foo
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def setphase(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['phase', '-r', '.'])
|
|
|
|
... os.system('hg phase -r . -p')
|
|
|
|
... runcommand(server, ['phase', '-r', '.'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand phase -r .
|
2014-09-28 09:27:40 +04:00
|
|
|
3: draft
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand phase -r .
|
2014-09-28 09:27:40 +04:00
|
|
|
3: public
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
$ echo a >> a
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def rollback(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['phase', '-r', '.', '-p'])
|
|
|
|
... runcommand(server, ['commit', '-Am.'])
|
|
|
|
... runcommand(server, ['rollback'])
|
|
|
|
... runcommand(server, ['phase', '-r', '.'])
|
2017-08-22 23:37:56 +03:00
|
|
|
... print('')
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand phase -r . -p
|
2014-09-28 09:27:40 +04:00
|
|
|
no phases changed
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand commit -Am.
|
|
|
|
*** runcommand rollback
|
2014-09-28 09:27:40 +04:00
|
|
|
repository tip rolled back to revision 3 (undo commit)
|
|
|
|
working directory now based on revision 3
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand phase -r .
|
2014-09-28 09:27:40 +04:00
|
|
|
3: public
|
2017-08-22 23:37:56 +03:00
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
$ touch .hgignore
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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'])
|
2017-08-22 23:37:56 +03:00
|
|
|
... print('')
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand commit -Am.
|
2014-09-28 09:27:40 +04:00
|
|
|
adding .hgignore
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand status -i -u
|
2014-09-28 09:27:40 +04:00
|
|
|
I ignored-file
|
2017-08-22 23:37:56 +03:00
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2015-09-29 15:57:08 +03:00
|
|
|
cache of non-public revisions should be invalidated on repository change
|
|
|
|
(issue4855):
|
|
|
|
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2015-09-29 15:57:08 +03:00
|
|
|
>>> @check
|
|
|
|
... def phasesetscacheaftercommit(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... # load _phasecache._phaserevs and _phasesets
|
|
|
|
... runcommand(server, ['log', '-qr', 'draft()'])
|
|
|
|
... # create draft commits by another process
|
|
|
|
... for i in xrange(5, 7):
|
2015-10-02 04:49:50 +03:00
|
|
|
... f = open('a', 'ab')
|
|
|
|
... f.seek(0, os.SEEK_END)
|
|
|
|
... f.write('a\n')
|
|
|
|
... f.close()
|
2015-09-29 15:57:08 +03:00
|
|
|
... os.system('hg commit -Aqm%d' % i)
|
|
|
|
... # new commits should be listed as draft revisions
|
|
|
|
... runcommand(server, ['log', '-qr', 'draft()'])
|
2017-08-22 23:37:56 +03:00
|
|
|
... print('')
|
2015-09-29 15:57:08 +03:00
|
|
|
*** runcommand log -qr draft()
|
|
|
|
4:7966c8e3734d
|
|
|
|
*** runcommand log -qr draft()
|
|
|
|
4:7966c8e3734d
|
|
|
|
5:41f6602d1c4f
|
|
|
|
6:10501e202c35
|
2017-08-22 23:37:56 +03:00
|
|
|
|
2015-09-29 15:57:08 +03:00
|
|
|
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2015-09-29 15:57:08 +03:00
|
|
|
>>> @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()'])
|
2017-08-22 23:37:56 +03:00
|
|
|
... print('')
|
2015-09-29 15:57:08 +03:00
|
|
|
*** runcommand log -qr draft()
|
|
|
|
4:7966c8e3734d
|
|
|
|
5:41f6602d1c4f
|
|
|
|
6:10501e202c35
|
|
|
|
*** runcommand log -qr draft()
|
|
|
|
4:7966c8e3734d
|
2017-08-22 23:37:56 +03:00
|
|
|
|
2015-09-29 15:57:08 +03:00
|
|
|
|
|
|
|
cache of phase roots should be invalidated on strip (issue3827):
|
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, sep
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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
|
2018-07-30 18:46:11 +03:00
|
|
|
... os.system('hg -q --config extensions.strip= strip 1')
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand update -C 0
|
2014-09-28 09:27:40 +04:00
|
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
|
(leaving bookmark bm3)
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand commit -Am. a
|
|
|
|
*** runcommand log -Gq
|
2014-09-28 09:27:40 +04:00
|
|
|
@ 5:731265503d86
|
|
|
|
|
|
|
|
|
| o 4:7966c8e3734d
|
|
|
|
| |
|
|
|
|
| o 3:b9b85890c400
|
|
|
|
| |
|
|
|
|
| o 2:aef17e88f5f0
|
|
|
|
| |
|
|
|
|
| o 1:d3a0a68be6de
|
|
|
|
|/
|
|
|
|
o 0:eff892de26ec
|
|
|
|
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand phase -p .
|
|
|
|
*** runcommand phase .
|
2014-09-28 09:27:40 +04:00
|
|
|
5: public
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2015-09-14 18:32:39 +03:00
|
|
|
in-memory cache must be reloaded if transaction is aborted. otherwise
|
|
|
|
changelog and manifest would have invalid node:
|
|
|
|
|
|
|
|
$ echo a >> a
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2015-09-14 18:32:39 +03:00
|
|
|
>>> @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
|
|
|
|
1 files, 2 changesets, 2 total revisions
|
|
|
|
$ hg revert --no-backup -aq
|
|
|
|
|
2014-10-15 00:34:25 +04:00
|
|
|
$ cat >> .hg/hgrc << EOF
|
|
|
|
> [experimental]
|
2017-09-28 20:19:06 +03:00
|
|
|
> evolution.createmarkers=True
|
2014-09-28 11:05:37 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
>>> import os
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @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'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand up null
|
2014-09-28 09:27:40 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand phase -df tip
|
2017-07-16 03:33:14 +03:00
|
|
|
obsoleted 1 changesets
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand log --hidden
|
2014-09-28 09:27:40 +04:00
|
|
|
changeset: 1:731265503d86
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
2017-10-19 13:32:42 +03:00
|
|
|
obsolete: pruned
|
2014-09-28 09:27:40 +04:00
|
|
|
summary: .
|
|
|
|
|
|
|
|
changeset: 0:eff892de26ec
|
|
|
|
bookmark: bm1
|
|
|
|
bookmark: bm2
|
|
|
|
bookmark: bm3
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 1
|
|
|
|
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand log
|
2014-09-28 09:27:40 +04:00
|
|
|
changeset: 0:eff892de26ec
|
|
|
|
bookmark: bm1
|
|
|
|
bookmark: bm2
|
|
|
|
bookmark: bm3
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 1
|
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
$ cat <<EOF > dbgui.py
|
2017-08-22 21:26:25 +03:00
|
|
|
> import os
|
|
|
|
> import sys
|
2019-01-30 03:25:33 +03:00
|
|
|
> from edenscm.mercurial import commands, registrar
|
2014-09-28 11:05:37 +04:00
|
|
|
> cmdtable = {}
|
2016-01-09 17:07:20 +03:00
|
|
|
> command = registrar.command(cmdtable)
|
2017-06-25 05:50:05 +03:00
|
|
|
> @command(b"debuggetpass", norepo=True)
|
2014-09-28 11:05:37 +04:00
|
|
|
> def debuggetpass(ui):
|
|
|
|
> ui.write("%s\\n" % ui.getpass())
|
2017-06-25 05:50:05 +03:00
|
|
|
> @command(b"debugprompt", norepo=True)
|
2014-10-08 15:51:01 +04:00
|
|
|
> def debugprompt(ui):
|
|
|
|
> ui.write("%s\\n" % ui.prompt("prompt:"))
|
2017-06-25 05:50:05 +03:00
|
|
|
> @command(b"debugreadstdin", norepo=True)
|
2014-11-15 07:50:43 +03:00
|
|
|
> def debugreadstdin(ui):
|
|
|
|
> ui.write("read: %r\n" % sys.stdin.read(1))
|
2017-06-25 05:50:05 +03:00
|
|
|
> @command(b"debugwritestdout", norepo=True)
|
2014-11-15 07:50:43 +03:00
|
|
|
> def debugwritestdout(ui):
|
|
|
|
> os.write(1, "low-level stdout fd and\n")
|
|
|
|
> sys.stdout.write("stdout should be redirected to /dev/null\n")
|
|
|
|
> sys.stdout.flush()
|
2014-09-28 11:05:37 +04:00
|
|
|
> EOF
|
|
|
|
$ cat <<EOF >> .hg/hgrc
|
|
|
|
> [extensions]
|
|
|
|
> dbgui = dbgui.py
|
|
|
|
> EOF
|
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, stringio
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def getpass(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['debuggetpass', '--config',
|
|
|
|
... 'ui.interactive=True'],
|
2016-04-06 23:34:34 +03:00
|
|
|
... input=stringio('1234\n'))
|
2017-01-14 14:31:35 +03:00
|
|
|
... runcommand(server, ['debuggetpass', '--config',
|
|
|
|
... 'ui.interactive=True'],
|
|
|
|
... input=stringio('\n'))
|
|
|
|
... runcommand(server, ['debuggetpass', '--config',
|
|
|
|
... 'ui.interactive=True'],
|
|
|
|
... input=stringio(''))
|
2014-10-08 15:51:01 +04:00
|
|
|
... runcommand(server, ['debugprompt', '--config',
|
|
|
|
... 'ui.interactive=True'],
|
2016-04-06 23:34:34 +03:00
|
|
|
... input=stringio('5678\n'))
|
2014-11-15 07:50:43 +03:00
|
|
|
... runcommand(server, ['debugreadstdin'])
|
|
|
|
... runcommand(server, ['debugwritestdout'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand debuggetpass --config ui.interactive=True
|
2014-09-28 09:27:40 +04:00
|
|
|
password: 1234
|
2017-01-14 14:31:35 +03:00
|
|
|
*** runcommand debuggetpass --config ui.interactive=True
|
|
|
|
password:
|
|
|
|
*** runcommand debuggetpass --config ui.interactive=True
|
|
|
|
password: abort: response expected
|
|
|
|
[255]
|
2014-10-08 15:51:01 +04:00
|
|
|
*** runcommand debugprompt --config ui.interactive=True
|
|
|
|
prompt: 5678
|
2014-11-15 07:50:43 +03:00
|
|
|
*** runcommand debugreadstdin
|
|
|
|
read: ''
|
|
|
|
*** runcommand debugwritestdout
|
2014-09-28 11:05:37 +04:00
|
|
|
|
|
|
|
|
2014-11-15 06:43:35 +03:00
|
|
|
run commandserver in commandserver, which is silly but should work:
|
|
|
|
|
2016-07-03 19:58:24 +03:00
|
|
|
>>> from __future__ import print_function
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, stringio
|
2014-11-15 06:43:35 +03:00
|
|
|
>>> @check
|
|
|
|
... def nested(server):
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('%c, %r' % readchannel(server))
|
2014-11-15 06:43:35 +03:00
|
|
|
... class nestedserver(object):
|
2016-04-06 23:34:34 +03:00
|
|
|
... stdin = stringio('getencoding\n')
|
|
|
|
... stdout = stringio()
|
2014-11-15 06:43:35 +03:00
|
|
|
... runcommand(server, ['serve', '--cmdserver', 'pipe'],
|
|
|
|
... output=nestedserver.stdout, input=nestedserver.stdin)
|
|
|
|
... nestedserver.stdout.seek(0)
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('%c, %r' % readchannel(nestedserver)) # hello
|
|
|
|
... print('%c, %r' % readchannel(nestedserver)) # getencoding
|
2014-11-15 06:43:35 +03:00
|
|
|
o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
|
|
|
|
*** runcommand serve --cmdserver pipe
|
|
|
|
o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
|
|
|
|
r, '*' (glob)
|
|
|
|
|
|
|
|
|
2014-09-28 11:05:37 +04:00
|
|
|
start without repository:
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2016-07-03 19:58:24 +03:00
|
|
|
>>> from __future__ import print_function
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def hellomessage(server):
|
|
|
|
... ch, data = readchannel(server)
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('%c, %r' % (ch, data))
|
2014-09-28 11:05:37 +04:00
|
|
|
... # run an arbitrary command to make sure the next thing the server
|
|
|
|
... # sends isn't part of the hello message
|
|
|
|
... runcommand(server, ['id'])
|
2014-10-18 07:24:50 +04:00
|
|
|
o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand id
|
2014-09-28 09:27:40 +04:00
|
|
|
abort: there is no Mercurial repository here (.hg not found)
|
|
|
|
[255]
|
2014-09-28 11:05:37 +04:00
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2014-09-28 11:05:37 +04:00
|
|
|
>>> @check
|
|
|
|
... def startwithoutrepo(server):
|
|
|
|
... readchannel(server)
|
|
|
|
... runcommand(server, ['init', 'repo2'])
|
|
|
|
... runcommand(server, ['id', '-R', 'repo2'])
|
2014-09-28 12:21:38 +04:00
|
|
|
*** runcommand init repo2
|
|
|
|
*** runcommand id -R repo2
|
2014-09-28 09:27:40 +04:00
|
|
|
000000000000 tip
|
2014-10-04 11:46:50 +04:00
|
|
|
|
|
|
|
|
2015-08-31 17:29:15 +03:00
|
|
|
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 ..
|
|
|
|
|
|
|
|
|
2014-10-04 11:46:50 +04:00
|
|
|
unix domain socket:
|
|
|
|
|
|
|
|
$ cd repo
|
|
|
|
$ hg update -q
|
|
|
|
|
2014-10-28 00:39:57 +03:00
|
|
|
#if unix-socket unix-permissions
|
2014-10-04 11:46:50 +04:00
|
|
|
|
2016-07-03 19:58:24 +03:00
|
|
|
>>> from __future__ import print_function
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand, stringio, unixserver
|
2014-10-04 11:46:50 +04:00
|
|
|
>>> server = unixserver('.hg/server.sock', '.hg/server.log')
|
|
|
|
>>> def hellomessage(conn):
|
|
|
|
... ch, data = readchannel(conn)
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('%c, %r' % (ch, data))
|
2014-10-04 11:46:50 +04:00
|
|
|
... runcommand(conn, ['id'])
|
|
|
|
>>> check(hellomessage, server.connect)
|
2014-10-18 07:24:50 +04:00
|
|
|
o, 'capabilities: getencoding runcommand\nencoding: *\npid: *' (glob)
|
2014-10-04 11:46:50 +04:00
|
|
|
*** 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
|
|
|
|
... """
|
2016-04-06 23:34:34 +03:00
|
|
|
... runcommand(conn, ['import', '-'], input=stringio(patch))
|
2014-10-04 11:46:50 +04:00
|
|
|
... 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!
|
2016-03-12 16:03:30 +03:00
|
|
|
$ 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
|
2016-07-03 19:58:24 +03:00
|
|
|
>>> from __future__ import print_function
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, unixserver
|
2016-03-12 16:03:30 +03:00
|
|
|
>>> server = unixserver('.hg/server.sock', '.hg/server.log')
|
|
|
|
>>> def earlycrash(conn):
|
|
|
|
... while True:
|
|
|
|
... try:
|
|
|
|
... ch, data = readchannel(conn)
|
|
|
|
... if not data.startswith(' '):
|
2016-07-03 19:58:24 +03:00
|
|
|
... print('%c, %r' % (ch, data))
|
2016-03-12 16:03:30 +03:00
|
|
|
... 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!
|
2014-10-28 00:39:57 +03:00
|
|
|
#endif
|
|
|
|
#if no-unix-socket
|
2014-10-04 11:46:50 +04:00
|
|
|
|
|
|
|
$ hg serve --cmdserver unix -a .hg/server.sock
|
|
|
|
abort: unsupported platform
|
|
|
|
[255]
|
|
|
|
|
|
|
|
#endif
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
|
|
|
|
$ 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
|
2019-01-30 03:25:33 +03:00
|
|
|
> from edenscm.mercurial import commands, error, extensions, lock as lockmod
|
|
|
|
> from edenscm.mercurial import registrar
|
2017-10-14 00:53:06 +03:00
|
|
|
> cmdtable = {}
|
|
|
|
> command = registrar.command(cmdtable)
|
|
|
|
> configtable = {}
|
|
|
|
> configitem = registrar.configitem(configtable)
|
|
|
|
> configitem('failafterfinalize', 'fail',
|
|
|
|
> default=None,
|
|
|
|
> )
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
> 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
|
|
|
|
|
2016-10-18 00:16:55 +03:00
|
|
|
(failure before finalization)
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
>>> @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
|
|
|
|
|
2016-10-18 00:16:55 +03:00
|
|
|
(failure after finalization)
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
>>> @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)
|
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
>>> @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)
|
|
|
|
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
repoview: discard filtered changelog if index isn't shared with unfiltered
Before this patch, revisions rollbacked at failure of previous
transaction might be visible at subsequent operations unintentionally,
if repoview object is reused even after failure of transaction:
e.g. command server and HTTP server are typical cases.
'repoview' uses the tuple of values below of unfiltered changelog as
"the key" to examine validity of filtered changelog cache.
- length
- tip node
- filtered revisions (as hashed value)
- '_delayed' field
'repoview' compares between "the key" of unfiltered changelog at
previous caching and now, and reuses filtered changelog cache if no
change is detected.
But this comparison indicates only that there is no change between
unfiltered 'repo.changelog' at last caching and now, but not that
filtered changelog cache is valid for current unfiltered one.
'repoview' uses "shallow copy" of unfiltered changelog to create
filtered changelog cache. In this case, 'index' buffer of unfiltered
changelog is also referred by filtered changelog.
At failure of transaction, unfiltered changelog itself is invalidated
(= un-referred) on the 'repo' side (see b7829fc79508 also). But
'index' of it still contains revisions to be rollbacked at this
failure, and is referred by filtered changelog.
Therefore, even if there is no change between unfiltered
'repo.changelog' at last caching and now, steps below makes rollbacked
revisions visible via filtered changelog unintentionally.
1. instantiate unfiltered changelog as 'repo.changelog'
(call it CL1)
2. make filtered (= shallow copy of) CL1
(call it FCL1)
3. cache FCL1 with "the key" of CL1
4. revisions are appended to 'index', which is shared by CL1 and FCL1
5. invalidate 'repo.changelog' (= CL1) at failure of transaction
6. instantiate 'repo.changelog' again at next operation
(call it CL2)
CL2 doesn't have revisions added at (4), because it is
instantiated from '00changelog.i', which isn't changed while
failed transaction.
7. compare between "the key" of CL1 and CL2
8. FCL1 cached at (3) is reused, because comparison at (7) doesn't
detect change between CL1 at (1) and CL2
9. revisions rollbacked at (5) are visible via FCL1 unintentionally,
because FCL1 still refers 'index' changed at (4)
The root cause of this issue is that there is no examination about
validity of filtered changelog cache against current unfiltered one.
This patch discards filtered changelog cache, if its 'index' object
isn't shared with unfiltered one.
BTW, at the time of this patch, redundant truncation of
'00changelog.i' at failure of transaction (see b7829fc79508 for
detail) often prevents "hg serve" from making already rollbacked
revisions visible, because updating timestamps of '00changelog.i' by
truncation makes "hg serve" discard old repoview object with invalid
filtered changelog cache.
This is reason why this issue is overlooked before this patch, even
though test-bundle2-exchange.t has tests in similar situation: failure
of "hg push" via HTTP by pretxnclose hook on server side doesn't
prevent subsequent commands from looking up outgoing revisions
correctly.
But timestamp on the filesystem doesn't have enough resolution for
recent computation power, and it can't be assumed that this avoidance
always works as expected.
Therefore, without this patch, this issue might appear occasionally.
2016-02-24 00:10:46 +03:00
|
|
|
>>> @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
|
2017-08-01 15:03:25 +03:00
|
|
|
|
|
|
|
$ 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
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2017-08-01 15:03:25 +03:00
|
|
|
>>> @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
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'a/poisoned' traverses symbolic link 'a'
|
|
|
|
[255]
|
2017-08-01 15:03:25 +03:00
|
|
|
$ 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
|
2017-08-22 21:26:25 +03:00
|
|
|
>>> from hgclient import check, readchannel, runcommand
|
2017-08-01 15:03:25 +03:00
|
|
|
>>> @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
|
2017-07-26 16:10:15 +03:00
|
|
|
abort: path 'a/poisoned' traverses symbolic link 'a'
|
|
|
|
[255]
|
2017-08-01 15:03:25 +03:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
#endif
|