tests/test-convert-svn-branches.t
author Lucas Moscovicz <lmoscovicz@fb.com>
Fri, 14 Mar 2014 13:27:12 -0700
changeset 20760 d5fa413346e7
parent 20331 1d155582a8ea
child 22046 7a9cbb315d84
permissions -rw-r--r--
cmdutil: changed max method for lazy call Used the lazy max call instead of the python max implementation to be able to use lazysets for graphlog.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
     1
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
     2
  $ "$TESTDIR/hghave" svn svn-bindings || exit 80
5874
866aa7ae2612 Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     3
13519
43b3b761d9d1 tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents: 12377
diff changeset
     4
  $ cat >> $HGRCPATH <<EOF
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
     5
  > [extensions]
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 16190
diff changeset
     6
  > convert =
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
     7
  > EOF
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
     8
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
     9
  $ svnadmin create svn-repo
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    10
  $ svnadmin load -q svn-repo < "$TESTDIR/svn/branches.svndump"
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    11
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    12
Convert trunk and branches
5874
866aa7ae2612 Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    13
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    14
  $ cat > branchmap <<EOF
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    15
  > old3 newbranch
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 16190
diff changeset
    16
  > 
16190
9479c28a22bf convert: ignore blank lines in mapfiles (issue3286)
Patrick Mezard <patrick@mezard.eu>
parents: 14162
diff changeset
    17
  > 
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    18
  > EOF
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    19
  $ hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    20
  initializing destination A-hg repository
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    21
  scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    22
  sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    23
  converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    24
  10 init projA
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    25
  9 hello
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    26
  8 branch trunk, remove c and dir
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    27
  7 change a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    28
  6 change b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    29
  5 move and update c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    30
  4 move and update c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    31
  3 change b again
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    32
  2 move to old2
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    33
  1 move back to old
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    34
  0 last change to a
5874
866aa7ae2612 Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    35
13691
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    36
Test template keywords
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    37
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    38
  $ hg -R A-hg log --template '{rev} {svnuuid}{svnpath}@{svnrev}\n'
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    39
  10 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@10
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    40
  9 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@9
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    41
  8 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old2@8
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    42
  7 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@7
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    43
  6 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@6
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    44
  5 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@6
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    45
  4 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@5
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    46
  3 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@4
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    47
  2 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@3
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    48
  1 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@2
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    49
  0 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@1
ad02eba55459 convert: add svnrev, svnpath and svnuuid template keywords
Patrick Mezard <pmezard@gmail.com>
parents: 13519
diff changeset
    50
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    51
Convert again
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    52
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    53
  $ hg convert --branchmap=branchmap --datesort svn-repo A-hg
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    54
  scanning source...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    55
  sorting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    56
  converting...
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    57
  0 branch trunk@1 into old3
5874
866aa7ae2612 Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    58
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    59
  $ cd A-hg
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 17447
diff changeset
    60
  $ hg log -G --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    61
  o  branch=newbranch 11 branch trunk@1 into old3 files:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    62
  |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    63
  | o  branch= 10 last change to a files: a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    64
  | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    65
  | | o  branch=old 9 move back to old files:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    66
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    67
  | | o  branch=old2 8 move to old2 files:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    68
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    69
  | | o  branch=old 7 change b again files: b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    70
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    71
  | o |  branch= 6 move and update c files: b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    72
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    73
  | | o  branch=old 5 move and update c files: c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    74
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    75
  | | o  branch=old 4 change b files: b
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    76
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    77
  | o |  branch= 3 change a files: a
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    78
  | | |
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    79
  | | o  branch=old 2 branch trunk, remove c and dir files: c
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    80
  | |/
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    81
  | o  branch= 1 hello files: a b c dir/e
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    82
  |/
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    83
  o  branch= 0 init projA files:
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    84
  
5874
866aa7ae2612 Test subversion branches conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    85
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    86
  $ hg branches
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13691
diff changeset
    87
  newbranch                     11:a6d7cc050ad1
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13691
diff changeset
    88
  default                       10:6e2b33404495
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13691
diff changeset
    89
  old                            9:93c4b0f99529
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13691
diff changeset
    90
  old2                           8:b52884d7bead (inactive)
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    91
  $ hg tags -q
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    92
  tip
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    93
  $ cd ..
9587
d80a251baf9a convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com>
parents: 8765
diff changeset
    94
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    95
Test hg failing to call itself
9587
d80a251baf9a convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com>
parents: 8765
diff changeset
    96
17447
29c100b42f5b test-convert-svn-branches.t: fix self call failure on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 17347
diff changeset
    97
  $ HG=foobar hg convert svn-repo B-hg 2>&1 | grep abort
12370
f98010f57a5e tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 10205
diff changeset
    98
  abort: Mercurial failed to run itself, check hg executable is in PATH
20331
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
    99
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   100
Convert 'trunk' to branch other than 'default'
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   101
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   102
  $ cat > branchmap <<EOF
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   103
  > None hgtrunk
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   104
  > 
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   105
  > 
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   106
  > EOF
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   107
  $ hg convert --branchmap=branchmap --datesort -r 10 svn-repo C-hg
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   108
  initializing destination C-hg repository
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   109
  scanning source...
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   110
  sorting...
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   111
  converting...
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   112
  10 init projA
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   113
  9 hello
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   114
  8 branch trunk, remove c and dir
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   115
  7 change a
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   116
  6 change b
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   117
  5 move and update c
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   118
  4 move and update c
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   119
  3 change b again
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   120
  2 move to old2
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   121
  1 move back to old
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   122
  0 last change to a
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   123
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   124
  $ cd C-hg
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   125
  $ hg branches
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   126
  hgtrunk                       10:745f063703b4
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   127
  old                            9:aa50d7b8d922
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   128
  old2                           8:c85a22267b6e (inactive)
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   129
  $ cd ..
1d155582a8ea convert: use branchmap to change default branch in destination (issue3469)
lstewart
parents: 20117
diff changeset
   130