Sun Nov 13 22:00:07 PST 2005 Brendan Cully <[EMAIL PROTECTED]>
* Fix bzr incremental update
Incremental update in bzr isn't working: when tailor restarts it has no
handle on the bzr branch object, and when it does a merge it doesn't
make sure that it already has the changesets it needs. This patch
introduces a getRepo method that gets a branch handle if there isn't one,
and calls bzrlib.fetch.greedy_fetch to pull in all changesets before
attempting to merge them.
New patches:
[Fix bzr incremental update
Brendan Cully <[EMAIL PROTECTED]>**20051114060007
Incremental update in bzr isn't working: when tailor restarts it has no
handle on the bzr branch object, and when it does a merge it doesn't
make sure that it already has the changesets it needs. This patch
introduces a getRepo method that gets a branch handle if there isn't one,
and calls bzrlib.fetch.greedy_fetch to pull in all changesets before
attempting to merge them.
] {
hunk ./vcpx/bzr.py 64
+ from bzrlib import fetch
+
hunk ./vcpx/bzr.py 67
+ repo = self._getRepo()
hunk ./vcpx/bzr.py 69
- revisions = self._b.missing_revisions(parent)
+ revisions = repo.missing_revisions(parent)
+ fetch.greedy_fetch(repo, parent)
hunk ./vcpx/bzr.py 81
- oldrevno = self._b.revno()
+ repo = self._getRepo()
+ parent = Branch.open(self.repository.repository)
+
+ oldrevno = repo.revno()
hunk ./vcpx/bzr.py 87
- self._b.append_revision(changeset.revision)
+ repo.append_revision(changeset.revision)
hunk ./vcpx/bzr.py 240
+ def _getRepo(self):
+ try:
+ return self._b
+ except AttributeError:
+ self._b = Branch.open(self.basedir)
+ return self._b
+
}
Context:
[Ignore the backup copy of the state file
[EMAIL PROTECTED]
[Fix cut&paste error
[EMAIL PROTECTED]
[TAG Version 0.9.19 (retag)
[EMAIL PROTECTED]
Patch bundle hash:
301358ee49fe8e0d051d4243143cc8dff26046b9
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
