tests/test-convert.t
author Gregory Szorc <gregory.szorc@gmail.com>
Thu, 22 Dec 2016 23:28:35 -0700
changeset 30661 ced0d686ecb3
parent 30660 1f21a6835604
child 30813 2cbbd4622ab0
permissions -rw-r--r--
convert: add config option to control storing original revision common.commit.__init__ sets saverev=True by default. The side effect of this is that the hg sink will always set the "convert_revision" extras key to the commit being converted. This patch adds a config option to disable this behavior. While most consumers will want "convert_revision" to be a) written b) with the exact Git commit that was converted, some have use cases that prefer otherwise. In my case, I am performing significant rewrites of a Git repository *before* it is fed into `hg convert`. I have to do this because `hg convert` does not easily support the kind of transform I desire, even with extensions. (For the curious, I am "linearizing" the history of a GitHub repo by removing merge commits which add little value to the final history. It isn't easy to do this during `hg convert` because of Mercurial's file copy/rename metadata requirements.) In my scenario, my pre-convert transform stores a "convert_revision" key in the Git commit object containing the original Git commit ID. I want this original Git commit ID carried forward to Mercurial. By disabling the setting of this extra during `hg convert` and copying the value from the Git commit object, I can have the final "convert_revision" extra key contain the original Git commit ID. An added test verifies this exact scenario. This feature could likely be implemented for other VCS sources. But until someone needs the feature, I'm inclined to hold off implementing.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     2
  > [extensions]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     3
  > convert=
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     4
  > [convert]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     5
  > hg.saverev=False
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     6
  > EOF
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     7
  $ hg help convert
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     8
  hg convert [OPTION]... SOURCE [DEST [REVMAP]]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
     9
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    10
  convert a foreign SCM repository to a Mercurial one.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    11
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    12
      Accepted source formats [identifiers]:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    13
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    14
      - Mercurial [hg]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    15
      - CVS [cvs]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    16
      - Darcs [darcs]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    17
      - git [git]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    18
      - Subversion [svn]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    19
      - Monotone [mtn]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    20
      - GNU Arch [gnuarch]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    21
      - Bazaar [bzr]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    22
      - Perforce [p4]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    23
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    24
      Accepted destination formats [identifiers]:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    25
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    26
      - Mercurial [hg]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    27
      - Subversion [svn] (history on branches is not preserved)
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    28
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    29
      If no revision is given, all revisions will be converted. Otherwise,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    30
      convert will only import up to the named revision (given in a format
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    31
      understood by the source).
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    32
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    33
      If no destination directory name is specified, it defaults to the basename
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    34
      of the source with "-hg" appended. If the destination repository doesn't
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    35
      exist, it will be created.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    36
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    37
      By default, all sources except Mercurial will use --branchsort. Mercurial
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    38
      uses --sourcesort to preserve original revision numbers order. Sort modes
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    39
      have the following effects:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    40
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    41
      --branchsort  convert from parent to child revision when possible, which
13011
4936a04b6792 minirst: improved support for option lists.
Erik Zielke <ez@aragost.com>
parents: 12924
diff changeset
    42
                    means branches are usually converted one after the other.
4936a04b6792 minirst: improved support for option lists.
Erik Zielke <ez@aragost.com>
parents: 12924
diff changeset
    43
                    It generates more compact repositories.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    44
      --datesort    sort revisions by date. Converted repositories have good-
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    45
                    looking changelogs but are often an order of magnitude
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    46
                    larger than the same ones generated by --branchsort.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    47
      --sourcesort  try to preserve source revisions order, only supported by
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    48
                    Mercurial sources.
18819
05acdf8e1f23 convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents: 18324
diff changeset
    49
      --closesort   try to move closed revisions as close as possible to parent
05acdf8e1f23 convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents: 18324
diff changeset
    50
                    branches, only supported by Mercurial sources.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    51
  
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
    52
      If "REVMAP" isn't given, it will be put in a default location
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
    53
      ("<dest>/.hg/shamap" by default). The "REVMAP" is a simple text file that
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    54
      maps each source commit ID to the destination ID for that revision, like
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    55
      so:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    56
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    57
        <source ID> <destination ID>
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    58
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    59
      If the file doesn't exist, it's automatically created. It's updated on
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 26077
diff changeset
    60
      each commit copied, so 'hg convert' can be interrupted and can be run
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    61
      repeatedly to copy new commits.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    62
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    63
      The authormap is a simple text file that maps each source commit author to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    64
      a destination commit author. It is handy for source SCMs that use unix
17424
e7cfe3587ea4 fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
    65
      logins to identify authors (e.g.: CVS). One line per author mapping and
e7cfe3587ea4 fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
    66
      the line format is:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    67
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    68
        source author = destination author
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    69
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    70
      Empty lines and lines starting with a "#" are ignored.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    71
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    72
      The filemap is a file that allows filtering and remapping of files and
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    73
      directories. Each line can contain one of the following directives:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    74
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    75
        include path/to/file-or-dir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    76
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    77
        exclude path/to/file-or-dir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    78
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    79
        rename path/to/source path/to/destination
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    80
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    81
      Comment lines start with "#". A specified path matches if it equals the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    82
      full relative name of a file or one of its parent directories. The
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    83
      "include" or "exclude" directive with the longest matching path applies,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    84
      so line order does not matter.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    85
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    86
      The "include" directive causes a file, or all files under a directory, to
20784
7f4cf938643d convert: more clear documentation of the 'include' default of a 'include .'
Mads Kiilerich <madski@unity3d.com>
parents: 20008
diff changeset
    87
      be included in the destination repository. The default if there are no
7f4cf938643d convert: more clear documentation of the 'include' default of a 'include .'
Mads Kiilerich <madski@unity3d.com>
parents: 20008
diff changeset
    88
      "include" statements is to include everything. If there are any "include"
7f4cf938643d convert: more clear documentation of the 'include' default of a 'include .'
Mads Kiilerich <madski@unity3d.com>
parents: 20008
diff changeset
    89
      statements, nothing else is included. The "exclude" directive causes files
7f4cf938643d convert: more clear documentation of the 'include' default of a 'include .'
Mads Kiilerich <madski@unity3d.com>
parents: 20008
diff changeset
    90
      or directories to be omitted. The "rename" directive renames a file or
7f4cf938643d convert: more clear documentation of the 'include' default of a 'include .'
Mads Kiilerich <madski@unity3d.com>
parents: 20008
diff changeset
    91
      directory if it is converted. To rename from a subdirectory into the root
7f4cf938643d convert: more clear documentation of the 'include' default of a 'include .'
Mads Kiilerich <madski@unity3d.com>
parents: 20008
diff changeset
    92
      of the repository, use "." as the path to rename to.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
    93
  
22300
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
    94
      "--full" will make sure the converted changesets contain exactly the right
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
    95
      files with the right content. It will make a full conversion of all files,
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
    96
      not just the ones that have changed. Files that already are correct will
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
    97
      not be changed. This can be used to apply filemap changes when converting
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
    98
      incrementally. This is currently only supported for Mercurial and
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
    99
      Subversion.
35ab037de989 convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents: 22110
diff changeset
   100
  
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   101
      The splicemap is a file that allows insertion of synthetic history,
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   102
      letting you specify the parents of a revision. This is useful if you want
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   103
      to e.g. give a Subversion merge two parents, or graft two disconnected
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   104
      series of history together. Each entry contains a key, followed by a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   105
      space, followed by one or two comma-separated values:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   106
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   107
        key parent1, parent2
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   108
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   109
      The key is the revision ID in the source revision control system whose
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   110
      parents should be modified (same format as a key in .hg/shamap). The
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   111
      values are the revision IDs (in either the source or destination revision
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   112
      control system) that should be used as the new parents for that node. For
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   113
      example, if you have merged "release-1.0" into "trunk", then you should
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   114
      specify the revision on "trunk" as the first parent and the one on the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   115
      "release-1.0" branch as the second.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   116
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   117
      The branchmap is a file that allows you to rename a branch when it is
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   118
      being brought in from whatever external repository. When used in
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   119
      conjunction with a splicemap, it allows for a powerful combination to help
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   120
      fix even the most badly mismanaged repositories and turn them into nicely
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   121
      structured Mercurial repositories. The branchmap contains lines of the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   122
      form:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   123
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   124
        original_branch_name new_branch_name
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   125
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   126
      where "original_branch_name" is the name of the branch in the source
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   127
      repository, and "new_branch_name" is the name of the branch is the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   128
      destination repository. No whitespace is allowed in the branch names. This
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   129
      can be used to (for instance) move code in one repository from "default"
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   130
      to a named branch.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   131
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   132
      Mercurial Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
   133
      ################
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   134
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   135
      The Mercurial source recognizes the following configuration options, which
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   136
      you can set on the command line with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   137
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   138
      convert.hg.ignoreerrors
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   139
                    ignore integrity errors when reading. Use it to fix
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   140
                    Mercurial repositories with missing revlogs, by converting
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   141
                    from and to Mercurial. Default is False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   142
      convert.hg.saverev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   143
                    store original revision ID in changeset (forces target IDs
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   144
                    to change). It takes a boolean argument and defaults to
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   145
                    False.
25880
6fb55c6c6562 convert: document convert.hg.startrev
Matt Harbison <matt_harbison@yahoo.com>
parents: 25787
diff changeset
   146
      convert.hg.startrev
6fb55c6c6562 convert: document convert.hg.startrev
Matt Harbison <matt_harbison@yahoo.com>
parents: 25787
diff changeset
   147
                    specify the initial Mercurial revision. The default is 0.
19891
e271970b9821 convert: introduce hg.revs to replace hg.startrev and --rev with a revset
Mads Kiilerich <madski@unity3d.com>
parents: 19864
diff changeset
   148
      convert.hg.revs
e271970b9821 convert: introduce hg.revs to replace hg.startrev and --rev with a revset
Mads Kiilerich <madski@unity3d.com>
parents: 19864
diff changeset
   149
                    revset specifying the source revisions to convert.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   150
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   151
      CVS Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
   152
      ##########
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   153
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   154
      CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   155
      indicate the starting point of what will be converted. Direct access to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   156
      the repository files is not needed, unless of course the repository is
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
   157
      ":local:". The conversion uses the top level directory in the sandbox to
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   158
      find the CVS repository, and then uses CVS rlog commands to find files to
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   159
      convert. This means that unless a filemap is given, all files under the
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   160
      starting directory will be converted, and that any directory
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   161
      reorganization in the CVS sandbox is ignored.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   162
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   163
      The following options can be used with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   164
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   165
      convert.cvsps.cache
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   166
                    Set to False to disable remote log caching, for testing and
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   167
                    debugging purposes. Default is True.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   168
      convert.cvsps.fuzz
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   169
                    Specify the maximum time (in seconds) that is allowed
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   170
                    between commits with identical user and log message in a
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   171
                    single changeset. When very large files were checked in as
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   172
                    part of a changeset then the default may not be long enough.
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   173
                    The default is 60.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   174
      convert.cvsps.mergeto
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   175
                    Specify a regular expression to which commit log messages
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   176
                    are matched. If a match occurs, then the conversion process
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   177
                    will insert a dummy revision merging the branch on which
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   178
                    this log message occurs to the branch indicated in the
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   179
                    regex. Default is "{{mergetobranch ([-\w]+)}}"
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   180
      convert.cvsps.mergefrom
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   181
                    Specify a regular expression to which commit log messages
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   182
                    are matched. If a match occurs, then the conversion process
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   183
                    will add the most recent revision on the branch indicated in
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   184
                    the regex as the second parent of the changeset. Default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   185
                    "{{mergefrombranch ([-\w]+)}}"
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   186
      convert.localtimezone
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   187
                    use local time (as determined by the TZ environment
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   188
                    variable) for changeset date/times. The default is False
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   189
                    (use UTC).
18321
c51d2bc7a5d7 convert: correct 'hooks' section name in online help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17837
diff changeset
   190
      hooks.cvslog  Specify a Python function to be called at the end of
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   191
                    gathering the CVS log. The function is passed a list with
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   192
                    the log entries, and can modify the entries in-place, or add
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   193
                    or delete them.
18321
c51d2bc7a5d7 convert: correct 'hooks' section name in online help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17837
diff changeset
   194
      hooks.cvschangesets
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   195
                    Specify a Python function to be called after the changesets
17251
98166640b356 help: fix some instances of 'the the'
Mads Kiilerich <mads@kiilerich.com>
parents: 17002
diff changeset
   196
                    are calculated from the CVS log. The function is passed a
98166640b356 help: fix some instances of 'the the'
Mads Kiilerich <mads@kiilerich.com>
parents: 17002
diff changeset
   197
                    list with the changeset entries, and can modify the
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   198
                    changesets in-place, or add or delete them.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   199
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   200
      An additional "debugcvsps" Mercurial command allows the builtin changeset
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   201
      merging code to be run without doing a conversion. Its parameters and
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   202
      output are similar to that of cvsps 2.1. Please see the command help for
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   203
      more details.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   204
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   205
      Subversion Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
   206
      #################
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   207
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   208
      Subversion source detects classical trunk/branches/tags layouts. By
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   209
      default, the supplied "svn://repo/path/" source URL is converted as a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   210
      single branch. If "svn://repo/path/trunk" exists it replaces the default
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   211
      branch. If "svn://repo/path/branches" exists, its subdirectories are
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   212
      listed as possible branches. If "svn://repo/path/tags" exists, it is
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   213
      looked for tags referencing converted branches. Default "trunk",
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   214
      "branches" and "tags" values can be overridden with following options. Set
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   215
      them to paths relative to the source URL, or leave them blank to disable
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   216
      auto detection.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   217
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   218
      The following options can be set with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   219
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   220
      convert.svn.branches
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   221
                    specify the directory containing branches. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   222
                    "branches".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   223
      convert.svn.tags
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   224
                    specify the directory containing tags. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   225
                    "tags".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   226
      convert.svn.trunk
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   227
                    specify the name of the trunk branch. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   228
                    "trunk".
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   229
      convert.localtimezone
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   230
                    use local time (as determined by the TZ environment
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   231
                    variable) for changeset date/times. The default is False
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17837
diff changeset
   232
                    (use UTC).
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   233
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   234
      Source history can be retrieved starting at a specific revision, instead
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   235
      of being integrally converted. Only single branch conversions are
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   236
      supported.
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   237
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   238
      convert.svn.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   239
                    specify start Subversion revision number. The default is 0.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   240
  
22466
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   241
      Git Source
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   242
      ##########
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   243
  
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   244
      The Git importer converts commits from all reachable branches (refs in
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   245
      refs/heads) and remotes (refs in refs/remotes) to Mercurial. Branches are
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   246
      converted to bookmarks with the same name, with the leading 'refs/heads'
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   247
      stripped. Git submodules are converted to Git subrepos in Mercurial.
e1b68c0a9363 convert: add initial docs for git sources
Siddharth Agarwal <sid0@fb.com>
parents: 22300
diff changeset
   248
  
22470
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   249
      The following options can be set with "--config":
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   250
  
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   251
      convert.git.similarity
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   252
                    specify how similar files modified in a commit must be to be
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   253
                    imported as renames or copies, as a percentage between "0"
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   254
                    (disabled) and "100" (files must be identical). For example,
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   255
                    "90" means that a delete/add pair will be imported as a
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   256
                    rename if more than 90% of the file hasn't changed. The
22512
6b6da715cb96 convert: change default for git rename detection to 50%
Siddharth Agarwal <sid0@fb.com>
parents: 22471
diff changeset
   257
                    default is "50".
22471
cc5f94db672b convert: add support to find git copies from all files in the working copy
Siddharth Agarwal <sid0@fb.com>
parents: 22470
diff changeset
   258
      convert.git.findcopiesharder
cc5f94db672b convert: add support to find git copies from all files in the working copy
Siddharth Agarwal <sid0@fb.com>
parents: 22470
diff changeset
   259
                    while detecting copies, look at all files in the working
cc5f94db672b convert: add support to find git copies from all files in the working copy
Siddharth Agarwal <sid0@fb.com>
parents: 22470
diff changeset
   260
                    copy instead of just changed ones. This is very expensive
cc5f94db672b convert: add support to find git copies from all files in the working copy
Siddharth Agarwal <sid0@fb.com>
parents: 22470
diff changeset
   261
                    for large projects, and is only effective when
cc5f94db672b convert: add support to find git copies from all files in the working copy
Siddharth Agarwal <sid0@fb.com>
parents: 22470
diff changeset
   262
                    "convert.git.similarity" is greater than 0. The default is
cc5f94db672b convert: add support to find git copies from all files in the working copy
Siddharth Agarwal <sid0@fb.com>
parents: 22470
diff changeset
   263
                    False.
30646
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   264
      convert.git.renamelimit
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   265
                    perform rename and copy detection up to this many changed
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   266
                    files in a commit. Increasing this will make rename and copy
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   267
                    detection more accurate but will significantly slow down
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   268
                    computation on large projects. The option is only relevant
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   269
                    if "convert.git.similarity" is greater than 0. The default
ea3540e66fd8 convert: config option for git rename limit
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30152
diff changeset
   270
                    is "400".
30660
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   271
      convert.git.extrakeys
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   272
                    list of extra keys from commit metadata to copy to the
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   273
                    destination. Some Git repositories store extra metadata in
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   274
                    commits. By default, this non-default metadata will be lost
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   275
                    during conversion. Setting this config option can retain
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   276
                    that metadata. Some built-in keys such as "parent" and
1f21a6835604 convert: add config option to copy extra keys from Git commits
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30646
diff changeset
   277
                    "branch" are not allowed to be copied.
25787
d9133e89d39d convert: allow customizing git remote prefix
Durham Goode <durham@fb.com>
parents: 25750
diff changeset
   278
      convert.git.remoteprefix
d9133e89d39d convert: allow customizing git remote prefix
Durham Goode <durham@fb.com>
parents: 25750
diff changeset
   279
                    remote refs are converted as bookmarks with
d9133e89d39d convert: allow customizing git remote prefix
Durham Goode <durham@fb.com>
parents: 25750
diff changeset
   280
                    "convert.git.remoteprefix" as a prefix followed by a /. The
d9133e89d39d convert: allow customizing git remote prefix
Durham Goode <durham@fb.com>
parents: 25750
diff changeset
   281
                    default is 'remote'.
30661
ced0d686ecb3 convert: add config option to control storing original revision
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30660
diff changeset
   282
      convert.git.saverev
ced0d686ecb3 convert: add config option to control storing original revision
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30660
diff changeset
   283
                    whether to store the original Git commit ID in the metadata
ced0d686ecb3 convert: add config option to control storing original revision
Gregory Szorc <gregory.szorc@gmail.com>
parents: 30660
diff changeset
   284
                    of the destination commit. The default is True.
26077
e63d05fbae84 convert: add convert.git.skipsubmodules option
Durham Goode <durham@fb.com>
parents: 25884
diff changeset
   285
      convert.git.skipsubmodules
e63d05fbae84 convert: add convert.git.skipsubmodules option
Durham Goode <durham@fb.com>
parents: 25884
diff changeset
   286
                    does not convert root level .gitmodules files or files with
e63d05fbae84 convert: add convert.git.skipsubmodules option
Durham Goode <durham@fb.com>
parents: 25884
diff changeset
   287
                    160000 mode indicating a submodule. Default is False.
22470
8e0c4df28eec convert: add support to detect git renames and copies
Siddharth Agarwal <sid0@fb.com>
parents: 22466
diff changeset
   288
  
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   289
      Perforce Source
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
   290
      ###############
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   291
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   292
      The Perforce (P4) importer can be given a p4 depot path or a client
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   293
      specification as source. It will convert all files in the source to a flat
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   294
      Mercurial repository, ignoring labels, branches and integrations. Note
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   295
      that when a depot path is given you then usually should specify a target
12924
2f1174b2c4fa convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com>
parents: 12922
diff changeset
   296
      directory, because otherwise the target may be named "...-hg".
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   297
  
25884
b810b59eca62 convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents: 25880
diff changeset
   298
      The following options can be set with "--config":
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   299
  
25884
b810b59eca62 convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents: 25880
diff changeset
   300
      convert.p4.encoding
b810b59eca62 convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents: 25880
diff changeset
   301
                    specify the encoding to use when decoding standard output of
b810b59eca62 convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents: 25880
diff changeset
   302
                    the Perforce command line tool. The default is default
b810b59eca62 convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents: 25880
diff changeset
   303
                    system encoding.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   304
      convert.p4.startrev
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   305
                    specify initial Perforce revision (a Perforce changelist
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   306
                    number).
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   307
  
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   308
      Mercurial Destination
17267
979b107eaea2 doc: unify section level between help topics
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17251
diff changeset
   309
      #####################
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   310
  
25558
daf9f7ee2a5c convert: support incremental conversion with hg subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 22512
diff changeset
   311
      The Mercurial destination will recognize Mercurial subrepositories in the
daf9f7ee2a5c convert: support incremental conversion with hg subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 22512
diff changeset
   312
      destination directory, and update the .hgsubstate file automatically if
daf9f7ee2a5c convert: support incremental conversion with hg subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 22512
diff changeset
   313
      the destination subrepositories contain the <dest>/<sub>/.hg/shamap file.
daf9f7ee2a5c convert: support incremental conversion with hg subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 22512
diff changeset
   314
      Converting a repository with subrepositories requires converting a single
daf9f7ee2a5c convert: support incremental conversion with hg subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 22512
diff changeset
   315
      repository at a time, from the bottom up.
daf9f7ee2a5c convert: support incremental conversion with hg subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents: 22512
diff changeset
   316
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   317
      The following options are supported:
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   318
  
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   319
      convert.hg.clonebranches
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   320
                    dispatch source branches in separate clones. The default is
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   321
                    False.
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   322
      convert.hg.tagsbranch
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   323
                    branch name for tag revisions, defaults to "default".
12922
58f0c60b7f40 convert: use field list instead of option list in help
Erik Zielke <ez@aragost.com>
parents: 12787
diff changeset
   324
      convert.hg.usebranchnames
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15443
diff changeset
   325
                    preserve branch names. The default is True.
25750
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   326
      convert.hg.sourcename
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   327
                    records the given string as a 'convert_source' extra value
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   328
                    on each commit made in the target repository. The default is
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   329
                    None.
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   330
  
25741
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   331
      All Destinations
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   332
      ################
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   333
  
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   334
      All destination types accept the following options:
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   335
  
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   336
      convert.skiptags
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   337
                    does not convert tags from the source repo to the target
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   338
                    repo. The default is False.
86fe3c404c1e convert: add config to not convert tags
Durham Goode <durham@fb.com>
parents: 25558
diff changeset
   339
  
25748
baea47cafe75 convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents: 25741
diff changeset
   340
  options ([+] can be repeated):
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   341
  
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
   342
   -s --source-type TYPE source repository type
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
   343
   -d --dest-type TYPE   destination repository type
25748
baea47cafe75 convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents: 25741
diff changeset
   344
   -r --rev REV [+]      import up to source revision REV
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
   345
   -A --authormap FILE   remap usernames using this file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
   346
      --filemap FILE     remap file names using contents of file
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   347
      --full             apply filemap changes by converting all files again
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
   348
      --splicemap FILE   splice synthesized history into place
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 13494
diff changeset
   349
      --branchmap FILE   change branch names while converting
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   350
      --branchsort       try to sort changesets by branches
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   351
      --datesort         try to sort changesets by date
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   352
      --sourcesort       preserve source changesets order
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   353
      --closesort        try to reorder closed revisions
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   354
  
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21077
diff changeset
   355
  (some details hidden, use --verbose to show complete help)
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   356
  $ hg init a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   357
  $ cd a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   358
  $ echo a > a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   359
  $ hg ci -d'0 0' -Ama
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   360
  adding a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   361
  $ hg cp a b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   362
  $ hg ci -d'1 0' -mb
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   363
  $ hg rm a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   364
  $ hg ci -d'2 0' -mc
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   365
  $ hg mv b a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   366
  $ hg ci -d'3 0' -md
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   367
  $ echo a >> a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   368
  $ hg ci -d'4 0' -me
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   369
  $ cd ..
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   370
  $ hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded'
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   371
  assuming destination a-hg
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   372
  initializing destination a-hg repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   373
  scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   374
  sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   375
  converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   376
  4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   377
  3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   378
  2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   379
  1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   380
  0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   381
  $ hg --cwd a-hg pull ../a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   382
  pulling from ../a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   383
  searching for changes
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   384
  no changes found
7905
d596b1f2935a convert: missing p4 tool is only slightly fatal
Mads Kiilerich <mads@kiilerich.com>
parents: 5805
diff changeset
   385
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   386
conversion to existing file should fail
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   387
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   388
  $ touch bogusfile
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   389
  $ hg convert a bogusfile
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   390
  initializing destination bogusfile repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   391
  abort: cannot create new bundle repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   392
  [255]
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   393
20008
e54a078153f7 tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents: 19891
diff changeset
   394
#if unix-permissions no-root
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   395
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   396
conversion to dir without permissions should fail
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   397
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   398
  $ mkdir bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   399
  $ chmod 000 bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   400
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   401
  $ hg convert a bogusdir
18227
720308f741cb dispatch: show empty filename in OSError aborts
Mads Kiilerich <mads@kiilerich.com>
parents: 17974
diff changeset
   402
  abort: Permission denied: 'bogusdir'
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   403
  [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   404
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   405
user permissions should succeed
9962
a7178eccf2dc convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com>
parents: 8674
diff changeset
   406
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   407
  $ chmod 700 bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   408
  $ hg convert a bogusdir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   409
  initializing destination bogusdir repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   410
  scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   411
  sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   412
  converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   413
  4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   414
  3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   415
  2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   416
  1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   417
  0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   418
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   419
#endif
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   420
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   421
test pre and post conversion actions
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   422
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   423
  $ echo 'include b' > filemap
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   424
  $ hg convert --debug --filemap filemap a partialb | \
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   425
  >     grep 'run hg'
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   426
  run hg source pre-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   427
  run hg sink pre-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   428
  run hg sink post-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   429
  run hg source post-conversion action
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   430
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   431
converting empty dir should fail "nicely
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   432
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   433
  $ mkdir emptydir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   434
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   435
override $PATH to ensure p4 not visible; use $PYTHON in case we're
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   436
running from a devel copy, not a temp installation
9962
a7178eccf2dc convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com>
parents: 8674
diff changeset
   437
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   438
  $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg convert emptydir
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   439
  assuming destination emptydir-hg
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   440
  initializing destination emptydir-hg repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   441
  emptydir does not look like a CVS checkout
29102
22c53b3a390d tests: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 29051
diff changeset
   442
  $TESTTMP/emptydir does not look like a Git repository (glob)
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   443
  emptydir does not look like a Subversion repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   444
  emptydir is not a local Mercurial repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   445
  emptydir does not look like a darcs repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   446
  emptydir does not look like a monotone repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   447
  emptydir does not look like a GNU Arch repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   448
  emptydir does not look like a Bazaar repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   449
  cannot find required "p4" tool
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   450
  abort: emptydir: missing or unsupported repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   451
  [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   452
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   453
convert with imaginary source type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   454
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   455
  $ hg convert --source-type foo a a-foo
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   456
  initializing destination a-foo repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   457
  abort: foo: invalid source repository type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   458
  [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   459
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   460
convert with imaginary sink type
10577
d5bd1beff794 store: only add new entries to the fncache file
Adrian Buehlmann <adrian@cadifra.com>
parents: 9962
diff changeset
   461
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   462
  $ hg convert --dest-type foo a a-foo
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   463
  abort: foo: invalid destination repository type
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   464
  [255]
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   465
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   466
testing: convert must not produce duplicate entries in fncache
10885
9e4d120e3c32 convert/subversion: fix default URL checker prototype
Patrick Mezard <pmezard@gmail.com>
parents: 10775
diff changeset
   467
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   468
  $ hg convert a b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   469
  initializing destination b repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   470
  scanning source...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   471
  sorting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   472
  converting...
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   473
  4 a
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   474
  3 b
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   475
  2 c
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   476
  1 d
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   477
  0 e
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   478
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   479
contents of fncache file:
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   480
13389
3efc99ac2ac4 tests: sort fncache
Adrian Buehlmann <adrian@cadifra.com>
parents: 13011
diff changeset
   481
  $ cat b/.hg/store/fncache | sort
12510
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   482
  data/a.i
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   483
  data/b.i
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   484
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   485
test bogus URL
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   486
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   487
  $ hg convert -q bzr+ssh://foobar@selenic.com/baz baz
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   488
  abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository
efcbff270317 tests: unify test-convert
Matt Mackall <mpm@selenic.com>
parents: 10885
diff changeset
   489
  [255]
17002
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   490
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   491
test revset converted() lookup
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   492
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17267
diff changeset
   493
  $ hg --config convert.hg.saverev=True convert a c
17002
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   494
  initializing destination c repository
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   495
  scanning source...
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   496
  sorting...
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   497
  converting...
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   498
  4 a
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   499
  3 b
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   500
  2 c
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   501
  1 d
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   502
  0 e
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   503
  $ echo f > c/f
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   504
  $ hg -R c ci -d'0 0' -Amf
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   505
  adding f
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   506
  created new head
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   507
  $ hg -R c log -r "converted(09d945a62ce6)"
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   508
  changeset:   1:98c3dd46a874
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   509
  user:        test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   510
  date:        Thu Jan 01 00:00:01 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   511
  summary:     b
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   512
  
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   513
  $ hg -R c log -r "converted()"
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   514
  changeset:   0:31ed57b2037c
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   515
  user:        test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   516
  date:        Thu Jan 01 00:00:00 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   517
  summary:     a
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   518
  
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   519
  changeset:   1:98c3dd46a874
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   520
  user:        test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   521
  date:        Thu Jan 01 00:00:01 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   522
  summary:     b
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   523
  
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   524
  changeset:   2:3b9ca06ef716
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   525
  user:        test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   526
  date:        Thu Jan 01 00:00:02 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   527
  summary:     c
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   528
  
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   529
  changeset:   3:4e0debd37cf2
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   530
  user:        test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   531
  date:        Thu Jan 01 00:00:03 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   532
  summary:     d
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   533
  
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   534
  changeset:   4:9de3bc9349c5
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   535
  user:        test
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   536
  date:        Thu Jan 01 00:00:04 1970 +0000
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   537
  summary:     e
0eb522625eb2 revset: add a predicate for finding converted changesets
Matt Harbison <matt_harbison@yahoo.com>
parents: 16986
diff changeset
   538
  
25750
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   539
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   540
test specifying a sourcename
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   541
  $ echo g > a/g
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   542
  $ hg -R a ci -d'0 0' -Amg
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   543
  adding g
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   544
  $ hg --config convert.hg.sourcename=mysource --config convert.hg.saverev=True convert a c
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   545
  scanning source...
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   546
  sorting...
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   547
  converting...
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   548
  0 g
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   549
  $ hg -R c log -r tip --template '{extras % "{extra}\n"}'
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   550
  branch=default
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   551
  convert_revision=a3bc6100aa8ec03e00aaf271f1f50046fb432072
c9093d4d1ff6 convert: add config for recording the source name
Durham Goode <durham@fb.com>
parents: 25748
diff changeset
   552
  convert_source=mysource