On Thu, Jul 10, 2008 at 6:46 AM, Peter Arrenbrecht <[EMAIL PROTECTED]> wrote: > On Thu, Jul 10, 2008 at 1:07 AM, TK Soh <[EMAIL PROTECTED]> wrote: >> On Wed, Jul 9, 2008 at 7:35 PM, Peter Arrenbrecht >> <[EMAIL PROTECTED]> wrote: >>> This is mainly to let you all know I'm working on this. Many of the >>> dialogs already run again. Piece de resistance will likely be the new >>> merge/resolve stuff. >> >> Interestingly, I've looked at the similar thing last night. Can you >> share a bit more, so to make sure we are repeating the effort? >> >> BTW, I am puzzled by "Many of the dialogs already run _again_". Do you >> mean the dialogs (tortoisehg?) were broken somehow? > > Maybe we are not talking about the same thing. I am adapting THg to > the Mercurial version at the tip of > > http://hg.intevation.org/mercurial/crew > > This breaks a number of things since, for example, repo.workingctx(), > revlog.count(), and cmdutil.matchpats() are gone and have to be > replaced by other methods. I also found a few more subtle issues.
Probably not a very good idea to link to crew tip. We recently agreed on linking only to hg-stable, but I really want to link only to the latest release of Hg, as it's really quite hard to track the changes in dev versions of Mercurial, including hg-stable. BTW, are these broken with hg-stable also? >>> Question: Do you think it's better to maintain this as a clone/branch, >>> or as a patch queue? >> >> The way I did last night was simply merge Mercurial tree with >> TortoiseHg's, the push patch queue after the merge. So far the only >> conflicts are in .hgignore and .hgtags, though they don't, and not >> like to, cause any problem with the patch queue. >> >> It should certainly make it more straightforward if we can maintain it >> as clone/branch (BTW, I have little/no knowledge on branches), >> especially for those interested in building the installer. However, I >> started off with Steve's patch queue, and it seemed to work so far. >> The only problem I have with it is the hassle in pulling tortoisehg's >> new changes into it. This actually is the primary reason for what I >> did last night. We can discuss more on this. > > I have started a THg clone with a branch named "hg-crew-tip" for this at: > > http://bitbucket.org/parren/thg-hg-crew-tip/ > > BTW, the following patch might actually be necessary for the current > THg as well: > > http://bitbucket.org/parren/thg-hg-crew-tip/changeset/6838af4757f3 Is this needed because of crew tip? > Another question: I cannot find any reference to the DiffWindow in > diff.py except for when diff.py is run directly. What is it for? It > uses cmdutil.matchpats(), which I corrected, but did not test. Neither > did I test the change to iconoverlay.py. The change is here: > > http://bitbucket.org/parren/thg-hg-crew-tip/changeset/b3cdc88edeae Sorry I don't have the answer for this right now. ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
