| Wiz_KeeD | hey guys | 11:24 |
|---|---|---|
| jelmer | hi Wiz_KeeD | 12:24 |
| Wiz_KeeD | how are you jelmer ? | 13:18 |
| jelmer | Wiz_KeeD: not bad - yourself? | 13:22 |
| Wiz_KeeD | pretty good | 13:23 |
| Wiz_KeeD | I have a, somewhat of a newbie question | 13:23 |
| Wiz_KeeD | If I have a branch that's the "master/stable/original" whatever you want to call it | 13:24 |
| Wiz_KeeD | And I branched out to try some experimental stuff that now seem to work and would like to include in the stable version, how would I do that so I don't loose the progress I've done on the original since the second one was branched from it? | 13:24 |
| serg | jelmer: may I ask about bzr-git plugin? you've removed BaseObjectStore::get_graph_walker from dulwich on 2013-11-10, but bzr-git still uses it. | 16:50 |
| jelmer | serg: it's moved from the object store to the repo | 16:51 |
| serg | I've grepped it out there, yes. but how to fix bzr-git? | 16:51 |
| jelmer | a similar change would have to be made in bzr-git | 16:52 |
| serg | sorry, I don't think that's enough for me :( I can dig out the history in bzr, or grep, but I don't know what a "simialr change" is in this case. your patch in dulwich simply removed the method | 16:54 |
| serg | how to get repository from BazaarObjectStore? | 16:55 |
| jelmer | serg: that method has basically been moved up one layer | 16:55 |
| jelmer | an object store is a part of a repository | 16:55 |
| serg | bzrlib.repository? | 16:56 |
| jelmer | in this case a git repository | 16:56 |
| serg | yes, InterGitNonGitRepository is a repository. ok, let me try | 16:56 |
| jelmer | serg: InterGitNonGitRepository is not a repository, but an interobject that works between two repositories | 16:57 |
| serg | aha, yes, I see it | 16:58 |
| * serg shouldn't have trusted the name | 16:58 | |
| serg | I don't see a repository accessible from InterRemoteGitNonGitRepository.fetch_objects(). Should I create it there together with BaazarObjectStore? | 17:08 |
| jelmer | serg: there should already be access to the repository at that point | 17:11 |
| serg | then I cannot find it | 17:14 |
| jelmer | self.target presumably | 17:17 |
| jelmer | that's the bzr repository | 17:17 |
| jelmer | not sure about a git wrapper for that, we might have always just gotten away with just wrapping the object store | 17:17 |
| serg | self.target and self.source are bzr Repository objects, not dulwich Repo objects | 17:18 |
| serg | and get_graph_walker is in Repo | 17:19 |
| jelmer | serg: right, so I don't recall if I ever added a wrapper that implements the Dulwich Repo API on top of the bzr repository API | 17:19 |
| jelmer | I might not have, if we got away with just doing ObjectStore | 17:19 |
| serg | okay, so how to fix bzr-git then? | 17:19 |
| jelmer | you might have to add such a wrapper | 17:19 |
| serg | heh, cool. that's not a simple fix. especially and I am neither bzr nor python hacker :( | 17:20 |
| jelmer | serg: somebody just proposed (as in, in the last 5 minutes) a patch that might address this | 17:21 |
| jelmer | https://code.launchpad.net/~ace17/bzr-git/dulwich/+merge/218313 | 17:21 |
| serg | thanks! looking | 17:22 |
| jelmer | serg: sorry :( bzr-git has been in dire need of a new maintainer for more than a year now | 17:22 |
| serg | I've seen few commits this year, so I believed somebody is looking after it | 17:23 |
| serg | anyway, thanks for the patch! | 17:23 |
| jelmer | serg: I did maintainance fixes until a year or so ago, I don't think anything has happened since | 17:24 |
| serg | the patch doesn't quite work, but it's something I can try to start from.... | 17:28 |
| serg | got it, thanks | 17:32 |
| * serg kind of hoped there was a "proper" fix for this bzr-git issue... oh, well | 17:38 | |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!