tests/test-convert-p4.t
author Simon Sapin <simon.sapin@octobus.net>
Fri, 07 Jan 2022 14:40:21 +0100
changeset 48575 e91aa800ae5b
parent 31595 78ac8acfc4bd
permissions -rw-r--r--
rhg: desambiguate status without decompressing filelog if possible When status is unsure based on `stat()` and the dirstate if a file is clean or modified, we need to compare it against the filelog. This comparison can skip looking at contents if the lengths differ. This changeset optimize this further to deduce what we can about the length if the filelog without decompressing it or resolving deltas. Differential Revision: https://phab.mercurial-scm.org/D11965
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 16673
diff changeset
     1
#require p4
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     3
  $ echo "[extensions]" >> $HGRCPATH
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     4
  $ echo "convert = " >> $HGRCPATH
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
     5
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     6
create p4 depot
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     7
  $ P4ROOT=`pwd`/depot; export P4ROOT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     8
  $ P4AUDIT=$P4ROOT/audit; export P4AUDIT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
     9
  $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    10
  $ P4LOG=$P4ROOT/log; export P4LOG
22293
a970a5c15b43 tests: fix p4 tests so they use separate ports and can be run in parallel
Mads Kiilerich <madski@unity3d.com>
parents: 22046
diff changeset
    11
  $ P4PORT=localhost:$HGPORT; export P4PORT
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    12
  $ P4DEBUG=1; export P4DEBUG
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    13
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    14
start the p4 server
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    15
  $ [ ! -d $P4ROOT ] && mkdir $P4ROOT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    16
  $ p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr &
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    17
  $ echo $! >> $DAEMON_PIDS
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    18
  $ trap "echo stopping the p4 server ; p4 admin stop" EXIT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    19
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    20
  $ # wait for the server to initialize
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    21
  $ while ! p4 ; do
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    22
  >    sleep 1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    23
  > done >/dev/null 2>/dev/null
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    24
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    25
create a client spec
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    26
  $ P4CLIENT=hg-p4-import; export P4CLIENT
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    27
  $ DEPOTPATH=//depot/test-mercurial-import/...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    28
  $ p4 client -o | sed '/^View:/,$ d' >p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    29
  $ echo View: >>p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    30
  $ echo " $DEPOTPATH //$P4CLIENT/..." >>p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    31
  $ p4 client -i <p4client
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    32
  Client hg-p4-import saved.
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    33
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    34
populate the depot
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    35
  $ echo a > a
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    36
  $ mkdir b
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    37
  $ echo c > b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    38
  $ p4 add a b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    39
  //depot/test-mercurial-import/a#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    40
  //depot/test-mercurial-import/b/c#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    41
  $ p4 submit -d initial
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    42
  Submitting change 1.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    43
  Locking 2 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    44
  add //depot/test-mercurial-import/a#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    45
  add //depot/test-mercurial-import/b/c#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    46
  Change 1 submitted.
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    47
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    48
change some files
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    49
  $ p4 edit a
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    50
  //depot/test-mercurial-import/a#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    51
  $ echo aa >> a
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    52
  $ p4 submit -d "change a"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    53
  Submitting change 2.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    54
  Locking 1 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    55
  edit //depot/test-mercurial-import/a#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    56
  Change 2 submitted.
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    57
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    58
  $ p4 edit b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    59
  //depot/test-mercurial-import/b/c#1 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    60
  $ echo cc >> b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    61
  $ p4 submit -d "change b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    62
  Submitting change 3.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    63
  Locking 1 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    64
  edit //depot/test-mercurial-import/b/c#2
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    65
  Change 3 submitted.
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    66
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    67
convert
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    68
  $ hg convert -s p4 $DEPOTPATH dst
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    69
  initializing destination dst repository
30637
1d0e4832e616 convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents: 22293
diff changeset
    70
  scanning source...
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    71
  reading p4 views
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    72
  collecting p4 changelists
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    73
  1 initial
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    74
  2 change a
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    75
  3 change b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    76
  sorting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    77
  converting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    78
  2 initial
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    79
  1 change a
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    80
  0 change b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    81
  $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    82
  rev=2 desc="change b/c" tags="tip" files="b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    83
  rev=1 desc="change a" tags="" files="a"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    84
  rev=0 desc="initial" tags="" files="a b/c"
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    85
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    86
change some files
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    87
  $ p4 edit a b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    88
  //depot/test-mercurial-import/a#2 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    89
  //depot/test-mercurial-import/b/c#2 - opened for edit
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    90
  $ echo aaa >> a
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    91
  $ echo ccc >> b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    92
  $ p4 submit -d "change a b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    93
  Submitting change 4.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    94
  Locking 2 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    95
  edit //depot/test-mercurial-import/a#3
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    96
  edit //depot/test-mercurial-import/b/c#3
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    97
  Change 4 submitted.
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    98
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
    99
convert again
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   100
  $ hg convert -s p4 $DEPOTPATH dst
30637
1d0e4832e616 convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents: 22293
diff changeset
   101
  scanning source...
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   102
  reading p4 views
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   103
  collecting p4 changelists
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   104
  4 change a b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   105
  sorting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   106
  converting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   107
  0 change a b/c
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   108
  $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   109
  rev=3 desc="change a b/c" tags="tip" files="a b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   110
  rev=2 desc="change b/c" tags="" files="b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   111
  rev=1 desc="change a" tags="" files="a"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   112
  rev=0 desc="initial" tags="" files="a b/c"
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   113
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   114
interesting names
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   115
  $ echo dddd > "d d"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   116
  $ mkdir " e"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   117
  $ echo fff >" e/ f"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   118
  $ p4 add "d d" " e/ f"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   119
  //depot/test-mercurial-import/d d#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   120
  //depot/test-mercurial-import/ e/ f#1 - opened for add
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   121
  $ p4 submit -d "add d e f"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   122
  Submitting change 5.
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   123
  Locking 2 files ...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   124
  add //depot/test-mercurial-import/ e/ f#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   125
  add //depot/test-mercurial-import/d d#1
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   126
  Change 5 submitted.
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   127
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   128
convert again
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   129
  $ hg convert -s p4 $DEPOTPATH dst
30637
1d0e4832e616 convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents: 22293
diff changeset
   130
  scanning source...
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   131
  reading p4 views
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   132
  collecting p4 changelists
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   133
  5 add d e f
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   134
  sorting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   135
  converting...
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   136
  0 add d e f
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   137
  $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   138
  rev=4 desc="add d e f" tags="tip" files=" e/ f d d"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   139
  rev=3 desc="change a b/c" tags="" files="a b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   140
  rev=2 desc="change b/c" tags="" files="b/c"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   141
  rev=1 desc="change a" tags="" files="a"
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   142
  rev=0 desc="initial" tags="" files="a b/c"
7823
11efa41037e2 convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   143
31595
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   144
empty commit message
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   145
  $ p4 edit a
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   146
  //depot/test-mercurial-import/a#3 - opened for edit
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   147
  $ echo aaaaa >> a
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   148
  $ p4 submit -d ""
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   149
  Submitting change 6.
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   150
  Locking 1 files ...
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   151
  edit //depot/test-mercurial-import/a#4
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   152
  Change 6 submitted.
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   153
  $ hg convert -s p4 $DEPOTPATH dst
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   154
  scanning source...
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   155
  reading p4 views
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   156
  collecting p4 changelists
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   157
  6 **empty changelist description**
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   158
  sorting...
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   159
  converting...
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   160
  0 
78ac8acfc4bd convert: fix the handling of empty changlist descriptions in P4
David Soria Parra <davidsp@fb.com>
parents: 30637
diff changeset
   161
16673
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   162
exit trap:
775a8d33e6f0 tests: unify the last sh tests
Mads Kiilerich <mads@kiilerich.com>
parents: 9044
diff changeset
   163
  stopping the p4 server