summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-27 03:01:17 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-27 03:01:17 +0100
commit137b694b2d3cce9d73e006be1842fd6e3aa470ee (patch)
treef1e7580617215f46714788f1cef1b6b0f398593c
parent7186c973f844be36efcfa887191593e25def5080 (diff)
downloadbzr-fastimport-137b694b2d3cce9d73e006be1842fd6e3aa470ee.tar.gz
Fix test, clarify help description for 'bzr fast-export'.
-rw-r--r--cmds.py18
-rw-r--r--exporter.py5
2 files changed, 11 insertions, 12 deletions
diff --git a/cmds.py b/cmds.py
index 157c9b2..f1cf14b 100644
--- a/cmds.py
+++ b/cmds.py
@@ -564,9 +564,9 @@ class cmd_fast_export(Command):
:Round-tripping:
Recent versions of the fast-import specification support features
- that allow effective round-tripping of many Bazaar branches. As
- such, fast-exporting a branch and fast-importing the data produced
- will create a new repository with equivalent history, i.e.
+ that allow effective round-tripping most of the metadata in Bazaar
+ branches. As such, fast-exporting a branch and fast-importing the data
+ produced will create a new repository with roughly equivalent history, i.e.
"bzr log -v -p --include-merges --forward" on the old branch and
new branch should produce similar, if not identical, results.
@@ -608,13 +608,11 @@ class cmd_fast_export(Command):
:History truncation:
- When code has been significantly refactored over time (e.g., to separate
- proprietary code from open source code), it is sometimes convenient to
- simply truncate the revision history at a certain point. The --baseline
- option, to be used in conjunction with -r, emits a baseline commit
- containing the state of the entire source tree at the first requested
- revision. This allows a user to produce a tree identical to the original
- without munging multiple exports.
+ It is sometimes convenient to simply truncate the revision history at a
+ certain point. The --baseline option, to be used in conjunction with -r,
+ emits a baseline commit containing the state of the entire source tree at
+ the first requested revision. This allows a user to produce a tree
+ identical to the original without munging multiple exports.
:Examples:
diff --git a/exporter.py b/exporter.py
index 2094ff5..a3bc1b1 100644
--- a/exporter.py
+++ b/exporter.py
@@ -206,8 +206,9 @@ class BzrFastExporter(object):
start_rev_id = None
end_rev_id = None
self.note("Calculating the revisions to include ...")
- view_revisions = reversed([rev_id for rev_id, _, _, _ in
- self.branch.iter_merge_sorted_revisions(end_rev_id, start_rev_id)])
+ view_revisions = [rev_id for rev_id, _, _, _ in
+ self.branch.iter_merge_sorted_revisions(end_rev_id, start_rev_id)]
+ view_revisions.reverse()
# If a starting point was given, we need to later check that we don't
# start emitting revisions from before that point. Collect the
# revisions to exclude now ...