[PATCH] convert: cleanup of filemap help text

Mads Kiilerich mads at kiilerich.com
Thu Jul 8 08:44:23 CDT 2010


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1278596654 -7200
# Node ID fd4f5f90c1078a40ad89e610e0b506b8f2d40fc5
# Parent  40de37c970f6aaeb61f054f0de947856671d77b6
convert: cleanup of filemap help text

Clarify that:
- Specified paths are matched by comparing name of file or directory.
- Line order (thus) doesn't matter.
- Rename doesn't imply include.

diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -13,8 +13,6 @@
 from mercurial import commands
 from mercurial.i18n import _
 
-# Commands definition was moved elsewhere to ease demandload job.
-
 def convert(ui, src, dest=None, revmapfile=None, **opts):
     """convert a foreign SCM repository to a Mercurial one.
 
@@ -77,22 +75,25 @@
     srcauthor=whatever string you want
 
     The filemap is a file that allows filtering and remapping of files
-    and directories. Comment lines start with '#'. Each line can
-    contain one of the following directives::
+    and directories. Each line can contain one of the following directives::
 
-      include path/to/file
+      include path/to/file-or-dir
 
-      exclude path/to/file
+      exclude path/to/file-or-dir
 
-      rename from/file to/file
+      rename path/to/source path/to/destination
 
+    Comment lines start with '#'. A specificed path matches if it equals
+    the full relative name of a file or one of its parent directories.
+    The include/exclude directive with the longest matching path
+    applies, so line order doesn't matter.
     The 'include' directive causes a file, or all files under a
     directory, to be included in the destination repository, and the
     exclusion of all other files and directories not explicitly
     included. The 'exclude' directive causes files or directories to
-    be omitted. The 'rename' directive renames a file or directory. To
-    rename from a subdirectory into the root of the repository, use
-    '.' as the path to rename to.
+    be omitted. The 'rename' directive renames a file or directory if is
+    converted. To rename from a subdirectory into the root of the
+    repository, use '.' as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic
     history, letting you specify the parents of a revision. This is


More information about the Mercurial-devel mailing list