Fri, 11 Dec 2015 11:23:49 -0500 changegroup: introduce cg3, which has support for exchanging treemanifests
Augie Fackler <augie@google.com> [Fri, 11 Dec 2015 11:23:49 -0500] rev 27432
changegroup: introduce cg3, which has support for exchanging treemanifests I'm not entirely happy with using a trailing / on a "file" entry for transferring a treemanifest. We've discussed putting some flags on each file header[0], but I'm unconvinced that's actually any better: if we were going to add another feature to the cg format we'd still be doing a version bump anyway to cg4, so I'm inclined to not spend time coming up with a more sophisticated format until we actually know what the next feature we want to stuff in a changegroup will be. Test changes outside test-treemanifest.t are only due to the new CG3 bundlecap showing up in the wire protocol. Many thanks to adgar@google.com and martinvonz@google.com for helping me with various odd corners of the changegroup and treemanifest API. 0: It's not hard refactoring, nor is it a lot of work. I'm just disinclined to do speculative work when it's not clear what the customer would actually be.
Fri, 18 Dec 2015 14:40:11 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 18 Dec 2015 14:40:11 -0600] rev 27431
merge with stable
Thu, 17 Dec 2015 17:16:02 -0800 revlog: seek to end of file before writing (issue4943) stable
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 17 Dec 2015 17:16:02 -0800] rev 27430
revlog: seek to end of file before writing (issue4943) Revlogs were recently refactored to open file handles in "a+" and use a persistent file handle for reading and writing. This drastically reduced the number of file handles being opened. Unfortunately, it appears that some versions of Solaris lose the file offset when performing a write after the handle has been seeked. The simplest workaround is to seek to EOF on files opened in a+ mode before writing to them, which is what this patch does. Ideally, this code would exist in the vfs layer. However, this would require creating a proxy class for file objects in order to provide a custom implementation of write(). This would add overhead. Since revlogs are the only files we open in a+ mode, the one-off workaround in revlog.py should be sufficient. This patch appears to have little to no impact on performance on my Linux machine.
Mon, 14 Dec 2015 20:57:21 -0500 manifestmerge: have manifest do matching before diffing
Augie Fackler <augie@google.com> [Mon, 14 Dec 2015 20:57:21 -0500] rev 27429
manifestmerge: have manifest do matching before diffing This means that the diff code does less work, potentially significantly less in the case of treemanifests. It also should ease implementation with narrowed clone cases (such as narrowhg) when we don't always have the entire set of treemanifest revlogs locally. As far as I can tell, this codepath is currently only used by record, so it'll probably die in the near future, and then narrowhg won't have to worry about composing with some unknown matching system.
Thu, 17 Dec 2015 14:57:20 +0000 branch: reword help text
timeless <timeless@mozdev.org> [Thu, 17 Dec 2015 14:57:20 +0000] rev 27428
branch: reword help text We're not necessarily talking about *the* active branch, just any old branch.
Thu, 17 Dec 2015 14:56:32 +0000 archive: adjust help text
timeless <timeless@mozdev.org> [Thu, 17 Dec 2015 14:56:32 +0000] rev 27427
archive: adjust help text
Thu, 17 Dec 2015 14:54:47 +0000 annotate: add missing period to help
timeless <timeless@mozdev.org> [Thu, 17 Dec 2015 14:54:47 +0000] rev 27426
annotate: add missing period to help
Thu, 17 Dec 2015 14:54:20 +0000 addremove: make help match add
timeless <timeless@mozdev.org> [Thu, 17 Dec 2015 14:54:20 +0000] rev 27425
addremove: make help match add
(0) -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 tip