Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Ingo Molnar
* Petr Baudis <[EMAIL PROTECTED]> wrote: > > I think pull is pull. If you are doing lots of local stuff and do not > > want it overwritten, it should have been in a forked branch. > > I disagree. This already forces you to have two branches (one to pull > from to get the data, mirroring the re

Re: [PATCH] write-tree performance problems

2005-04-20 Thread H. Peter Anvin
Linus Torvalds wrote: So I'll see if I can turn the current fsck into a "convert into uncompressed format", and do a nice clean format conversion. Just let me know what you want to do, and I can trivially change the conversion scripts I've already written to do what you want. -hpa - To

enforcing DB immutability

2005-04-20 Thread Ingo Molnar
* Linus Torvalds <[EMAIL PROTECTED]> wrote: > On Wed, 13 Apr 2005, Ingo Molnar wrote: > > > > well, the 'owned by another user' solution is valid though, and doesnt > > have this particular problem. (We've got a secure multiuser OS, so can > > as well use it to protect the DB against corruptio

[PATCH] Unify usage() strings.

2005-04-20 Thread Junio C Hamano
This patch changes identical cut-and-paste usage strings into a single instance of static string, to make maintenance easier. Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]> --- commit-tree.c | 14 ++ diff-cache.c |6 -- diff-tree.c |6 -- read-tree.c | 10

Re: enforcing DB immutability

2005-04-20 Thread Ingo Molnar
* Ingo Molnar <[EMAIL PROTECTED]> wrote: > perhaps having a new 'immutable hardlink' feature in the Linux VFS > would help? I.e. a hardlink that can only be readonly followed, and > can be removed, but cannot be chmod-ed to a writeable hardlink. That i > think would be a large enough barrier f

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread Juliusz Chroboczek
> However, I'm claiming a token is defined by the file's language, and > that a replace patch on anything but a token as per those language > standards is a silly thing. Please recall the context of this discussion: getting Darcs to grok git repositories. You are arguing that it should be possibl

Re: enforcing DB immutability

2005-04-20 Thread Ingo Molnar
* Ingo Molnar <[EMAIL PROTECTED]> wrote: > > perhaps having a new 'immutable hardlink' feature in the Linux VFS > > would help? I.e. a hardlink that can only be readonly followed, and > > can be removed, but cannot be chmod-ed to a writeable hardlink. That i > > think would be a large enough b

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread Juliusz Chroboczek
> We're talking about interoperating with a Git repository here, > right? Even if we got the metadata in there, doesn't Git have to > understand a replace patch for things to work out? > 0. All three are in sync to begin with. > 1. CC creates a token-replace patch, sends the changes in normal hu

Re: enforcing DB immutability

2005-04-20 Thread linux
[A discussion on the git list about how to provide a hardlinked file that *cannot* me modified by an editor, but must be replaced by a new copy.] [EMAIL PROTECTED] wrote all of: >>> perhaps having a new 'immutable hardlink' feature in the Linux VFS >>> would help? I.e. a hardlink that can only be

Re: enforcing DB immutability

2005-04-20 Thread Chris Wedgwood
On Wed, Apr 20, 2005 at 09:53:20AM +0200, Ingo Molnar wrote: > so the only sensible thing the editor/tool can do when it wants to > change the file is precisely what we want: it will copy the > hardlinked files's contents to a new file, and will replace the old > file with the new file - a copy on

WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Linus Torvalds
I converted my git archives (kernel and git itself) to do the SHA1 hash _before_ the compression phase. So I'll just have to publically admit that everybody who complained about that particular design decision was right. Oh, well. On Wed, 20 Apr 2005, H. Peter Anvin wrote: > Linus Torvalds wr

wit - demo site

2005-04-20 Thread Christian Meder
Hi, thanks to my friend Frank Sattelberger I got access to a site where I could set up a demo for wit: http://grmso.net:8090 Couple of notes wrt why I work on another git web interface compared with Kay's work: * I was already experimenting and implementing for a couple of days when Kay's tool

Re: wit 0.0.3 - a web interface for git available

2005-04-20 Thread Christoph Hellwig
On Wed, Apr 20, 2005 at 02:29:11AM +0200, Christian Meder wrote: > Hi, > > ok it's starting to look like spam ;-) > > I uploaded a new version of wit to http://www.absolutegiganten.org/wit Got an url where it can be seen on a live repository? - To unsubscribe from this list: send the line "unsu

Re: wit 0.0.3 - a web interface for git available

2005-04-20 Thread Christoph Hellwig
On Tue, Apr 19, 2005 at 09:18:29PM -0700, Greg KH wrote: > On Wed, Apr 20, 2005 at 02:29:11AM +0200, Christian Meder wrote: > > Hi, > > > > ok it's starting to look like spam ;-) > > > > I uploaded a new version of wit to http://www.absolutegiganten.org/wit > > Why not work together with Kay's t

[PATCH] Give better default modes to merge results.

2005-04-20 Thread Junio C Hamano
As shipped, the example git-merge-one-file-script often leaves the merge result with not-so-useful mode bits, especially with glibc 2.0.7 or later whose mkstemp() creates temporary file with mode 0600. This contradicts the way checkout-cache creates new files, which is to use 0666 (or 0777 for fil

Re: wit 0.0.3 - a web interface for git available

2005-04-20 Thread Christian Meder
On Wed, 2005-04-20 at 10:42 +0100, Christoph Hellwig wrote: > On Tue, Apr 19, 2005 at 09:18:29PM -0700, Greg KH wrote: > > On Wed, Apr 20, 2005 at 02:29:11AM +0200, Christian Meder wrote: > > > Hi, > > > > > > ok it's starting to look like spam ;-) > > > > > > I uploaded a new version of wit to h

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Ingo Molnar
* Linus Torvalds <[EMAIL PROTECTED]> wrote: > So to convert your old git setup to a new git setup, do the following: > [...] did this for two repositories (git and kernel-git), it works as advertised. Ingo - To unsubscribe from this list: send the line "unsubscribe git" in the body of

[ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread Tom Lord
`git', by Linus Torvalds, contains some very good ideas and some very entertaining source code -- recommended reading for hackers. /GNU Arch/ will adopt `git': >From the /Arch/ perspective: `git' technology will form the basis of a new archive/revlib/cache format and the basis of new network tra

[ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread Tom Lord
`git', by Linus Torvalds, contains some very good ideas and some very entertaining source code -- recommended reading for hackers. /GNU Arch/ will adopt `git': >From the /Arch/ perspective: `git' technology will form the basis of a new archive/revlib/cache format and the basis of new network tra

Re: git-viz tool for visualising commit trees

2005-04-20 Thread Ingo Molnar
* Petr Baudis <[EMAIL PROTECTED]> wrote: > Hi, > > just FYI, Olivier Andrieu was kind enough to port his monotone-viz > tool to git (http://oandrieu.nerim.net/monotone-viz/ - use the one > from the monotone repository). The tool visualizes the history flow > nicely; see > > http://

Re: [GNU-arch-dev] [ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread Miles Bader
Way to go. -Miles -- Do not taunt Happy Fun Ball. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread David Roundy
On Tue, Apr 19, 2005 at 09:49:12AM -0700, Linus Torvalds wrote: > On Tue, 19 Apr 2005, Tupshin Harper wrote: > > I suspect that any use of wildcards in a new format would be impossible > > for darcs since it wouldn't allow darcs to construct dependencies, > > though I'll leave it to david to respon

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread David Roundy
On Tue, Apr 19, 2005 at 02:25:18PM +0200, Petr Baudis wrote: > Dear diary, on Tue, Apr 19, 2005 at 02:20:55PM CEST, I got a letter > where Juliusz Chroboczek <[EMAIL PROTECTED]> told me that... > > > The problem is that there is no sequence of alien versions that one > > > can differentiate. Git h

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread David Roundy
On Tue, Apr 19, 2005 at 02:20:55PM +0200, Juliusz Chroboczek wrote: > [Removing Linus from CC, keeping the Git list -- or should we remove it?] I think leaving much of this on git would be appropriate, since there are issues of how to relate to git that should be relevant. > > If we do it right (

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread David Roundy
On Tue, Apr 19, 2005 at 06:11:43PM -0700, Ray Lee wrote: > > second patch: > > replace ./hello.c [A-Za-z_0-9] world universe > > Aha! Okay, I now see at least part of issue: we're using different > definitions of 'token.' Yours is quite sensible, in that it matches the > darcs syntax. However, I'm

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Jon Seymour
On 4/20/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > I converted my git archives (kernel and git itself) to do the SHA1 hash > _before_ the compression phase. > Linus, Am I correct to understand that with this change, all the objects in the database are still being compressed (so no n

[git] simplify Makefile

2005-04-20 Thread Andre Noll
Use a generic rule for executables that depend only on the corresponding .o and on $(LIB_FILE). Signed-Off-By: Andre Noll <[EMAIL PROTECTED]> --- Makefile | 49 ++--- 1 files changed, 2 insertions(+), 47 deletions(-) Makefile: cd299f850679b2456e360d3

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Martin Uecker
On Wed, Apr 20, 2005 at 10:11:10PM +1000, Jon Seymour wrote: > On 4/20/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > > > > I converted my git archives (kernel and git itself) to do the SHA1 hash > > _before_ the compression phase. > > > > Linus, > > Am I correct to understand that with

Blob chunking code. [First look.]

2005-04-20 Thread C. Scott Ananian
So I wrote up my ideas regarding blob chunking as code; see attached. This is against git-0.4 (I know, ancient, but I had to start somewhere.) The idea here is that blobs are chunked using a rolling checksum (so the chunk boundaries are content-dependent and stay fixed even if you mutate pieces o

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Morten Welinder
On 4/20/05, Martin Uecker <[EMAIL PROTECTED]> wrote: > The storage method of the database of a collection of > files in the underlying file system. Because of the > random nature of the hashes this leads to a horrible > amount of seeking for all operations which walk the > logical structure of som

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Jon Seymour
> The main point is not about trying different compression > techniques but that you don't need to compress at all just > to calculate the hash of some data. (to know if it is > unchanged for example) > Ah, ok, I didn't understand that there were extra compresses being performed for that reason.

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread David Woodhouse
On Wed, 2005-04-20 at 02:08 -0700, Linus Torvalds wrote: > I converted my git archives (kernel and git itself) to do the SHA1 > hash _before_ the compression phase. I'm happy to see that -- because I'm going to be asking you to make another change which will also require a simple repository conver

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Jon Seymour wrote: > > Am I correct to understand that with this change, all the objects in the > database are still being compressed (so no net performance benefit), but by > doing the SHA1 calculations before compression you are keeping open the > possibility that at so

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread C. Scott Ananian
On Wed, 20 Apr 2005, Martin Uecker wrote: The other thing I don't like is the use of a sha1 for a complete file. Switching to some kind of hash tree would allow to introduce chunks later. This has two advantages: You can (and my code demonstrates/will demonstrate) still use a whole-file hash to us

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread C. Scott Ananian
On Wed, 20 Apr 2005, Linus Torvalds wrote: - _keep_ the same compression format, but notice that we already have an object by looking at the uncompressed one. With a chunked file, you can also skip writing certain *subtrees* of the file as soon as you notice it's already present on disk. I can

Re: enforcing DB immutability

2005-04-20 Thread Nick Craig-Wood
On Wed, Apr 20, 2005 at 09:49:48AM +0200, Ingo Molnar wrote: > * Ingo Molnar <[EMAIL PROTECTED]> wrote: > > > perhaps having a new 'immutable hardlink' feature in the Linux VFS > > would help? I.e. a hardlink that can only be readonly followed, and > > can be removed, but cannot be chmod-ed to a

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Linus Torvalds
On Thu, 21 Apr 2005, David Woodhouse wrote: > > The reason for doing this is that without it, we can't ever have a full > history actually connected to the current trees. There'd always be a > break at 2.6.12-rc2, at which point you'd have to switch to an entirely > different git repository. Qu

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Martin Uecker
On Wed, Apr 20, 2005 at 10:30:15AM -0400, C. Scott Ananian wrote: Hi, your code looks pretty cool. thank you! > On Wed, 20 Apr 2005, Martin Uecker wrote: > > >The other thing I don't like is the use of a sha1 > >for a complete file. Switching to some kind of hash > >tree would allow to introduc

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Chris Mason
On Wednesday 20 April 2005 02:43, Linus Torvalds wrote: > On Tue, 19 Apr 2005, Chris Mason wrote: > > I'll finish off the patch once you ok the basics below. My current code > > works like this: > > Chris, before you do anything further, let me re-consider. > > Assuming that the real cost of write

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread C. Scott Ananian
On Wed, 20 Apr 2005, Martin Uecker wrote: You can (and my code demonstrates/will demonstrate) still use a whole-file hash to use chunking. With content prefixes, this takes O(N ln M) time (where N is the file size and M is the number of chunks) to compute all hashes; if subtrees can share the same

Re: [PATCH 1/4] Accept commit in some places when tree is needed.

2005-04-20 Thread Linus Torvalds
On Tue, 19 Apr 2005, Junio C Hamano wrote: > > This patch lifts the tree-from-tree-or-commit logic from > diff-cache.c and moves it to sha1_file.c, which is a common > library source for the SHA1 storage part. I don't think that's a good interface. It changes the sha1 passed into it: that may

Re: [PATCH] write-tree performance problems

2005-04-20 Thread C. Scott Ananian
On Wed, 20 Apr 2005, Chris Mason wrote: With the basic changes I described before, the 100 patch time only goes down to 40s. Certainly not fast enough to justify the changes. In this case, the bulk of the extra time comes from write-tree writing the index file, so I split write-tree.c up into li

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Chris Mason wrote: > > Thanks for looking at this. Your new tree is faster, it gets the commit 100 > patches time down from 1m5s to 50s. It really _shouldn't_ be faster. It still does the compression, and throws the end result away. To actually go faster, it _should_ nee

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, C. Scott Ananian wrote: > > Hmm. Are our index files too large, or is there some other factor? They _are_ pretty large, but they have to be, For the kernel, the index file is about 1.6MB. That's - 17,000+ files and filenames - stat information for all of them - the s

Re: [PATCH] write-tree performance problems

2005-04-20 Thread C. Scott Ananian
On Wed, 20 Apr 2005, Linus Torvalds wrote: I was considering using a chunked representation for *all* files (not just blobs), which would avoid the original 'trees must reference other trees or they become too large' issue -- and maybe the performance issue you're referring to, as well? No. The mos

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Martin Uecker
On Wed, Apr 20, 2005 at 11:28:20AM -0400, C. Scott Ananian wrote: Hi, > A merkle-tree (which I think you initially pointed me at) makes the hash > of the internal nodes be a hash of the chunk's hashes; ie not a straight > content hash. This is roughly what my current implementation does, but

Re: [PATCH] write-tree performance problems

2005-04-20 Thread David Willmore
On 4/20/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > It really _shouldn't_ be faster. It still does the compression, and throws > the end result away. Am I misunderstanding or is the proglem that doing: -> compress -> sha1 -> compare with existing hash is expensive? What about doing: -> unc

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, C. Scott Ananian wrote: > > OK, sure. But how 'bout chunking trees? Are you grown happy with the new > trees-reference-other-trees paradigm, or is there a deep longing in your > heart for the simplicity of 'trees-reference-blobs-period'? I'm pretty sure we do better chu

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Linus Torvalds wrote: > > To actually go faster, it _should_ need this patch. Untested. See if it > works.. NO! Don't see if this works. For the "sha1 file already exists" file, it forgot to return the SHA1 value in "returnsha1", and would thus corrupt the trees it wrote

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread Martin Uecker
On Wed, Apr 20, 2005 at 05:57:34PM +0200, Martin Uecker wrote: > On Wed, Apr 20, 2005 at 11:28:20AM -0400, C. Scott Ananian wrote: > > > Yes, I guess this is the detail I was going to abandon. =) > > > > I viewed the fact that the top-level hash was dependent on the exact chunk > > makeup a 'mis

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Chris Mason
On Wednesday 20 April 2005 11:40, Linus Torvalds wrote: > On Wed, 20 Apr 2005, Chris Mason wrote: > > Thanks for looking at this. Your new tree is faster, it gets the commit > > 100 patches time down from 1m5s to 50s. > > It really _shouldn't_ be faster. It still does the compression, and throws >

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Linus Torvalds wrote: > > NO! Don't see if this works. For the "sha1 file already exists" file, it > forgot to return the SHA1 value in "returnsha1", and would thus corrupt > the trees it wrote. Proper version with fixes checked in. For me, it brings down the time to writ

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-20 Thread Zlatko Calusic
Linus Torvalds <[EMAIL PROTECTED]> writes: > Real merges have no patches taking place _anywhere_. And they take about > half a second. Doing an "update" of your tree should _literally_ boil down > to > > # > # "repo" needs to point to the repo we update from > # > rsync -

Re: enforcing DB immutability

2005-04-20 Thread Erik Mouw
On Wed, Apr 20, 2005 at 08:41:15AM -, [EMAIL PROTECTED] wrote: > [A discussion on the git list about how to provide a hardlinked file > that *cannot* me modified by an editor, but must be replaced by > a new copy.] Some time ago there was somebody working on copy-on-write links: once you modif

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Chris Mason wrote: > > At any rate, the time for a single write-tree is pretty consistent. Before > it > was around .5 seconds, and with this change it goes down to .128s. Oh, wow. I bet your SHA1 implementation is done with hand-optimized and scheduled x86 MMX code or

[PATCH] Some documentation...

2005-04-20 Thread David Greaves
Hi I'm starting to write some docs... Comments... even "yep, looks OK, carry on" :) I plan on putting the 'git command' ones into the 'git help ...' structure once Petr accepts it. I guess the low level ones go into a README.reference until they stabilise and become man pages... In doing this I

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Zlatko Calusic wrote: > > I see this -avz incantation mentioned everytime when rsync is > involved. But, is the -z part (compression) really necessary knowing > that we're dealing with an already compressed tree? Doesn't it put > additional strain on the rsync server without

Re: [darcs-devel] Darcs and git: plan of action

2005-04-20 Thread Ralph Corderoy
Hi Ray, > Give me a case where assuming it's a replace will do the wrong thing, > for C code, where it's a variable or function name. How about two patches. 1. s/foo/bar/ throughout file because foo() has been decided upon as the name of a new globally visible forthcoming function but

RE: missing: git api, reference, user manual and mission statement

2005-04-20 Thread Andrew Timberlake-Newell
Petr Baudis graced us with: > Dear diary, on Tue, Apr 19, 2005 at 02:36:32PM CEST, I got a letter > where Klaus Robert Suetterlin <[EMAIL PROTECTED]> told me that... > > 1) There is no clear (e.g. by name) distinction between ``git as done > > by Linus'', which is a kind of content addressable data

Re: [script] ge: export commits as patches

2005-04-20 Thread Zlatko Calusic
Ingo Molnar <[EMAIL PROTECTED]> writes: > TREE1=$(cat-file commit 2>/dev/null $1 | head -4 | grep ^tree | cut -d' ' -f2) -- And to make it easier on your eyes, you can always rewrite stuff like that (mentioned everywhere

Re: [PATCH] Some documentation...

2005-04-20 Thread C. Scott Ananian
On Wed, 20 Apr 2005, David Greaves wrote: In doing this I noticed a couple of points: * update-cache won't accept ./file or fred/./file The comment in update-cache.c reads: /* * We fundamentally don't like some paths: we don't want * dot or dot-dot anywhere, and in fact, we don't even want * any

Re: [GNU-arch-dev] [ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread duchier
Hi Tom, just as a datapoint, here is an experiment I carried out. I wanted to evaluate how much overhead is incurred by using several levels of directories to implement a discrimating index. I used the key format you specified: SHA1,SIZE As data, I used my /usr/src/linux which uses 301

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Chris Mason
On Wednesday 20 April 2005 13:06, Linus Torvalds wrote: > On Wed, 20 Apr 2005, Chris Mason wrote: > > At any rate, the time for a single write-tree is pretty consistent. > > Before it was around .5 seconds, and with this change it goes down to > > .128s. > > Oh, wow. > > I bet your SHA1 implementa

Re: [PATCH] Some documentation...

2005-04-20 Thread David Greaves
C. Scott Ananian wrote: On Wed, 20 Apr 2005, David Greaves wrote: In doing this I noticed a couple of points: * update-cache won't accept ./file or fred/./file The comment in update-cache.c reads: /* * We fundamentally don't like some paths: we don't want * dot or dot-dot anywhere, and in fact,

Blob chunking code. [Second look]

2005-04-20 Thread C. Scott Ananian
Here's a quick rev of the chunking code. This is compatible with git-current, where the hashes are of the *uncompressed* file. The 'chunk' file gets dropped in at the same SHA1 filename as the 'blob' file, as it represents identical contents. Martin won't like this (because of how the hash is co

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Chris Mason wrote: > > The patch below with your current tree brings my 100 patch test down to 22 > seconds again. If you ever have a cache_entry bigger than 16384, your code will write things out in the wrong order (write the new cache without flushing the old buffer).

distributed merge prototype

2005-04-20 Thread Matt Mackall
I've hacked together a prototype SCM that I think you folks might be interested in. The announcement is here: http://selenic.com/mercurial/announce.txt It's at a very early stage right now and is likely to break if you look at it wrong, but I have sucessfully managed to check in kernel trees, do

Re: [PATCH] write-tree performance problems

2005-04-20 Thread David S. Miller
On Wed, 20 Apr 2005 10:06:15 -0700 (PDT) Linus Torvalds <[EMAIL PROTECTED]> wrote: > I bet your SHA1 implementation is done with hand-optimized and scheduled > x86 MMX code or something, while my poor G5 is probably using some slow > generic routine. As a result, it only improved by 33% for me sin

Re: SHA1 hash safety

2005-04-20 Thread David Meybohm
On Tue, Apr 19, 2005 at 06:48:57PM -0400, C. Scott Ananian wrote: > On Tue, 19 Apr 2005, David Meybohm wrote: > > >But doesn't this require assuming the distribution of MD5 is uniform, > >and don't the papers finding collisions in less show it's not? So, your > >birthday-argument for calculating t

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Chris Mason
On Wednesday 20 April 2005 13:52, Linus Torvalds wrote: > On Wed, 20 Apr 2005, Chris Mason wrote: > > The patch below with your current tree brings my 100 patch test down to > > 22 seconds again. > > If you ever have a cache_entry bigger than 16384, your code will write > things out in the wrong or

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Chris Mason wrote: > > Well, the difference there should be pretty hard to see with any benchmark. > But I was being lazy...new patch attached. This one gets the same perf > numbers, if this is still wrong then I really need some more coffee. I did my preferred version. M

Re: [PATCH] write-tree performance problems

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Linus Torvalds wrote: > > It would be nicer for the cache to make the index file "header" be a > "footer", and write it out last - that way we'd be able to do the SHA1 as > we write rather than doing a two-pass thing. That's for another time. That other time was now. The

Re: git-viz tool for visualising commit trees

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:08:24PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > * Petr Baudis <[EMAIL PROTECTED]> wrote: > > just FYI, Olivier Andrieu was kind enough to port his monotone-viz > > tool to git (http://oandrieu.nerim.net/monotone-viz/ - u

[PATCH] gittrack.sh accepts invalid branch names

2005-04-20 Thread Pavel Roskin
Hello, Petr and everybody! gittrack.sh allows abbreviated branch names, e.g. it's possible to run "git track lin" when there is a branch called "linus". I believe it's a bug, not a feature. Please look at this line from gittrack.sh: grep -q $(echo -e "^$name\t" | sed 's/\./\\./g') .git/remotes

Re: git-viz tool for visualising commit trees

2005-04-20 Thread Olivier Andrieu
> Ingo Molnar <[EMAIL PROTECTED]> [Wed, 20 Apr 2005]: > > * Petr Baudis <[EMAIL PROTECTED]> wrote: > > > Hi, > > > > just FYI, Olivier Andrieu was kind enough to port his monotone-viz > > tool to git (http://oandrieu.nerim.net/monotone-viz/ - use the one > > from the monotone repo

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 09:01:57AM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > [...] > fatal: unable to execute 'gitmerge-file.sh' > fatal: merge program failed Pure stupidity of mine, I forgot to add gitmerge-file.sh to the list of scripts which get

Re: [PATCH] Some documentation...

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, David Greaves wrote: > > So maybe it's left as documented behaviour and higher level tools must > manage the data they feed to it... That was the plan. I agree that "find . -type f | xargs update-cache --add --" in _theory_ is a nice thing to do. But in practice, you want

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Ingo Molnar
* Petr Baudis <[EMAIL PROTECTED]> wrote: > > yet another thing: what is the canonical 'pasky way' of simply nuking > > the current files and checking out the latest tree (according to > > .git/HEAD). Right now i'm using a script to: > > > > read-tree $(tree-id $(cat .git/HEAD)) > > checkou

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Ingo Molnar
* Petr Baudis <[EMAIL PROTECTED]> wrote: > Dear diary, on Wed, Apr 20, 2005 at 09:01:57AM CEST, I got a letter > where Ingo Molnar <[EMAIL PROTECTED]> told me that... > > [...] > > fatal: unable to execute 'gitmerge-file.sh' > > fatal: merge program failed > > Pure stupidity of mine, I forgot

[ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Hello, so I've "released" git-pasky-0.6.2 (my SCMish layer on top of Linus Torvalds' git tree history storage system), find it at the usual http://pasky.or.cz/~pasky/dev/git/ git-pasky-0.6 has couple of big changes; mainly enhanced git diff, git patch (to be renamed to cg mkpatch),

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 10:56:33PM CEST, I got a letter where Petr Baudis <[EMAIL PROTECTED]> told me that... > cg pull will now always only pull, never merge. > > cg update will do pull + merge. Note that what you will probably do _most_ by far is cg update. You generally do cg p

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 10:32:35PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > > * Petr Baudis <[EMAIL PROTECTED]> wrote: > > > > yet another thing: what is the canonical 'pasky way' of simply nuking > > > the current files and checking out the latest

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Greg KH
On Wed, Apr 20, 2005 at 10:56:33PM +0200, Petr Baudis wrote: > The short command version will change from 'git' to 'cg', which should > be shorter to type and free the 'git' command for possible eventual > entry gate for the git commands (so that they are more > namespace-friendly, and it might m

Git hangs while executing commit-tree

2005-04-20 Thread Rhys Hardwick
Hey, The following is a copy of the terminal session in question: [EMAIL PROTECTED]:~/repo/tmp.repo$ ls [EMAIL PROTECTED]:~/repo/tmp.repo$ init-db defaulting to local storage area [EMAIL PROTECTED]:~/repo/tmp.repo$ ls -l .git total 4 drwxr-xr-x 258 rhys rhys 4096 2005-04-20 20:52 objects [EMAIL

Re: Git hangs while executing commit-tree

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 11:28:35PM CEST, I got a letter where Rhys Hardwick <[EMAIL PROTECTED]> told me that... > Hey, Hi, > [EMAIL PROTECTED]:~/repo/tmp.repo$ commit-tree > c80156fafbac377ab35beb076090c8320f874f91 > Committing initial tree c80156fafbac377ab35beb076090c8320f874f91 >

Re: Git hangs while executing commit-tree

2005-04-20 Thread Rhys Hardwick
Cheers for the help! Rhys On Wednesday 20 Apr 2005 22:35, Petr Baudis wrote: > Dear diary, on Wed, Apr 20, 2005 at 11:28:35PM CEST, I got a letter > where Rhys Hardwick <[EMAIL PROTECTED]> told me that... > > > Hey, > > Hi, > > > [EMAIL PROTECTED]:~/repo/tmp.repo$ commit-tree > > c80156fafbac377a

Re: Git hangs while executing commit-tree

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Rhys Hardwick wrote: > > [EMAIL PROTECTED]:~/repo/tmp.repo$ commit-tree > c80156fafbac377ab35beb076090c8320f874f91 > Committing initial tree c80156fafbac377ab35beb076090c8320f874f91 > > At this point, the command seems to be just waiting. That's _exactly_ what it's doing

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 11:19:19PM CEST, I got a letter where Greg KH <[EMAIL PROTECTED]> told me that... > On Wed, Apr 20, 2005 at 10:56:33PM +0200, Petr Baudis wrote: > > The short command version will change from 'git' to 'cg', which should > > be shorter to type and free the 'git'

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Mike Taht
I keep thinking perversely that we need something as obtuse as possible in the unix tradition, but easy to type... git requires that the fingers move off the home row... how about "asdf" or "jkl"? :) cg is singularly uncomfortable to type. I think that's why it isn't commonly used. Greg KH w

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Randy.Dunlap
On Wed, 20 Apr 2005 23:51:18 +0200 Petr Baudis wrote: | Dear diary, on Wed, Apr 20, 2005 at 11:19:19PM CEST, I got a letter | where Greg KH <[EMAIL PROTECTED]> told me that... | > On Wed, Apr 20, 2005 at 10:56:33PM +0200, Petr Baudis wrote: | > > The short command version will change from 'git'

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Joshua T. Corbin
On 20 April 2005 17:51, Mike Taht wrote: > I keep thinking perversely that we need something as obtuse as possible > in the unix tradition, but easy to type... git requires that the fingers > move off the home row... > > how about "asdf" or "jkl"? :) > > cg is singularly uncomfortable to type. I t

Re: [ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:00:36PM CEST, I got a letter where Tom Lord <[EMAIL PROTECTED]> told me that... > >From the /Arch/ perspective: `git' technology will form the > basis of a new archive/revlib/cache format and the basis > of new network transports. I think one thing git's obje

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Petr Baudis wrote: > > Grm. Cg is also name of some scary NVidia thing, and cog is GNOME > Configurator. CGT are Chimera Grid Tools, but I think we can clash > with those - at least *I* wouldn't mind. ;-) I realize that there is probably a law that there has to be a space,

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Steven Cole
Randy.Dunlap wrote: On Wed, 20 Apr 2005 23:51:18 +0200 Petr Baudis wrote: | Dear diary, on Wed, Apr 20, 2005 at 11:19:19PM CEST, I got a letter | where Greg KH <[EMAIL PROTECTED]> told me that... | > On Wed, Apr 20, 2005 at 10:56:33PM +0200, Petr Baudis wrote: | > > The short command version will

Re: Git hangs while executing commit-tree

2005-04-20 Thread David Greaves
Linus Torvalds wrote: On Wed, 20 Apr 2005, Rhys Hardwick wrote: [EMAIL PROTECTED]:~/repo/tmp.repo$ commit-tree c80156fafbac377ab35beb076090c8320f874f91 Committing initial tree c80156fafbac377ab35beb076090c8320f874f91 At this point, the command seems to be just waiting. That's _exactly_ what it's

on when to checksum

2005-04-20 Thread Tom Lord
Linus, I think you have made a mistake by moving the sha1 checksum from the zipped form to the inflated form. Here is why: What you have set in motion with `git' is an ad-hoc p2p network for sharing filesystem trees -- a global distributed filesystem. I believe your starter here has a good c

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 12:09:06AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Yeah, yeah, it looks different from "cvs update", but dammit, wouldn't it > be cool to just write "cg-" and see the command choices? Or > "cg-up" and get cg-update done f

Re: WARNING! Object DB conversion (was Re: [PATCH] write-tree performance problems)

2005-04-20 Thread David Woodhouse
On Wed, 2005-04-20 at 07:59 -0700, Linus Torvalds wrote: > external-parent > comment for this parent > > and the nice thing about that is that now that information allows you to > add external parents at any point. > > Why do it like this? First off, I think that the "

Re: on when to checksum

2005-04-20 Thread Linus Torvalds
On Wed, 20 Apr 2005, Tom Lord wrote: > > I think you have made a mistake by moving the sha1 checksum from the > zipped form to the inflated form. Here is why: I'd have agreed with you (and I did, violently) if it wasn't for the performance issues. It makes a huge difference for write-tree, and

Re: [Gnu-arch-users] Re: [GNU-arch-dev] [ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread Tomas Mraz
On Wed, 2005-04-20 at 19:15 +0200, [EMAIL PROTECTED] wrote: ... > As data, I used my /usr/src/linux which uses 301M and contains 20753 files and > 1389 directories. To compute the key for a directory, I considered that its > contents were a mapping from names to keys. I suppose if you used the blo

  1   2   >