[Pkg-bazaar-commits] ./bzr-rebase/unstable r51: Add misc:Depends.
Jelmer Vernooij
jelmer at debian.org
Fri Apr 10 12:28:37 UTC 2009
------------------------------------------------------------
revno: 51
committer: Jelmer Vernooij <jelmer at debian.org>
branch nick: debian
timestamp: Sun 2009-02-15 01:39:40 +0100
message:
Add misc:Depends.
modified:
NEWS
__init__.py
debian/changelog
debian/control
rebase.py
------------------------------------------------------------
revno: 24.1.101
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2009-02-13 04:28:37 +0100
message:
Use single call to find present revisions.
modified:
rebase.py
------------------------------------------------------------
revno: 24.1.102
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2009-02-13 04:44:08 +0100
message:
Use bzrlib's topo sorter rather than reinventing the wheel.
modified:
rebase.py
------------------------------------------------------------
revno: 24.1.103
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2009-02-13 04:56:23 +0100
message:
Use standard graph functions.
modified:
rebase.py
------------------------------------------------------------
revno: 24.1.104
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2009-02-13 05:00:37 +0100
message:
Deal with ghost parents in svn-upgrade.
modified:
NEWS
rebase.py
------------------------------------------------------------
revno: 24.1.105
tags: upstream-0.4.3, bzr-rebase-0.4.3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2009-02-15 01:14:15 +0100
message:
Release 0.4.3.
modified:
NEWS
__init__.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-02-01 02:54:07 +0000
+++ b/NEWS 2009-02-15 00:14:15 +0000
@@ -1,8 +1,8 @@
-0.4.3 UNRELEASED
+0.4.3 2009-02-15
BUG FIXES
- * Cope with ghosts in svn-upgrade. (#323140)
+ * Cope with ghosts in svn-upgrade. (#323140, #325402)
PERFORMANCE
=== modified file '__init__.py'
--- a/__init__.py 2009-01-30 16:17:12 +0000
+++ b/__init__.py 2009-02-15 00:14:15 +0000
@@ -25,7 +25,7 @@
import bzrlib.api
from bzrlib.commands import plugin_cmds
-version_info = (0, 4, 3, 'dev', 0)
+version_info = (0, 4, 3, 'final', 0)
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
else:
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-02-03 13:48:41 +0000
+++ b/debian/changelog 2009-02-15 00:39:40 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.4.3-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org> Sun, 15 Feb 2009 01:32:14 +0100
+
bzr-rebase (0.4.3~bzr124-1) experimental; urgency=low
* New upstream snapshot.
=== modified file 'debian/control'
--- a/debian/control 2008-08-09 12:46:32 +0000
+++ b/debian/control 2009-02-15 00:39:40 +0000
@@ -2,18 +2,17 @@
Section: devel
Priority: optional
Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Jelmer Vernooij <jelmer at debian.org>
Homepage: http://bazaar-vcs.org/Rebase
Build-Depends-Indep: bzr (>= 1.6~)
Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python
Standards-Version: 3.8.0
XS-Python-Version: >= 2.4
Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-rebase/unstable/
-XS-DM-Upload-Allowed: yes
Package: bzr-rebase
Architecture: all
-Depends: bzr (>= 1.6~), ${python:Depends}
+Depends: bzr (>= 1.6~), ${python:Depends}, ${misc:Depends}
Enhances: bzr
XB-Python-Version: ${python:Versions}
Description: Rebase plugin for Bazaar
=== modified file 'rebase.py'
--- a/rebase.py 2009-02-02 21:15:02 +0000
+++ b/rebase.py 2009-02-13 04:00:37 +0000
@@ -290,38 +290,19 @@
:param replace_map: Dictionary with revisions to (optionally) rewrite
:param merge_fn: Function for replaying a revision
"""
- todo = list(rebase_todo(repository, replace_map))
- dependencies = {}
-
# Figure out the dependencies
- for revid in todo:
- for p in replace_map[revid][1]:
- if repository.has_revision(p):
- continue
- if not dependencies.has_key(p):
- dependencies[p] = []
- dependencies[p].append(revid)
-
+ graph = repository.get_graph()
+ todo = list(graph.iter_topo_order(replace_map.keys()))
pb = ui.ui_factory.nested_progress_bar()
- total = len(todo)
- i = 0
try:
- while len(todo) > 0:
- pb.update('rebase revisions', i, total)
- i += 1
- revid = todo.pop()
+ for i, revid in enumerate(todo):
+ pb.update('rebase revisions', i, len(todo))
(newrevid, newparents) = replace_map[revid]
assert isinstance(newparents, tuple), "Expected tuple for %r" % newparents
- if filter(repository.has_revision, newparents) != newparents:
- # Not all parents present yet, avoid for now
- continue
if repository.has_revision(newrevid):
# Was already converted, no need to worry about it again
continue
replay_fn(repository, revid, newrevid, newparents)
- if dependencies.has_key(newrevid):
- todo.extend(dependencies[newrevid])
- del dependencies[newrevid]
finally:
pb.finished()
@@ -354,13 +335,15 @@
try:
# Check what new_ie.file_id should be
# use old and new parent inventories to generate new_id map
- fileid_map = map_file_ids(repository, oldrev.parent_ids, new_parents)
+ nonghost_oldparents = tuple([p for p in oldrev.parent_ids if repository.has_revision(p)])
+ nonghost_newparents = tuple([p for p in new_parents if repository.has_revision(p)])
+ fileid_map = map_file_ids(repository, nonghost_oldparents, nonghost_newparents)
oldtree = repository.revision_tree(oldrevid)
mappedtree = MapTree(oldtree, fileid_map)
pb = ui.ui_factory.nested_progress_bar()
try:
- old_parent_invs = list(repository.iter_inventories(oldrev.parent_ids))
- new_parent_invs = list(repository.iter_inventories(new_parents))
+ old_parent_invs = list(repository.iter_inventories(nonghost_oldparents))
+ new_parent_invs = list(repository.iter_inventories(nonghost_newparents))
for i, (path, old_ie) in enumerate(mappedtree.inventory.iter_entries()):
pb.update('upgrading file', i, len(mappedtree.inventory))
ie = old_ie.copy()
More information about the Pkg-bazaar-commits
mailing list