Mercurial > hgsubversion
view tests/fixtures/branch_delete_parent_dir.svndump @ 628:4375d37fea1e
svnrepo: fix issue 187: ignore pushable bookmarks in hg 1.6
Mercurial 1.6 introduces two new methods for repo subclasses -- pushkey and
listkeys -- to support pushing/pulling bookmarks between hg repositories.
(See mpm's blog post http://www.selenic.com/blog/?p=644 for details.)
Unfortunately, these are only defined in the subclasses, and not in the repo
base class. Perhaps the bookmarks extension should also be checking the repo
for pushkeys capability by calling repo.capable('pushkey') to check.
It doesn't.
In the meantime, we can implement these ourselves.
svnrepo should declare these methods since it is derived directly from repo.
They do nothing -- listkeys merely returns an empty dictionary; pushkey
returns False; this is the behaviour of httprepo or sshrepo when the remote
end is running an earlier version of Mercurial.
svnlocalrepo should not declare these methods since it derives from a
subclass of localrepo, which already will have them, unless some other badly
behaved extensions are doing something intensely weird.
| author | James McKay <code@jamesmckay.net> |
|---|---|
| date | Sun, 04 Jul 2010 18:21:20 +0100 |
| parents | 45df4d9320fa |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 60132d6f-a460-4b38-8ae6-633264894f73 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-06-30T23:57:20.562207Z PROPS-END Revision-number: 1 Prop-content-length: 101 Content-length: 101 K 7 svn:log V 3 btt K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:21.078798Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 106 Content-length: 106 K 7 svn:log V 8 add file K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:22.098826Z PROPS-END Node-path: trunk/foo Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 4 Text-content-md5: d3b07384d113edec49eaa6238ad5ff00 Text-content-sha1: f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 Content-length: 14 PROPS-END foo Revision-number: 3 Prop-content-length: 104 Content-length: 104 K 7 svn:log V 6 branch K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:25.055724Z PROPS-END Node-path: branches/dev_branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 19 delete branches dir K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:27.072926Z PROPS-END Node-path: branches Node-action: delete