| Lint Skipped |
| Unit Tests Skipped |
Seems fine, though this use case does make me wonder (a little) if we should give up and use sqlite for this so we don't end up constantly rewriting a massive file.
Don't rewrite in that direction though unless someone else wants to see that though.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/remotenames.py (14 lines) | |||
| M | tests/test-remotenames.t (4 lines) |
| """ | """ | ||||
| save remote bookmarks in .hg/remotenames/bookmarks. | save remote bookmarks in .hg/remotenames/bookmarks. | ||||
| The format of the data stored will be: | The format of the data stored will be: | ||||
| `node remotepath bookmarkname` | `node remotepath bookmarkname` | ||||
| bookmarks is a dictionary of remote bookmarks. | bookmarks is a dictionary of remote bookmarks. | ||||
| """ | """ | ||||
| olddata = set(readremotenamefile(repo, 'bookmarks')) | |||||
| vfs = vfsmod.vfs(repo.vfs.join(remotenamedir)) | vfs = vfsmod.vfs(repo.vfs.join(remotenamedir)) | ||||
| f = vfs('bookmarks', 'w', atomictemp=True) | f = vfs('bookmarks', 'w', atomictemp=True) | ||||
| # re-save the data from a different remote than this one. | |||||
| for node, oldpath, rname in sorted(olddata): | |||||
| if oldpath != remotepath: | |||||
| f.write('%s %s %s\n' % (node, oldpath, rname)) | |||||
| for bookmark, node in sorted(bookmarks.iteritems()): | for bookmark, node in sorted(bookmarks.iteritems()): | ||||
| if node: | if node: | ||||
| f.write('%s %s %s\n' % (node, remotepath, bookmark)) | f.write('%s %s %s\n' % (node, remotepath, bookmark)) | ||||
| f.close() | f.close() | ||||
| def saveremotebranches(repo, remotepath, branches): | def saveremotebranches(repo, remotepath, branches): | ||||
| """ | """ | ||||
| save remote branches is .hg/remotenames/branches. | save remote branches is .hg/remotenames/branches. | ||||
| The format of the data stored will be: | The format of the data stored will be: | ||||
| `node remotepath branchname` | `node remotepath branchname` | ||||
| branches is a dictionary of remote branches. | branches is a dictionary of remote branches. | ||||
| """ | """ | ||||
| olddata = set(readremotenamefile(repo, 'branches')) | |||||
| vfs = vfsmod.vfs(repo.vfs.join(remotenamedir)) | vfs = vfsmod.vfs(repo.vfs.join(remotenamedir)) | ||||
| f = vfs('branches', 'w', atomictemp=True) | f = vfs('branches', 'w', atomictemp=True) | ||||
| # re-save the data from a different remote than this one. | |||||
| for node, oldpath, rname in sorted(olddata): | |||||
| if oldpath != remotepath: | |||||
| f.write('%s %s %s\n' % (node, oldpath, rname)) | |||||
| for branch, nodes in sorted(branches.iteritems()): | for branch, nodes in sorted(branches.iteritems()): | ||||
| for n in nodes: | for n in nodes: | ||||
| f.write('%s %s %s\n' % (n, remotepath, branch)) | f.write('%s %s %s\n' % (n, remotepath, branch)) | ||||
| f.close() | f.close() | ||||
| def saveremotenames(repo, remotepath, branches=None, bookmarks=None): | def saveremotenames(repo, remotepath, branches=None, bookmarks=None): | ||||
| """ | """ | ||||
| Pulling form the new server | Pulling form the new server | ||||
| --------------------------- | --------------------------- | ||||
| $ cd ../client/ | $ cd ../client/ | ||||
| $ hg pull ../server2/ | $ hg pull ../server2/ | ||||
| pulling from ../server2/ | pulling from ../server2/ | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| $ cat .hg/remotenames/bookmarks | $ cat .hg/remotenames/bookmarks | ||||
| 62615734edd52f06b6fb9c2beb429e4fe30d57b8 file:$TESTTMP/server foo | |||||
| 87d6d66763085b629e6d7ed56778c79827273022 file:$TESTTMP/server bar | |||||
| 87d6d66763085b629e6d7ed56778c79827273022 file:$TESTTMP/server2 bar | 87d6d66763085b629e6d7ed56778c79827273022 file:$TESTTMP/server2 bar | ||||
| 62615734edd52f06b6fb9c2beb429e4fe30d57b8 file:$TESTTMP/server2 foo | 62615734edd52f06b6fb9c2beb429e4fe30d57b8 file:$TESTTMP/server2 foo | ||||
| $ cat .hg/remotenames/branches | $ cat .hg/remotenames/branches | ||||
| 3e1487808078543b0af6d10dadf5d46943578db0 file:$TESTTMP/server wat | |||||
| ec2426147f0e39dbc9cef599b066be6035ce691d file:$TESTTMP/server default | |||||
| ec2426147f0e39dbc9cef599b066be6035ce691d file:$TESTTMP/server2 default | ec2426147f0e39dbc9cef599b066be6035ce691d file:$TESTTMP/server2 default | ||||
| 3e1487808078543b0af6d10dadf5d46943578db0 file:$TESTTMP/server2 wat | 3e1487808078543b0af6d10dadf5d46943578db0 file:$TESTTMP/server2 wat | ||||