[PATCH 3 of 5] Fixes for automated tests
Michael J. Pedersen
m.pedersen at icelus.org
Wed May 13 13:28:52 CDT 2009
# HG changeset patch
# User Michael J. Pedersen <mpedersen at datapipe.com>
# Date 1242235202 18000
# Node ID 12488e7fabef49d07745264b489adf04303e63ce
# Parent 1a93340655036f33368f2a7333e4911f64d98eb7
Fixes for automated tests.
diff -r 1a9334065503 -r 12488e7fabef hgext/convert/__init__.py
--- a/hgext/convert/__init__.py Wed May 13 09:26:45 2009 -0400
+++ b/hgext/convert/__init__.py Wed May 13 12:20:02 2009 -0500
@@ -85,7 +85,7 @@
format as a key in .hg/shamap). The values are the revision IDs
(in either the source or destination revision control system) that
should be used as the new parents for that node.
-
+
The branchmap is a file that allows you to rename a branch when it is
being brought in from whatever external repository. When used in
conjunction with a splicemap, it allows for a powerful combination
diff -r 1a9334065503 -r 12488e7fabef hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py Wed May 13 09:26:45 2009 -0400
+++ b/hgext/convert/convcmd.py Wed May 13 12:20:02 2009 -0500
@@ -231,7 +231,7 @@
def copy(self, rev):
commit = self.commitcache[rev]
- commit.branch = self.branchmap.get(commit.branch, 'default').replace(',', ' ').split()[0]
+ commit.branch = self.branchmap.get(commit.branch, commit.branch).replace(',', ' ').split()[0]
changes = self.source.getchanges(rev)
if isinstance(changes, basestring):
diff -r 1a9334065503 -r 12488e7fabef tests/test-convert.out
--- a/tests/test-convert.out Wed May 13 09:26:45 2009 -0400
+++ b/tests/test-convert.out Wed May 13 12:20:02 2009 -0500
@@ -70,6 +70,17 @@
(in either the source or destination revision control system) that
should be used as the new parents for that node.
+ The branchmap is a file that allows you to rename a branch when it is
+ being brought in from whatever external repository. When used in
+ conjunction with a splicemap, it allows for a powerful combination
+ to help fix even the most badly mismanaged repositories and turn them
+ into nicely structured Mercurial repositories. The branchmap contains
+ lines of the form "original_branch_name new_branch_name".
+ "original_branch_name" is the name of the branch in the source
+ repository, and "new_branch_name" is the name of the branch is the
+ destination repository. This can be used to (for instance) move code
+ in one repository from "default" to a named branch.
+
Mercurial Source
-----------------
@@ -197,6 +208,7 @@
-r --rev import up to target revision REV
-s --source-type source repository type
--splicemap splice synthesized history into place
+ --branchmap change branch names while converting
--datesort try to sort changesets by date
use "hg -v help convert" to show global options
More information about the Mercurial-devel
mailing list