mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
merge with stable
This commit is contained in:
Matt Mackall
commit
2e8a8d9ec3
@ -181,6 +181,7 @@ class bmstore(dict):
|
||||
for name, node in self.iteritems():
|
||||
fp.write("%s %s\n" % (hex(node), encoding.fromlocal(name)))
|
||||
self._clean = True
|
||||
self._repo.invalidatevolatilesets()
|
||||
|
||||
def expandname(self, bname):
|
||||
if bname == '.':
|
||||
|
||||
@ -1290,7 +1290,7 @@ def _pullbundle2(pullop):
|
||||
kwargs['heads'] = pullop.heads or pullop.rheads
|
||||
kwargs['cg'] = pullop.fetch
|
||||
if 'listkeys' in pullop.remotebundle2caps:
|
||||
kwargs['listkeys'] = ['phase']
|
||||
kwargs['listkeys'] = ['phases']
|
||||
if pullop.remotebookmarks is None:
|
||||
# make sure to always includes bookmark data when migrating
|
||||
# `hg incoming --bundle` to using this function.
|
||||
|
||||
@ -1161,6 +1161,9 @@ class ui(object):
|
||||
- msg: message explaining what is deprecated and how to upgrade,
|
||||
- version: last version where the API will be supported,
|
||||
"""
|
||||
if not (self.configbool('devel', 'all-warnings')
|
||||
or self.configbool('devel', 'deprec-warn')):
|
||||
return
|
||||
msg += ("\n(compatibility will be dropped after Mercurial-%s,"
|
||||
" update your code.)") % version
|
||||
self.develwarn(msg, stacklevel=2)
|
||||
|
||||
@ -44,12 +44,10 @@ Clone with background file closing enabled
|
||||
sending getbundle command
|
||||
bundle2-input-bundle: with-transaction
|
||||
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
|
||||
bundle2-input-part: total payload size 58
|
||||
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
|
||||
bundle2-input-bundle: 1 parts total
|
||||
checking for updated bookmarks
|
||||
preparing listkeys for "phases"
|
||||
sending listkeys command
|
||||
received listkey for "phases": 58 bytes
|
||||
|
||||
|
||||
Stream clone while repo is changing:
|
||||
|
||||
@ -32,8 +32,7 @@ Missing manifest should not result in server lookup
|
||||
$ cat server/access.log
|
||||
* - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
|
||||
* - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
|
||||
* - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phase%2Cbookmarks (glob)
|
||||
* - - [*] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases (glob)
|
||||
* - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phases%2Cbookmarks (glob)
|
||||
|
||||
Empty manifest file results in retrieval
|
||||
(the extension only checks if the manifest file exists)
|
||||
|
||||
@ -255,9 +255,8 @@ listkeys hook
|
||||
pulling from ../a
|
||||
listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
|
||||
no changes found
|
||||
listkeys hook: HG_NAMESPACE=phase HG_VALUES={}
|
||||
adding remote bookmark bar
|
||||
listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
|
||||
adding remote bookmark bar
|
||||
$ cd ../a
|
||||
|
||||
test that prepushkey can prevent incoming keys
|
||||
|
||||
@ -110,21 +110,16 @@ do not use the proxy if it is in the no list
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob)
|
||||
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
|
||||
|
||||
@ -262,13 +262,11 @@ test http authentication
|
||||
"GET /?cmd=stream_out HTTP/1.1" 401 -
|
||||
"GET /?cmd=stream_out HTTP/1.1" 200 -
|
||||
"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d
|
||||
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phase%2Cbookmarks
|
||||
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases
|
||||
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks
|
||||
"GET /?cmd=capabilities HTTP/1.1" 200 -
|
||||
"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D
|
||||
"GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phase%2Cbookmarks
|
||||
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phase%2Cbookmarks
|
||||
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases
|
||||
"GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks
|
||||
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks
|
||||
"GET /?cmd=capabilities HTTP/1.1" 200 -
|
||||
"GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip
|
||||
"GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces
|
||||
|
||||
@ -130,11 +130,11 @@ client only pulls down 1 changeset
|
||||
1 changesets found
|
||||
list of changesets:
|
||||
bec0734cd68e84477ba7fc1d13e6cff53ab70129
|
||||
listing keys for "phase"
|
||||
listing keys for "phases"
|
||||
listing keys for "bookmarks"
|
||||
bundle2-output-bundle: "HG20", 3 parts total
|
||||
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
|
||||
bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
|
||||
bundle2-output-part: "listkeys" (params: 1 mandatory) 58 bytes payload
|
||||
bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
|
||||
bundle2-input-bundle: with-transaction
|
||||
bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
|
||||
@ -146,9 +146,9 @@ client only pulls down 1 changeset
|
||||
added 1 changesets with 1 changes to 1 files (+1 heads)
|
||||
bundle2-input-part: total payload size 474
|
||||
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
|
||||
bundle2-input-part: total payload size 58
|
||||
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
|
||||
bundle2-input-bundle: 2 parts total
|
||||
checking for updated bookmarks
|
||||
listing keys for "phases"
|
||||
updating the branch cache
|
||||
(run 'hg heads' to see heads, 'hg merge' to merge)
|
||||
|
||||
@ -982,17 +982,21 @@ Test cache consistency for the visible filter
|
||||
bookmarks change
|
||||
$ cd ..
|
||||
$ cat >$TESTTMP/test_extension.py << EOF
|
||||
> import weakref
|
||||
> from mercurial import cmdutil, extensions, bookmarks, repoview
|
||||
> def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs):
|
||||
> repo = bkmstoreinst._repo
|
||||
> ret = orig(bkmstoreinst, *args, **kwargs)
|
||||
> hidden1 = repoview.computehidden(repo)
|
||||
> hidden = repoview.filterrevs(repo, 'visible')
|
||||
> if sorted(hidden1) != sorted(hidden):
|
||||
> print "cache inconsistency"
|
||||
> return ret
|
||||
> reporef = weakref.ref(bkmstoreinst._repo)
|
||||
> def trhook(tr):
|
||||
> repo = reporef()
|
||||
> hidden1 = repoview.computehidden(repo)
|
||||
> hidden = repoview.filterrevs(repo, 'visible')
|
||||
> if sorted(hidden1) != sorted(hidden):
|
||||
> print "cache inconsistency"
|
||||
> bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook)
|
||||
> orig(bkmstoreinst, *args, **kwargs)
|
||||
> def extsetup(ui):
|
||||
> extensions.wrapfunction(bookmarks.bmstore, 'write', _bookmarkchanged)
|
||||
> extensions.wrapfunction(bookmarks.bmstore, 'recordchange',
|
||||
> _bookmarkchanged)
|
||||
> EOF
|
||||
|
||||
$ hg init repo-cache-inconsistency
|
||||
@ -1013,6 +1017,10 @@ bookmarks change
|
||||
(use --hidden to access hidden revisions)
|
||||
[255]
|
||||
|
||||
Empty out the test extension, as it isn't compatible with later parts
|
||||
of the test.
|
||||
$ echo > $TESTTMP/test_extension.py
|
||||
|
||||
Test ability to pull changeset with locally applying obsolescence markers
|
||||
(issue4945)
|
||||
|
||||
|
||||
@ -465,13 +465,11 @@ debug output
|
||||
sending getbundle command
|
||||
bundle2-input-bundle: with-transaction
|
||||
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
|
||||
bundle2-input-part: total payload size 15
|
||||
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
|
||||
bundle2-input-part: total payload size 45
|
||||
bundle2-input-bundle: 1 parts total
|
||||
checking for updated bookmarks
|
||||
preparing listkeys for "phases"
|
||||
sending listkeys command
|
||||
received listkey for "phases": 15 bytes
|
||||
|
||||
$ cd ..
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user