On 26/10/2007, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > I wanted to build an StGit command that coalesced adjacent patches to > a single patch. Because the end result tree would still be the same, > this should be doable without ever involving HEAD, the index, or the > worktree. StGit's existing infrastructure for manipulating patches > didn't lend itself to doing this kind of thing, though: it's not > modular enough. So I started to design a replacement low-level > interface to git, and things got slightly out of hand ... and I ended > up with a much bigger refactoring than I'd planned. I eventually managed to have a (not so in-depth) look at this and I am OK with it (but merging after 0.14). As you said the current structure and the new one will work in parallel for some time. It would even be possible to implement unit testing. Some random comments below: Commitdata maybe should be written as CommitData (as in the e-mail text). The Repository.head property is not cached and it is probably OK to avoid some problems I had. We could run profiling afterwards to see how often it is called. > Transactions (translib.py) > ---------------------------------------------------------------------- > > I started to implement a few StGit commands on top of gitlib.py and > stacklib.py, and then realized something very appealing: > > Just about every StGit command can be accomplished by first creating > a bunch of new commit objects with gitlib.py, then trying to check > out the new HEAD, and then rewriting refs with stacklib.py. Only the > first and second steps can possibly fail, and if they do, they do so > without leaving any user-visible junk behind. This can be used to > make all commands either succeed completely, or do nothing at all. As you said, that's a bit difficult for 'push' as it is made of a series of separate individual patch pushes. Can we not use a temporary index by setting GIT_INDEX_FILE during the whole transaction and freely update the working copy. Only if the transaction fails, we clean the working copy and check out the default index? This might slow down some operations though. In the future, it would be nice to record the stack state before transactions in a git object (via pickle) together with HEAD id and provide unlimited undo. Thanks. -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
