tests/test-convert-cvs.t
author Raphaël Gomès <rgomes@octobus.net>
Mon, 18 Nov 2019 17:37:59 +0100
changeset 43737 dc4e74d0ef96
parent 41747 c70bdd222dcd
child 44722 e5e5ee2b60e4
permissions -rw-r--r--
py3: send bytes from Rust-created warning patterns Python code expects bytes in both Python 2 and Python 3, so we should send bytes. Differential Revision: https://phab.mercurial-scm.org/D7454
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 20117
diff changeset
     1
#require cvs
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
     2
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     3
  $ cvscall()
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     4
  > {
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     5
  >     cvs -f "$@"
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     6
  > }
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     7
  $ hgcat()
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     8
  > {
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
     9
  >     hg --cwd src-hg cat -r tip "$1"
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    10
  > }
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    11
  $ echo "[extensions]" >> $HGRCPATH
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    12
  $ echo "convert = " >> $HGRCPATH
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    13
  $ cat > cvshooks.py <<EOF
41747
c70bdd222dcd tests: bulk changes to avoid whitespace errors of check-code.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 37934
diff changeset
    14
  > def cvslog(ui, repo, hooktype, log):
c70bdd222dcd tests: bulk changes to avoid whitespace errors of check-code.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 37934
diff changeset
    15
  >     ui.write(b'%s hook: %d entries\n' % (hooktype, len(log)))
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    16
  > 
41747
c70bdd222dcd tests: bulk changes to avoid whitespace errors of check-code.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 37934
diff changeset
    17
  > def cvschangesets(ui, repo, hooktype, changesets):
c70bdd222dcd tests: bulk changes to avoid whitespace errors of check-code.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 37934
diff changeset
    18
  >     ui.write(b'%s hook: %d changesets\n' % (hooktype, len(changesets)))
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    19
  > EOF
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    20
  $ hookpath=`pwd`
23172
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    21
  $ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    22
  > [hooks]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    23
  > cvslog = python:$hookpath/cvshooks.py:cvslog
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    24
  > cvschangesets = python:$hookpath/cvshooks.py:cvschangesets
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22046
diff changeset
    25
  > EOF
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    26
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    27
create cvs repository
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    28
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    29
  $ mkdir cvsrepo
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    30
  $ cd cvsrepo
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    31
  $ CVSROOT=`pwd`
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    32
  $ export CVSROOT
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    33
  $ CVS_OPTIONS=-f
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    34
  $ export CVS_OPTIONS
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    35
  $ cd ..
23675
96529f81e2e9 tests: run 'cvs init' only on non-existent directories (issue4482)
Thomas Klausner <tk@giga.or.at>
parents: 23172
diff changeset
    36
  $ rmdir cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    37
  $ cvscall -q -d "$CVSROOT" init
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    38
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    39
create source directory
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    40
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    41
  $ mkdir src-temp
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    42
  $ cd src-temp
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    43
  $ echo a > a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    44
  $ mkdir b
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    45
  $ cd b
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    46
  $ echo c > c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    47
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    48
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    49
import source directory
6717
2011bb8ada9a convert: hg sink commits without working dir
Patrick Mezard <pmezard@gmail.com>
parents: 6690
diff changeset
    50
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    51
  $ cvscall -q import -m import src INITIAL start
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    52
  N src/a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    53
  N src/b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    54
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    55
  No conflicts created by this import
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    56
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    57
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    58
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    59
checkout source directory
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
    60
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    61
  $ cvscall -q checkout src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    62
  U src/a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    63
  U src/b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    64
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    65
commit a new revision changing b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    66
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    67
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    68
  $ sleep 1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    69
  $ echo c >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    70
  $ cvscall -q commit -mci0 . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
    71
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    72
  $ cd ..
10095
69ce7a10e593 convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 9602
diff changeset
    73
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    74
convert fresh repo and also check localtimezone option
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    75
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    76
NOTE: This doesn't check all time zones -- it merely determines that
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    77
the configuration option is taking effect.
10095
69ce7a10e593 convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 9602
diff changeset
    78
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    79
An arbitrary (U.S.) time zone is used here.  TZ=US/Hawaii is selected
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    80
since it does not use DST (unlike other U.S. time zones) and is always
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    81
a fixed difference from UTC.
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
    82
35520
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
    83
This choice is limited to work on Linux environments. At least on
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
    84
FreeBSD 11 this timezone is not known. A better choice is
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
    85
TZ=Pacific/Johnston. On Linux "US/Hawaii" is just a symlink to this
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
    86
name and also it is known on FreeBSD and on Solaris.
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
    87
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
    88
  $ TZ=Pacific/Johnston hg convert --config convert.localtimezone=True src src-hg
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    89
  initializing destination src-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
    90
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    91
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    92
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    93
  5 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    94
  cvslog hook: 5 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    95
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    96
  3 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    97
  cvschangesets hook: 3 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    98
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
    99
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   100
  2 Initial revision
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   101
  1 ci0
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   102
  0 import
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   103
  updating tags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   104
  $ hgcat a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   105
  a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   106
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   107
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   108
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   109
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   110
convert fresh repo with --filemap
10095
69ce7a10e593 convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 9602
diff changeset
   111
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   112
  $ echo include b/c > filemap
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   113
  $ hg convert --filemap filemap src src-filemap
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   114
  initializing destination src-filemap repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   115
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   116
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   117
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   118
  5 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   119
  cvslog hook: 5 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   120
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   121
  3 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   122
  cvschangesets hook: 3 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   123
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   124
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   125
  2 Initial revision
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   126
  1 ci0
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   127
  0 import
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   128
  filtering out empty revision
25571
1abfe639a70c convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24305
diff changeset
   129
  repository tip rolled back to revision 1 (undo convert)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   130
  updating tags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   131
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   132
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   133
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   134
  $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   135
  2 update tags files: .hgtags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   136
  1 ci0 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   137
  0 Initial revision files: b/c
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   138
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   139
convert full repository (issue1649)
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   140
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   141
  $ cvscall -q -d "$CVSROOT" checkout -d srcfull "." | grep -v CVSROOT
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   142
  U srcfull/src/a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   143
  U srcfull/src/b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   144
  $ ls srcfull
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   145
  CVS
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   146
  CVSROOT
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   147
  src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   148
  $ hg convert srcfull srcfull-hg \
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   149
  >     | grep -v 'log entries' | grep -v 'hook:' \
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   150
  >     | grep -v '^[0-3] .*' # filter instable changeset order
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   151
  initializing destination srcfull-hg repository
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   152
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   153
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   154
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   155
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   156
  4 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   157
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   158
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   159
  updating tags
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
   160
  $ hg cat -r tip --cwd srcfull-hg src/a
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   161
  a
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
   162
  $ hg cat -r tip --cwd srcfull-hg src/b/c
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   163
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   164
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   165
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   166
commit new file revisions
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   167
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   168
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   169
  $ echo a >> a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   170
  $ echo c >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   171
  $ cvscall -q commit -mci1 . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   172
  $TESTTMP/cvsrepo/src/a,v  <--  a
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   173
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   174
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   175
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   176
convert again
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   177
35520
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
   178
  $ TZ=Pacific/Johnston hg convert --config convert.localtimezone=True src src-hg
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   179
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   180
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   181
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   182
  7 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   183
  cvslog hook: 7 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   184
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   185
  4 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   186
  cvschangesets hook: 4 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   187
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   188
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   189
  0 ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   190
  $ hgcat a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   191
  a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   192
  a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   193
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   194
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   195
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   196
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   197
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   198
convert again with --filemap
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   199
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   200
  $ hg convert --filemap filemap src src-filemap
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   201
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   202
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   203
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   204
  7 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   205
  cvslog hook: 7 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   206
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   207
  4 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   208
  cvschangesets hook: 4 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   209
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   210
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   211
  0 ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   212
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   213
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   214
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   215
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   216
  $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   217
  3 ci1 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   218
  2 update tags files: .hgtags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   219
  1 ci0 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   220
  0 Initial revision files: b/c
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   221
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   222
commit branch
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   223
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   224
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   225
  $ cvs -q update -r1.1 b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   226
  U b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   227
  $ cvs -q tag -b branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   228
  T a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   229
  T b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   230
  $ cvs -q update -r branch > /dev/null
26594
75e29fcc5a71 test-convert-cvs: add sleep so cvs notices changes
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 26593
diff changeset
   231
  $ sleep 1
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   232
  $ echo d >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   233
  $ cvs -q commit -mci2 . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   234
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   235
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   236
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   237
convert again
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   238
35520
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
   239
  $ TZ=Pacific/Johnston hg convert --config convert.localtimezone=True src src-hg
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   240
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   241
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   242
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   243
  8 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   244
  cvslog hook: 8 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   245
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   246
  5 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   247
  cvschangesets hook: 5 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   248
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   249
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   250
  0 ci2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   251
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   252
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   253
  d
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   254
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   255
convert again with --filemap
10695
b4b16e90712f convert: teach cvsps to handle . repository (issue1649)
Mathieu Clabaut <mathieu.clabaut@systerel.fr>
parents: 10276
diff changeset
   256
35520
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
   257
  $ TZ=Pacific/Johnston hg convert --config convert.localtimezone=True --filemap filemap src src-filemap
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   258
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   259
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   260
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   261
  8 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   262
  cvslog hook: 8 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   263
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   264
  5 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   265
  cvschangesets hook: 5 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   266
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   267
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   268
  0 ci2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   269
  $ hgcat b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   270
  c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   271
  d
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   272
  $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   273
  4 ci2 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   274
  3 ci1 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   275
  2 update tags files: .hgtags
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   276
  1 ci0 files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   277
  0 Initial revision files: b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   278
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   279
commit a new revision with funny log message
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   280
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   281
  $ cd src
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   282
  $ sleep 1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   283
  $ echo e >> a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   284
  $ cvscall -q commit -m'funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   285
  > ----------------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   286
  > log message' . | grep '<--' |\
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   287
  >  sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   288
  checking in src/a,v
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   289
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   290
commit new file revisions with some fuzz
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   291
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   292
  $ sleep 1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   293
  $ echo f >> a
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   294
  $ cvscall -q commit -mfuzzy . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   295
  $TESTTMP/cvsrepo/src/a,v  <--  a
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   296
  $ sleep 4 # the two changes will be split if fuzz < 4
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   297
  $ echo g >> b/c
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   298
  $ cvscall -q commit -mfuzzy . | grep '<--'
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   299
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   300
  $ cd ..
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   301
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   302
convert again
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   303
35520
6a1a0a023fc1 test-convert-cvs: change TZ=US/Hawaii to TZ=Pacific/Johnston
Elmar Bartel <elb@leo.org>
parents: 34450
diff changeset
   304
  $ TZ=Pacific/Johnston hg convert --config convert.cvsps.fuzz=2 --config convert.localtimezone=True src src-hg
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12519
diff changeset
   305
  connecting to $TESTTMP/cvsrepo
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   306
  scanning source...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   307
  collecting CVS rlog
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   308
  11 log entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   309
  cvslog hook: 11 entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   310
  creating changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   311
  8 changeset entries
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   312
  cvschangesets hook: 8 changesets
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   313
  sorting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   314
  converting...
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   315
  2 funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   316
  1 fuzzy
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   317
  0 fuzzy
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 18376
diff changeset
   318
  $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   319
  o  8 (branch) fuzzy date: * -1000 files: b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   320
  |
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   321
  o  7 (branch) fuzzy date: * -1000 files: a (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   322
  |
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   323
  o  6 (branch) funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   324
  |  ----------------------------
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   325
  |  log message date: * -1000 files: a (glob)
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   326
  o  5 (branch) ci2 date: * -1000 files: b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   327
  
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   328
  o  4 () ci1 date: * -1000 files: a b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   329
  |
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   330
  o  3 () update tags date: * +0000 files: .hgtags (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   331
  |
18376
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   332
  | o  2 (INITIAL) import date: * -1000 files: (glob)
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   333
  | |
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents: 18262
diff changeset
   334
  o |  1 () ci0 date: * -1000 files: b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   335
  |/
17974
337d728e644f convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents: 17015
diff changeset
   336
  o  0 () Initial revision date: * -1000 files: a b/c (glob)
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   337
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   338
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   339
testing debugcvsps
6690
127e8c3466d1 convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff changeset
   340
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   341
  $ cd src
26593
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   342
  $ hg debugcvsps --fuzz=2 -x >/dev/null
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   343
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   344
commit a new revision changing a and removing b/c
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   345
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   346
  $ cvscall -q update -A
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   347
  U a
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   348
  U b/c
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   349
  $ sleep 1
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   350
  $ echo h >> a
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   351
  $ cvscall -Q remove -f b/c
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   352
  $ cvscall -q commit -mci | grep '<--'
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   353
  $TESTTMP/cvsrepo/src/a,v  <--  a
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   354
  $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   355
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   356
update and verify the cvsps cache
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   357
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   358
  $ hg debugcvsps --fuzz=2 -u
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   359
  collecting CVS rlog
26593
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   360
  13 log entries
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   361
  cvslog hook: 13 entries
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   362
  creating changesets
26593
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   363
  11 changeset entries
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   364
  cvschangesets hook: 11 changesets
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   365
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   366
  PatchSet 1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   367
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   368
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   369
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   370
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   371
  Branchpoints: INITIAL 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   372
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   373
  Initial revision
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   374
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   375
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   376
  	a:INITIAL->1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   377
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   378
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   379
  PatchSet 2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   380
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   381
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   382
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   383
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   384
  Branchpoints: INITIAL, branch 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   385
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   386
  Initial revision
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   387
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   388
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   389
  	b/c:INITIAL->1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   390
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   391
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   392
  PatchSet 3 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   393
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   394
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   395
  Branch: INITIAL
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   396
  Tag: start 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   397
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   398
  import
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   399
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   400
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   401
  	a:1.1->1.1.1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   402
  	b/c:1.1->1.1.1.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   403
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   404
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   405
  PatchSet 4 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   406
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   407
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   408
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   409
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   410
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   411
  ci0
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   412
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   413
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   414
  	b/c:1.1->1.2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   415
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   416
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   417
  PatchSet 5 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   418
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   419
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   420
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   421
  Tag: (none) 
24305
867c3649be5d cvsps: use a different tiebreaker to avoid flaky test
Augie Fackler <raf@durin42.com>
parents: 23675
diff changeset
   422
  Branchpoints: branch 
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   423
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   424
  ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   425
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   426
  Members: 
24305
867c3649be5d cvsps: use a different tiebreaker to avoid flaky test
Augie Fackler <raf@durin42.com>
parents: 23675
diff changeset
   427
  	a:1.1->1.2 
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   428
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   429
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   430
  PatchSet 6 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   431
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   432
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   433
  Branch: HEAD
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   434
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   435
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   436
  ci1
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   437
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   438
  Members: 
24305
867c3649be5d cvsps: use a different tiebreaker to avoid flaky test
Augie Fackler <raf@durin42.com>
parents: 23675
diff changeset
   439
  	b/c:1.2->1.3 
12519
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   440
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   441
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   442
  PatchSet 7 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   443
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   444
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   445
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   446
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   447
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   448
  ci2
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   449
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   450
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   451
  	b/c:1.1->1.1.2.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   452
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   453
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   454
  PatchSet 8 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   455
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   456
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   457
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   458
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   459
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   460
  funny
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   461
  ----------------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   462
  log message
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   463
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   464
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   465
  	a:1.2->1.2.2.1 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   466
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   467
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   468
  PatchSet 9 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   469
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   470
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   471
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   472
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   473
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   474
  fuzzy
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   475
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   476
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   477
  	a:1.2.2.1->1.2.2.2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   478
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   479
  ---------------------
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   480
  PatchSet 10 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   481
  Date: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   482
  Author: * (glob)
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   483
  Branch: branch
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   484
  Tag: (none) 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   485
  Log:
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   486
  fuzzy
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   487
  
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   488
  Members: 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   489
  	b/c:1.1.2.1->1.1.2.2 
99232aa664d6 tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents: 12153
diff changeset
   490
  
26593
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   491
  ---------------------
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   492
  PatchSet 11 
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   493
  Date: * (glob)
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   494
  Author: * (glob)
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   495
  Branch: HEAD
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   496
  Tag: (none) 
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   497
  Log:
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   498
  ci
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   499
  
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   500
  Members: 
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   501
  	a:1.2->1.3 
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   502
  	b/c:1.3->1.4(DEAD) 
c60dfcc0abf2 cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents: 25571
diff changeset
   503
  
7594
a204547790bc test: added testcase for cvsps log message lookahead
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents: 7503
diff changeset
   504
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   505
  $ cd ..
33388
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   506
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   507
Test transcoding CVS log messages (issue5597)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   508
=============================================
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   509
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   510
To emulate commit messages in (non-ascii) multiple encodings portably,
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   511
this test scenario writes CVS history file (*,v file) directly via
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   512
python code.
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   513
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   514
Commit messages of version 1.2 - 1.4 use u3042 in 3 encodings below.
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   515
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   516
|encoding  |byte sequence | decodable as:      |
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   517
|          |              | utf-8 euc-jp cp932 |
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   518
+----------+--------------+--------------------+
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   519
|utf-8     |\xe3\x81\x82  |  o      x     x    |
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   520
|euc-jp    |\xa4\xa2      |  x      o     o    |
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   521
|cp932     |\x82\xa0      |  x      x     o    |
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   522
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   523
  $ mkdir -p cvsrepo/transcoding
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   524
  $ python <<EOF
37934
cf76642cb2bb tests: b prefixes on some inline python in test-convert-cvs.t
Augie Fackler <augie@google.com>
parents: 37929
diff changeset
   525
  > fp = open('cvsrepo/transcoding/file,v', 'wb')
cf76642cb2bb tests: b prefixes on some inline python in test-convert-cvs.t
Augie Fackler <augie@google.com>
parents: 37929
diff changeset
   526
  > fp.write((b'''
33388
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   527
  > head	1.4;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   528
  > access;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   529
  > symbols
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   530
  > 	start:1.1.1.1 INITIAL:1.1.1;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   531
  > locks; strict;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   532
  > comment	@# @;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   533
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   534
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   535
  > 1.4
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   536
  > date	2017.07.10.00.00.04;	author nobody;	state Exp;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   537
  > branches;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   538
  > next	1.3;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   539
  > commitid	10059635D016A510FFA;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   540
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   541
  > 1.3
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   542
  > date	2017.07.10.00.00.03;	author nobody;	state Exp;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   543
  > branches;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   544
  > next	1.2;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   545
  > commitid	10059635CFF6A4FF34E;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   546
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   547
  > 1.2
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   548
  > date	2017.07.10.00.00.02;	author nobody;	state Exp;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   549
  > branches;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   550
  > next	1.1;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   551
  > commitid	10059635CFD6A4D5095;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   552
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   553
  > 1.1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   554
  > date	2017.07.10.00.00.01;	author nobody;	state Exp;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   555
  > branches
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   556
  > 	1.1.1.1;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   557
  > next	;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   558
  > commitid	10059635CFB6A4A3C33;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   559
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   560
  > 1.1.1.1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   561
  > date	2017.07.10.00.00.01;	author nobody;	state Exp;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   562
  > branches;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   563
  > next	;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   564
  > commitid	10059635CFB6A4A3C33;
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   565
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   566
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   567
  > desc
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   568
  > @@
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   569
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   570
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   571
  > 1.4
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   572
  > log
37934
cf76642cb2bb tests: b prefixes on some inline python in test-convert-cvs.t
Augie Fackler <augie@google.com>
parents: 37929
diff changeset
   573
  > @''' + u'\u3042'.encode('cp932') + b''' (cp932)
33388
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   574
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   575
  > text
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   576
  > @1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   577
  > 2
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   578
  > 3
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   579
  > 4
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   580
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   581
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   582
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   583
  > 1.3
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   584
  > log
37934
cf76642cb2bb tests: b prefixes on some inline python in test-convert-cvs.t
Augie Fackler <augie@google.com>
parents: 37929
diff changeset
   585
  > @''' + u'\u3042'.encode('euc-jp') + b''' (euc-jp)
33388
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   586
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   587
  > text
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   588
  > @d4 1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   589
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   590
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   591
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   592
  > 1.2
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   593
  > log
37934
cf76642cb2bb tests: b prefixes on some inline python in test-convert-cvs.t
Augie Fackler <augie@google.com>
parents: 37929
diff changeset
   594
  > @''' + u'\u3042'.encode('utf-8') +  b''' (utf-8)
33388
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   595
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   596
  > text
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   597
  > @d3 1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   598
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   599
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   600
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   601
  > 1.1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   602
  > log
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   603
  > @Initial revision
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   604
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   605
  > text
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   606
  > @d2 1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   607
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   608
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   609
  > 
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   610
  > 1.1.1.1
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   611
  > log
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   612
  > @import
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   613
  > @
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   614
  > text
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   615
  > @@
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   616
  > ''').lstrip())
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   617
  > EOF
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   618
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   619
  $ cvscall -q checkout transcoding
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   620
  U transcoding/file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   621
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   622
Test converting in normal case
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   623
------------------------------
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   624
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   625
(filtering by grep in order to check only form of debug messages)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   626
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   627
  $ hg convert --config convert.cvsps.logencoding=utf-8,euc-jp,cp932 -q --debug transcoding transcoding-hg | grep 'transcoding by'
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   628
  transcoding by utf-8: 1.1 of file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   629
  transcoding by utf-8: 1.1.1.1 of file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   630
  transcoding by utf-8: 1.2 of file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   631
  transcoding by euc-jp: 1.3 of file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   632
  transcoding by cp932: 1.4 of file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   633
  $ hg -R transcoding-hg --encoding utf-8 log -T "{rev}: {desc}\n"
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   634
  5: update tags
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   635
  4: import
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   636
  3: \xe3\x81\x82 (cp932) (esc)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   637
  2: \xe3\x81\x82 (euc-jp) (esc)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   638
  1: \xe3\x81\x82 (utf-8) (esc)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   639
  0: Initial revision
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   640
  $ rm -rf transcoding-hg
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   641
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   642
Test converting in error cases
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   643
------------------------------
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   644
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   645
unknown encoding in convert.cvsps.logencoding
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   646
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   647
  $ hg convert --config convert.cvsps.logencoding=foobar -q transcoding transcoding-hg
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   648
  abort: unknown encoding: foobar
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   649
  (check convert.cvsps.logencoding configuration)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   650
  [255]
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   651
  $ rm -rf transcoding-hg
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   652
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   653
no acceptable encoding in convert.cvsps.logencoding
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   654
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   655
  $ hg convert --config convert.cvsps.logencoding=utf-8,euc-jp -q transcoding transcoding-hg
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   656
  abort: no encoding can transcode CVS log message for 1.4 of file
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   657
  (check convert.cvsps.logencoding configuration)
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   658
  [255]
0823f0983eaa convert: transcode CVS log messages by specified encoding (issue5597)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26594
diff changeset
   659
  $ rm -rf transcoding-hg