tests/test-largefiles.t
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Tue, 17 Jul 2012 17:59:29 +0200
changeset 17214 738ad56dd8a6
parent 17092 5d0d99952494
child 17229 a6d9b2d33040
permissions -rw-r--r--
checkheads: take future obsoleted heads into account If we push some successors they will likely create a new head on remote. However as the obsoleted head will disappear after the push we are not really increasing the number of heads. There is several case which will lead to extra being actually pushed. But this first changeset aims to be simple. See the inline comment for details. Without this change, you need to push --force every time you want to push a newer version which is very error prone. The remote side still display +n heads on unbundle because it does not have the obsolete marker at unbundle time.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17088
31f7dd50ed40 test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
     1
  $ USERCACHE="$TESTTMP/cache"; export USERCACHE
17092
5d0d99952494 tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents: 17089
diff changeset
     2
  $ mkdir "${USERCACHE}"
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
     3
  $ cat >> $HGRCPATH <<EOF
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
     4
  > [extensions]
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
     5
  > largefiles=
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
     6
  > purge=
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
     7
  > rebase=
15383
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
     8
  > transplant=
15742
65df60a3f96b phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15630
diff changeset
     9
  > [phases]
65df60a3f96b phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15630
diff changeset
    10
  > publish=False
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
    11
  > [largefiles]
15304
9aa9d4bb3d88 largefiles: rename config setting 'size' to 'minsize'
Greg Ward <greg@gerg.ca>
parents: 15303
diff changeset
    12
  > minsize=2
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
    13
  > patterns=glob:**.dat
15778
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
    14
  > usercache=${USERCACHE}
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    15
  > [hooks]
17088
31f7dd50ed40 test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
    16
  > precommit=sh -c "echo \"Invoking status precommit hook\"; hg status"
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    17
  > EOF
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    18
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    19
Create the repo with a couple of revisions of both large and normal
15787
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    20
files, testing that status correctly shows largefiles and that summary output
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    21
is correct.
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    23
  $ hg init a
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    24
  $ cd a
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    25
  $ mkdir sub
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    26
  $ echo normal1 > normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    27
  $ echo normal2 > sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    28
  $ echo large1 > large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    29
  $ echo large2 > sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    30
  $ hg add normal1 sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    31
  $ hg add --large large1 sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    32
  $ hg commit -m "add files"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    33
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    34
  A large1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    35
  A normal1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    36
  A sub/large2
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    37
  A sub/normal2
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    38
  $ echo normal11 > normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    39
  $ echo normal22 > sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    40
  $ echo large11 > large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    41
  $ echo large22 > sub/large2
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    42
  $ hg commit -m "edit files"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    43
  Invoking status precommit hook
15225
b450a4d427ef largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents: 15216
diff changeset
    44
  M large1
b450a4d427ef largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents: 15216
diff changeset
    45
  M normal1
b450a4d427ef largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents: 15216
diff changeset
    46
  M sub/large2
b450a4d427ef largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents: 15216
diff changeset
    47
  M sub/normal2
15787
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    48
  $ hg sum --large
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    49
  parent: 1:ce8896473775 tip
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    50
   edit files
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    51
  branch: default
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    52
  commit: (clean)
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    53
  update: (current)
0c7b83a057aa largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15786
diff changeset
    54
  largefiles: No remote repo
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    55
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
    56
Commit preserved largefile contents.
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    57
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    58
  $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    59
  normal11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    60
  $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    61
  large11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    62
  $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    63
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    64
  $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    65
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    66
16586
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    67
Test status, subdir and unknown files
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    68
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    69
  $ echo unknown > sub/unknown
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    70
  $ hg st --all
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    71
  ? sub/unknown
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    72
  C large1
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    73
  C normal1
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    74
  C sub/large2
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    75
  C sub/normal2
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    76
  $ hg st --all sub
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    77
  ? sub/unknown
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    78
  C sub/large2
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    79
  C sub/normal2
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    80
  $ rm sub/unknown
ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents: 16541
diff changeset
    81
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
    82
Remove both largefiles and normal files.
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    83
 
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    84
  $ hg remove normal1 large1
16281
d8cc67114dc3 largefiles: suppress unexpected warning of 'hg status' for removed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16141
diff changeset
    85
  $ hg status large1
d8cc67114dc3 largefiles: suppress unexpected warning of 'hg status' for removed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16141
diff changeset
    86
  R large1
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    87
  $ hg commit -m "remove files"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    88
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    89
  R large1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
    90
  R normal1
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    91
  $ ls
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
    92
  sub
15786
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    93
  $ echo "testlargefile" > large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    94
  $ hg add --large large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    95
  $ hg st
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    96
  A large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    97
  $ hg rm large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    98
  not removing large1-test: file has been marked for add (use forget to undo)
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
    99
  $ hg st
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
   100
  A large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
   101
  $ hg forget large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
   102
  $ hg st
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
   103
  ? large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15629
diff changeset
   104
  $ rm large1-test
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   105
15598
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   106
Copy both largefiles and normal files (testing that status output is correct).
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   107
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   108
  $ hg cp sub/normal2 normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   109
  $ hg cp sub/large2 large1
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   110
  $ hg commit -m "copy files"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   111
  Invoking status precommit hook
15598
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   112
  A large1
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   113
  A normal1
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   114
  $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   115
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   116
  $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   117
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   118
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   119
Test moving largefiles and verify that normal files are also unaffected.
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   120
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   121
  $ hg mv normal1 normal3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   122
  $ hg mv large1 large3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   123
  $ hg mv sub/normal2 sub/normal4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   124
  $ hg mv sub/large2 sub/large4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   125
  $ hg commit -m "move files"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   126
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   127
  A large3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   128
  A normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   129
  A sub/large4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   130
  A sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   131
  R large1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   132
  R normal1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   133
  R sub/large2
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   134
  R sub/normal2
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   135
  $ cat normal3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   136
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   137
  $ cat large3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   138
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   139
  $ cat sub/normal4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   140
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   141
  $ cat sub/large4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   142
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   143
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   144
#if hgweb
16449
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   145
Test display of largefiles in hgweb
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   146
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   147
  $ hg serve -d -p $HGPORT --pid-file ../hg.pid
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   148
  $ cat ../hg.pid >> $DAEMON_PIDS
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16986
diff changeset
   149
  $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
16449
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   150
  200 Script output follows
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   151
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   152
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   153
  drwxr-xr-x sub
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   154
  -rw-r--r-- 41 large3
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   155
  -rw-r--r-- 9 normal3
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   156
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   157
  
17017
953faba28e91 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 16986
diff changeset
   158
  $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
16449
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   159
  200 Script output follows
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   160
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   161
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   162
  -rw-r--r-- 41 large4
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   163
  -rw-r--r-- 9 normal4
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   164
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   165
  
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   166
  $ "$TESTDIR/killdaemons.py"
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   167
#endif
16449
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents: 16439
diff changeset
   168
15216
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   169
Test archiving the various revisions.  These hit corner cases known with
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   170
archiving.
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   171
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   172
  $ hg archive -r 0 ../archive0
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   173
  $ hg archive -r 1 ../archive1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   174
  $ hg archive -r 2 ../archive2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   175
  $ hg archive -r 3 ../archive3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   176
  $ hg archive -r 4 ../archive4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   177
  $ cd ../archive0
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   178
  $ cat normal1 
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   179
  normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   180
  $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   181
  large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   182
  $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   183
  normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   184
  $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   185
  large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   186
  $ cd ../archive1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   187
  $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   188
  normal11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   189
  $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   190
  large11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   191
  $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   192
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   193
  $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   194
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   195
  $ cd ../archive2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   196
  $ ls
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   197
  sub
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   198
  $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   199
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   200
  $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   201
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   202
  $ cd ../archive3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   203
  $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   204
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   205
  $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   206
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   207
  $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   208
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   209
  $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   210
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   211
  $ cd ../archive4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   212
  $ cat normal3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   213
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   214
  $ cat large3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   215
  large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   216
  $ cat sub/normal4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   217
  normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   218
  $ cat sub/large4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff changeset
   219
  large22
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   220
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   221
Commit corner case: specify files to commit.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   222
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   223
  $ cd ../a
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   224
  $ echo normal3 > normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   225
  $ echo large3 > large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   226
  $ echo normal4 > sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   227
  $ echo large4 > sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   228
  $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   229
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   230
  M large3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   231
  M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   232
  M sub/large4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   233
  M sub/normal4
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   234
  $ cat normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   235
  normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   236
  $ cat large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   237
  large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   238
  $ cat sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   239
  normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   240
  $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   241
  large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   242
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   243
One more commit corner case: commit from a subdirectory.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   244
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   245
  $ cd ../a
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   246
  $ echo normal33 > normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   247
  $ echo large33 > large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   248
  $ echo normal44 > sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   249
  $ echo large44 > sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   250
  $ cd sub
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   251
  $ hg commit -m "edit files yet again"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   252
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   253
  M large3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   254
  M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   255
  M sub/large4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   256
  M sub/normal4
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   257
  $ cat ../normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   258
  normal33
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   259
  $ cat ../large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   260
  large33
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   261
  $ cat normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   262
  normal44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   263
  $ cat large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   264
  large44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   265
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   266
Committing standins is not allowed.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   267
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   268
  $ cd ..
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   269
  $ echo large3 > large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   270
  $ hg commit .hglf/large3 -m "try to commit standin"
15253
67d010779907 largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents: 15251
diff changeset
   271
  abort: file ".hglf/large3" is a largefile standin
67d010779907 largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents: 15251
diff changeset
   272
  (commit the largefile itself instead)
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   273
  [255]
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   274
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   275
Corner cases for adding largefiles.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   276
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   277
  $ echo large5 > large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   278
  $ hg add --large large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   279
  $ hg add --large large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   280
  large5 already a largefile
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   281
  $ mkdir sub2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   282
  $ echo large6 > sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   283
  $ echo large7 > sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   284
  $ hg add --large sub2
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   285
  adding sub2/large6 as a largefile (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   286
  adding sub2/large7 as a largefile (glob)
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   287
  $ hg st
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   288
  M large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   289
  A large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   290
  A sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   291
  A sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   292
16282
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   293
Test "hg status" with combination of 'file pattern' and 'directory
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   294
pattern' for largefiles:
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   295
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   296
  $ hg status sub2/large6 sub2
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   297
  A sub2/large6
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   298
  A sub2/large7
50247a7a9983 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16281
diff changeset
   299
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   300
Config settings (pattern **.dat, minsize 2 MB) are respected.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   301
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   302
  $ echo testdata > test.dat
15330
1e6fcce4aab3 largefiles: use smaller files in test script
Greg Ward <greg@gerg.ca>
parents: 15329
diff changeset
   303
  $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   304
  $ hg add
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   305
  adding reallylarge as a largefile
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   306
  adding test.dat as a largefile
15329
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   307
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   308
Test that minsize and --lfsize handle float values;
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   309
also tests that --lfsize overrides largefiles.minsize.
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   310
(0.250 MB = 256 kB = 262144 B)
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   311
15329
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   312
  $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   313
  $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   314
  $ hg --config largefiles.minsize=.25 add
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   315
  adding ratherlarge as a largefile
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   316
  adding medium
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   317
  $ hg forget medium
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   318
  $ hg --config largefiles.minsize=.25 add --lfsize=.125
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   319
  adding medium as a largefile
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   320
  $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   321
  $ hg --config largefiles.minsize=.25 add --lfsize=.125
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   322
  adding notlarge
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   323
  $ hg forget notlarge
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   324
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   325
Test forget on largefiles.
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   326
15329
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   327
  $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   328
  $ hg commit -m "add/edit more largefiles"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   329
  Invoking status precommit hook
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   330
  A sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   331
  A sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   332
  R large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   333
  ? large5
15329
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   334
  ? medium
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   335
  ? notlarge
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   336
  ? ratherlarge
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   337
  ? reallylarge
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   338
  ? test.dat
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   339
  $ hg st
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   340
  ? large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   341
  ? large5
15329
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   342
  ? medium
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   343
  ? notlarge
944f9b7cfe4e largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents: 15328
diff changeset
   344
  ? ratherlarge
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   345
  ? reallylarge
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   346
  ? test.dat
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   347
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   348
Purge with largefiles: verify that largefiles are still in the working
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   349
dir after a purge.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   350
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   351
  $ hg purge --all
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   352
  $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   353
  large44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   354
  $ cat sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   355
  large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   356
  $ cat sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   357
  large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   358
15792
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   359
Test addremove: verify that files that should be added as largfiles are added as
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   360
such and that already-existing largfiles are not added as normal files by
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   361
accident.
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   362
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   363
  $ rm normal3
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   364
  $ rm sub/large4
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   365
  $ echo "testing addremove with patterns" > testaddremove.dat
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   366
  $ echo "normaladdremove" > normaladdremove
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   367
  $ hg addremove
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   368
  removing sub/large4
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   369
  adding testaddremove.dat as a largefile
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   370
  removing normal3
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   371
  adding normaladdremove
7cbba3adabc7 largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15788
diff changeset
   372
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   373
Clone a largefiles repo.
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   374
15548
f76584098c88 largefiles: fix 'hg clone . ../foo' OSError abort
Martin Geisler <mg@lazybytes.net>
parents: 15384
diff changeset
   375
  $ hg clone . ../b
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   376
  updating to branch default
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   377
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   378
  getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   379
  3 largefiles updated, 0 removed
15548
f76584098c88 largefiles: fix 'hg clone . ../foo' OSError abort
Martin Geisler <mg@lazybytes.net>
parents: 15384
diff changeset
   380
  $ cd ../b
15384
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   381
  $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   382
  7:daea875e9014  add/edit more largefiles
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   383
  6:4355d653f84f  edit files yet again
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   384
  5:9d5af5072dbd  edit files again
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   385
  4:74c02385b94c  move files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   386
  3:9e8fbc4bce62  copy files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   387
  2:51a0ae4d5864  remove files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   388
  1:ce8896473775  edit files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   389
  0:30d30fe6a5be  add files
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   390
  $ cat normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   391
  normal33
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   392
  $ cat sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   393
  normal44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   394
  $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   395
  large44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   396
  $ cat sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   397
  large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   398
  $ cat sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   399
  large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   400
  $ cd ..
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   401
  $ hg clone a -r 3 c
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   402
  adding changesets
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   403
  adding manifests
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   404
  adding file changes
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   405
  added 4 changesets with 10 changes to 4 files
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   406
  updating to branch default
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   407
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   408
  getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   409
  2 largefiles updated, 0 removed
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   410
  $ cd c
15384
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   411
  $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   412
  3:9e8fbc4bce62  copy files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   413
  2:51a0ae4d5864  remove files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   414
  1:ce8896473775  edit files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   415
  0:30d30fe6a5be  add files
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   416
  $ cat normal1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   417
  normal22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   418
  $ cat large1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   419
  large22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   420
  $ cat sub/normal2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   421
  normal22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   422
  $ cat sub/large2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   423
  large22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   424
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   425
Old revisions of a clone have correct largefiles content (this also
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   426
tests update).
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   427
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   428
  $ hg update -r 1 
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   429
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   430
  getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   431
  1 largefiles updated, 0 removed
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   432
  $ cat large1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   433
  large11
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   434
  $ cat sub/large2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   435
  large22
16644
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   436
  $ cd ..
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   437
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   438
Test cloning with --all-largefiles flag
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   439
17092
5d0d99952494 tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents: 17089
diff changeset
   440
  $ rm "${USERCACHE}"/*
16644
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   441
  $ hg clone --all-largefiles a a-backup
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   442
  updating to branch default
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   443
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   444
  getting changed largefiles
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   445
  3 largefiles updated, 0 removed
98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16603
diff changeset
   446
  8 additional largefiles cached
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   447
16723
68da5ae6e470 largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents: 16692
diff changeset
   448
  $ hg clone --all-largefiles a ssh://localhost/a
68da5ae6e470 largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents: 16692
diff changeset
   449
  abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
68da5ae6e470 largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents: 16692
diff changeset
   450
  [255]
68da5ae6e470 largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents: 16692
diff changeset
   451
16692
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   452
Test pulling with --all-largefiles flag
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   453
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   454
  $ rm -Rf a-backup
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   455
  $ hg clone -r 1 a a-backup
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   456
  adding changesets
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   457
  adding manifests
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   458
  adding file changes
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   459
  added 2 changesets with 8 changes to 4 files
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   460
  updating to branch default
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   461
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   462
  getting changed largefiles
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   463
  2 largefiles updated, 0 removed
17092
5d0d99952494 tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents: 17089
diff changeset
   464
  $ rm "${USERCACHE}"/*
16692
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   465
  $ cd a-backup
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   466
  $ hg pull --all-largefiles
17088
31f7dd50ed40 test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
   467
  pulling from $TESTTMP/a (glob)
16692
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   468
  searching for changes
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   469
  adding changesets
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   470
  adding manifests
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   471
  adding file changes
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   472
  added 6 changesets with 16 changes to 8 files
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   473
  (run 'hg update' to get a working copy)
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   474
  caching new largefiles
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   475
  3 largefiles cached
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   476
  3 additional largefiles cached
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   477
  $ cd ..
b9969574540a largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents: 16644
diff changeset
   478
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   479
Rebasing between two repositories does not revert largefiles to old
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   480
revisions (this was a very bad bug that took a lot of work to fix).
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   481
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   482
  $ hg clone a d
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   483
  updating to branch default
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   484
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   485
  getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   486
  3 largefiles updated, 0 removed
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   487
  $ cd b
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   488
  $ echo large4-modified > sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   489
  $ echo normal3-modified > normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   490
  $ hg commit -m "modify normal file and largefile in repo b"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   491
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   492
  M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   493
  M sub/large4
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   494
  $ cd ../d
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   495
  $ echo large6-modified > sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   496
  $ echo normal4-modified > sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   497
  $ hg commit -m "modify normal file largefile in repo d"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   498
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   499
  M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   500
  M sub2/large6
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   501
  $ cd ..
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   502
  $ hg clone d e
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   503
  updating to branch default
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   504
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   505
  getting changed largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   506
  3 largefiles updated, 0 removed
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   507
  $ cd d
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   508
  $ hg pull --rebase ../b
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   509
  pulling from ../b
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   510
  searching for changes
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   511
  adding changesets
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   512
  adding manifests
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   513
  adding file changes
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   514
  added 1 changesets with 2 changes to 2 files (+1 heads)
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   515
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   516
  M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   517
  M sub2/large6
16900
3f1a153daadb tests: glob the remaining 'saved backup bundle to' to prepare for windows
Mads Kiilerich <mads@kiilerich.com>
parents: 16723
diff changeset
   518
  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   519
  nothing to rebase
15384
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   520
  $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   521
  9:598410d3eb9a  modify normal file largefile in repo d
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   522
  8:a381d2c8c80e  modify normal file and largefile in repo b
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   523
  7:daea875e9014  add/edit more largefiles
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   524
  6:4355d653f84f  edit files yet again
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   525
  5:9d5af5072dbd  edit files again
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   526
  4:74c02385b94c  move files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   527
  3:9e8fbc4bce62  copy files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   528
  2:51a0ae4d5864  remove files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   529
  1:ce8896473775  edit files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   530
  0:30d30fe6a5be  add files
15251
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   531
  $ cat normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   532
  normal3-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   533
  $ cat sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   534
  normal4-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   535
  $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   536
  large4-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   537
  $ cat sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   538
  large6-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   539
  $ cat sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents: 15225
diff changeset
   540
  large7
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   541
  $ cd ../e
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   542
  $ hg pull ../b
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   543
  pulling from ../b
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   544
  searching for changes
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   545
  adding changesets
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   546
  adding manifests
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   547
  adding file changes
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   548
  added 1 changesets with 2 changes to 2 files (+1 heads)
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   549
  (run 'hg heads' to see heads, 'hg merge' to merge)
15916
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   550
  caching new largefiles
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   551
  0 largefiles cached
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   552
  $ hg rebase
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   553
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   554
  M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   555
  M sub2/large6
16900
3f1a153daadb tests: glob the remaining 'saved backup bundle to' to prepare for windows
Mads Kiilerich <mads@kiilerich.com>
parents: 16723
diff changeset
   556
  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
15784
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   557
  $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   558
  9:598410d3eb9a  modify normal file largefile in repo d
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   559
  8:a381d2c8c80e  modify normal file and largefile in repo b
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   560
  7:daea875e9014  add/edit more largefiles
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   561
  6:4355d653f84f  edit files yet again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   562
  5:9d5af5072dbd  edit files again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   563
  4:74c02385b94c  move files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   564
  3:9e8fbc4bce62  copy files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   565
  2:51a0ae4d5864  remove files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   566
  1:ce8896473775  edit files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   567
  0:30d30fe6a5be  add files
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   568
  $ cat normal3
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   569
  normal3-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   570
  $ cat sub/normal4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   571
  normal4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   572
  $ cat sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   573
  large4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   574
  $ cat sub2/large6
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   575
  large6-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   576
  $ cat sub2/large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   577
  large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   578
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   579
Rollback on largefiles.
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   580
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   581
  $ echo large4-modified-again > sub/large4 
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   582
  $ hg commit -m "Modify large4 again"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   583
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   584
  M sub/large4
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   585
  $ hg rollback
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   586
  repository tip rolled back to revision 9 (undo commit)
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   587
  working directory now based on revision 9
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   588
  $ hg st
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   589
  M sub/large4
15784
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   590
  $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   591
  9:598410d3eb9a  modify normal file largefile in repo d
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   592
  8:a381d2c8c80e  modify normal file and largefile in repo b
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   593
  7:daea875e9014  add/edit more largefiles
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   594
  6:4355d653f84f  edit files yet again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   595
  5:9d5af5072dbd  edit files again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   596
  4:74c02385b94c  move files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   597
  3:9e8fbc4bce62  copy files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   598
  2:51a0ae4d5864  remove files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   599
  1:ce8896473775  edit files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere
Na'Tosha Bard <natosha@unity3d.com>
parents: 15778
diff changeset
   600
  0:30d30fe6a5be  add files
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   601
  $ cat sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   602
  large4-modified-again
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   603
15365
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   604
"update --check" refuses to update with uncommitted changes.
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   605
  $ hg update --check 8
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   606
  abort: uncommitted local changes
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   607
  [255]
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   608
15328
9b4ab5f7ad2a largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents: 15318
diff changeset
   609
"update --clean" leaves correct largefiles in working copy.
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   610
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   611
  $ hg update --clean 
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   612
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   613
  getting changed largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   614
  1 largefiles updated, 0 removed
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   615
  $ cat normal3
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   616
  normal3-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   617
  $ cat sub/normal4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   618
  normal4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   619
  $ cat sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   620
  large4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   621
  $ cat sub2/large6
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   622
  large6-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   623
  $ cat sub2/large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   624
  large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   625
15365
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   626
Now "update check" is happy.
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   627
  $ hg update --check 8
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   628
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   629
  getting changed largefiles
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   630
  1 largefiles updated, 0 removed
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   631
  $ hg update --check
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   632
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   633
  getting changed largefiles
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   634
  1 largefiles updated, 0 removed
ca1412c15efe largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents: 15338
diff changeset
   635
15900
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   636
Test removing empty largefiles directories on update
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   637
  $ test -d sub2 && echo "sub2 exists"
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   638
  sub2 exists
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   639
  $ hg update -q null
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   640
  $ test -d sub2 && echo "error: sub2 should not exist anymore"
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   641
  [1]
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   642
  $ hg update -q
29defa7d20f6 largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents: 15787
diff changeset
   643
15930
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   644
Test hg remove removes empty largefiles directories
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   645
  $ test -d sub2 && echo "sub2 exists"
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   646
  sub2 exists
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   647
  $ hg remove sub2/*
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   648
  $ test -d sub2 && echo "error: sub2 should not exist anymore"
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   649
  [1]
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   650
  $ hg revert sub2/large6 sub2/large7
2dc599583ebe largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents: 15916
diff changeset
   651
15366
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   652
"revert" works on largefiles (and normal files too).
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   653
  $ echo hack3 >> normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   654
  $ echo hack4 >> sub/normal4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   655
  $ echo hack4 >> sub/large4
15983
32b9aee3602c largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15982
diff changeset
   656
  $ rm sub2/large6
32b9aee3602c largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15982
diff changeset
   657
  $ hg revert sub2/large6
15366
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   658
  $ hg rm sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   659
  $ echo new >> sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   660
  $ hg add --large sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   661
# XXX we don't really want to report that we're reverting the standin;
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   662
# that's just an implementation detail. But I don't see an obvious fix. ;-(
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   663
  $ hg revert sub
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   664
  reverting .hglf/sub/large4 (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   665
  reverting sub/normal4 (glob)
15366
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   666
  $ hg status
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   667
  M normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   668
  A sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   669
  R sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   670
  ? sub/large4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   671
  ? sub/normal4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   672
  $ cat sub/normal4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   673
  normal4-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   674
  $ cat sub/large4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   675
  large4-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   676
  $ hg revert -a --no-backup
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   677
  undeleting .hglf/sub2/large6 (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   678
  forgetting .hglf/sub2/large8 (glob)
15366
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   679
  reverting normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   680
  $ hg status
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   681
  ? sub/large4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   682
  ? sub/normal4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   683
  ? sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   684
  $ cat normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   685
  normal3-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   686
  $ cat sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   687
  large6-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   688
  $ rm sub/*.orig sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   689
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   690
revert some files to an older revision
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   691
  $ hg revert --no-backup -r 8 sub2
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   692
  reverting .hglf/sub2/large6 (glob)
15366
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   693
  $ cat sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   694
  large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   695
  $ hg revert --no-backup sub2
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
   696
  reverting .hglf/sub2/large6 (glob)
15366
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   697
  $ hg status
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents: 15365
diff changeset
   698
15370
8af6c6d91c92 largefiles: fix typo
Eli Carter <eli.carter@tektronix.com>
parents: 15369
diff changeset
   699
"verify --large" actually verifies largefiles
15297
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   700
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   701
  $ hg verify --large
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   702
  checking changesets
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   703
  checking manifests
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   704
  crosschecking files in changesets and manifests
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   705
  checking files
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   706
  10 files, 10 changesets, 28 total revisions
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   707
  searching 1 changesets for largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15253
diff changeset
   708
  verified existence of 3 revisions of 3 largefiles
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   709
15916
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   710
Merging does not revert to old versions of largefiles and also check
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   711
that merging after having pulled from a non-default remote works
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   712
correctly.
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   713
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   714
  $ cd ..
15916
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   715
  $ hg clone -r 7 e temp
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   716
  adding changesets
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   717
  adding manifests
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   718
  adding file changes
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   719
  added 8 changesets with 24 changes to 10 files
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   720
  updating to branch default
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   721
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   722
  getting changed largefiles
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   723
  3 largefiles updated, 0 removed
15916
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   724
  $ hg clone temp f
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   725
  updating to branch default
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   726
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   727
  getting changed largefiles
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   728
  3 largefiles updated, 0 removed
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   729
# Delete the largefiles in the largefiles system cache so that we have an
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   730
# opportunity to test that caching after a pull works.
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   731
  $ rm "${USERCACHE}"/*
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   732
  $ cd f
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   733
  $ echo "large4-merge-test" > sub/large4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   734
  $ hg commit -m "Modify large4 to test merge"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   735
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   736
  M sub/large4
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   737
  $ hg pull ../e
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   738
  pulling from ../e
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   739
  searching for changes
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   740
  adding changesets
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   741
  adding manifests
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   742
  adding file changes
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   743
  added 2 changesets with 4 changes to 4 files (+1 heads)
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   744
  (run 'hg heads' to see heads, 'hg merge' to merge)
15916
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   745
  caching new largefiles
c96148346af8 largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents: 15909
diff changeset
   746
  2 largefiles cached
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   747
  $ hg merge
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   748
  merging sub/large4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   749
  largefile sub/large4 has a merge conflict
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   750
  keep (l)ocal or take (o)ther? l
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   751
  3 files updated, 1 files merged, 0 files removed, 0 files unresolved
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   752
  (branch merge, don't forget to commit)
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   753
  getting changed largefiles
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   754
  1 largefiles updated, 0 removed
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   755
  $ hg commit -m "Merge repos e and f"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   756
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   757
  M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   758
  M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   759
  M sub2/large6
15298
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   760
  $ cat normal3
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   761
  normal3-modified
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   762
  $ cat sub/normal4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   763
  normal4-modified
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   764
  $ cat sub/large4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   765
  large4-merge-test
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   766
  $ cat sub2/large6
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   767
  large6-modified
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   768
  $ cat sub2/large7
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents: 15297
diff changeset
   769
  large7
15382
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   770
15629
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   771
Test status after merging with a branch that introduces a new largefile:
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   772
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   773
  $ echo large > large
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   774
  $ hg add --large large
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   775
  $ hg commit -m 'add largefile'
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   776
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   777
  A large
15629
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   778
  $ hg update -q ".^"
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   779
  $ echo change >> normal3
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   780
  $ hg commit -m 'some change'
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   781
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   782
  M normal3
15629
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   783
  created new head
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   784
  $ hg merge
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   785
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   786
  (branch merge, don't forget to commit)
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   787
  getting changed largefiles
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   788
  1 largefiles updated, 0 removed
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   789
  $ hg status
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   790
  M large
5b66e55c0d93 largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents: 15598
diff changeset
   791
15382
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   792
Test that a normal file and a largefile with the same name and path cannot
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   793
coexist.
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   794
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   795
  $ rm sub2/large7
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   796
  $ echo "largeasnormal" > sub2/large7
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   797
  $ hg add sub2/large7
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file
Na'Tosha Bard <natosha@unity3d.com>
parents: 15378
diff changeset
   798
  sub2/large7 already a largefile
15383
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   799
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   800
Test that transplanting a largefile change works correctly.
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   801
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   802
  $ cd ..
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   803
  $ hg clone -r 8 d g
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   804
  adding changesets
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   805
  adding manifests
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   806
  adding file changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   807
  added 9 changesets with 26 changes to 10 files
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   808
  updating to branch default
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   809
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   810
  getting changed largefiles
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   811
  3 largefiles updated, 0 removed
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   812
  $ cd g
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   813
  $ hg transplant -s ../d 598410d3eb9a 
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   814
  searching for changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   815
  searching for changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   816
  adding changesets
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   817
  adding manifests
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   818
  adding file changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   819
  added 1 changesets with 2 changes to 2 files
16246
169525f8ffbb largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents: 16141
diff changeset
   820
  getting changed largefiles
169525f8ffbb largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents: 16141
diff changeset
   821
  1 largefiles updated, 0 removed
15384
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   822
  $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   823
  9:598410d3eb9a  modify normal file largefile in repo d
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   824
  8:a381d2c8c80e  modify normal file and largefile in repo b
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   825
  7:daea875e9014  add/edit more largefiles
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   826
  6:4355d653f84f  edit files yet again
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   827
  5:9d5af5072dbd  edit files again
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   828
  4:74c02385b94c  move files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   829
  3:9e8fbc4bce62  copy files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   830
  2:51a0ae4d5864  remove files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   831
  1:ce8896473775  edit files
bf55991af17e largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents: 15383
diff changeset
   832
  0:30d30fe6a5be  add files
15383
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   833
  $ cat normal3
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   834
  normal3-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   835
  $ cat sub/normal4
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   836
  normal4-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   837
  $ cat sub/large4
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   838
  large4-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   839
  $ cat sub2/large6
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   840
  large6-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   841
  $ cat sub2/large7
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com>
parents: 15382
diff changeset
   842
  large7
15598
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   843
16439
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   844
Cat a largefile
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   845
  $ hg cat normal3
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   846
  normal3-modified
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   847
  $ hg cat sub/large4
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   848
  large4-modified
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   849
  $ rm "${USERCACHE}"/*
16439
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   850
  $ hg cat -r a381d2c8c80e -o cat.out sub/large4
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   851
  $ cat cat.out
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   852
  large4-modified
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   853
  $ rm cat.out
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   854
  $ hg cat -r a381d2c8c80e normal3
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   855
  normal3-modified
290850e7aa43 largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents: 16351
diff changeset
   856
15598
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   857
Test that renaming a largefile results in correct output for status
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   858
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   859
  $ hg rename sub/large4 large4-renamed
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   860
  $ hg commit -m "test rename output"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   861
  Invoking status precommit hook
15598
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   862
  A large4-renamed
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   863
  R sub/large4
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   864
  $ cat large4-renamed
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   865
  large4-modified
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   866
  $ cd sub2
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   867
  $ hg rename large6 large6-renamed
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   868
  $ hg st
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   869
  A sub2/large6-renamed
a77ce45584ef largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15575
diff changeset
   870
  R sub2/large6
15944
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   871
  $ cd ..
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   872
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   873
Test --normal flag
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   874
16494
e1f0305eabe4 tests: don't use /dev/urandom for largefiles testing
Mads Kiilerich <mads@kiilerich.com>
parents: 16449
diff changeset
   875
  $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
15944
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   876
  $ hg add --normal --large new-largefile
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   877
  abort: --normal cannot be used with --large
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   878
  [255]
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   879
  $ hg add --normal new-largefile
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   880
  new-largefile: up to 69 MB of RAM may be required to manage this file
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   881
  (use 'hg revert new-largefile' to cancel the pending addition)
f19d5c852f9b largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents: 15930
diff changeset
   882
  $ cd ..
15303
07811b3b119b largefiles: include 'largefiles' in converted repository requirements
Eli Carter <eli.carter@tektronix.com>
parents: 15301
diff changeset
   883
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   884
#if serve
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   885
vanilla clients not locked out from largefiles servers on vanilla repos
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   886
  $ mkdir r1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   887
  $ cd r1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   888
  $ hg init
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   889
  $ echo c1 > f1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   890
  $ hg add f1
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   891
  $ hg commit -m "m1"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   892
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   893
  A f1
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   894
  $ cd ..
15378
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   895
  $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   896
  $ cat hg.pid >> $DAEMON_PIDS
15377
107ff02b134d tests: make largefiles test use $HGPORT instead of 8001
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15374
diff changeset
   897
  $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   898
  requesting all changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   899
  adding changesets
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   900
  adding manifests
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   901
  adding file changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   902
  added 1 changesets with 1 changes to 1 files
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   903
  updating to branch default
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   904
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   905
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   906
largefiles clients still work with vanilla servers
15378
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   907
  $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   908
  $ cat hg.pid >> $DAEMON_PIDS
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   909
  $ hg clone http://localhost:$HGPORT1 r3
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   910
  requesting all changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   911
  adding changesets
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   912
  adding manifests
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   913
  adding file changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   914
  added 1 changesets with 1 changes to 1 files
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   915
  updating to branch default
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   916
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   917
#endif
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   918
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   919
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   920
vanilla clients locked out from largefiles http repos
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   921
  $ mkdir r4
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   922
  $ cd r4
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   923
  $ hg init
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   924
  $ echo c1 > f1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   925
  $ hg add --large f1
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   926
  $ hg commit -m "m1"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   927
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   928
  A f1
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   929
  $ cd ..
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   930
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   931
#if serve
15378
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   932
  $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   933
  $ cat hg.pid >> $DAEMON_PIDS
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   934
  $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   935
  abort: remote error:
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   936
  
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   937
  This repository uses the largefiles extension.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   938
  
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   939
  Please enable it in your Mercurial config file.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   940
  [255]
15378
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   941
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   942
used all HGPORTs, kill all daemons
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   943
  $ "$TESTDIR/killdaemons.py"
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   944
#endif
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   945
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   946
vanilla clients locked out from largefiles ssh repos
16541
bb3334806ace tests: quote dummyssh in a way that works on windows too
Mads Kiilerich <mads@kiilerich.com>
parents: 16516
diff changeset
   947
  $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   948
  abort: remote error:
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   949
  
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   950
  This repository uses the largefiles extension.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   951
  
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   952
  Please enable it in your Mercurial config file.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   953
  [255]
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   954
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   955
#if serve
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   956
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   957
largefiles clients refuse to push largefiles repos to vanilla servers
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   958
  $ mkdir r6
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   959
  $ cd r6
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   960
  $ hg init
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   961
  $ echo c1 > f1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   962
  $ hg add f1
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   963
  $ hg commit -m "m1"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   964
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   965
  A f1
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   966
  $ cat >> .hg/hgrc <<!
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   967
  > [web]
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   968
  > push_ssl = false
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   969
  > allow_push = *
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   970
  > !
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   971
  $ cd ..
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   972
  $ hg clone r6 r7
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   973
  updating to branch default
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   974
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   975
  $ cd r7
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   976
  $ echo c2 > f2
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   977
  $ hg add --large f2
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   978
  $ hg commit -m "m2"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   979
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
   980
  A f2
15378
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   981
  $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15377
diff changeset
   982
  $ cat ../hg.pid >> $DAEMON_PIDS
15377
107ff02b134d tests: make largefiles test use $HGPORT instead of 8001
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15374
diff changeset
   983
  $ hg push http://localhost:$HGPORT
107ff02b134d tests: make largefiles test use $HGPORT instead of 8001
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15374
diff changeset
   984
  pushing to http://localhost:$HGPORT/
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   985
  searching for changes
15377
107ff02b134d tests: make largefiles test use $HGPORT instead of 8001
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15374
diff changeset
   986
  abort: http://localhost:$HGPORT/ does not appear to be a largefile store
15336
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   987
  [255]
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   988
  $ cd ..
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents: 15332
diff changeset
   989
15778
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   990
putlfile errors are shown (issue3123)
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   991
Corrupt the cached largefile in r7
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
   992
  $ echo corruption > "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
15778
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   993
  $ hg init empty
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   994
  $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   995
  >   --config 'web.allow_push=*' --config web.push_ssl=False
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   996
  $ cat hg.pid >> $DAEMON_PIDS
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   997
  $ hg push -R r7 http://localhost:$HGPORT1
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   998
  pushing to http://localhost:$HGPORT1/
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
   999
  searching for changes
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
  1000
  remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
17088
31f7dd50ed40 test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 17017
diff changeset
  1001
  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
15778
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
  1002
  [255]
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
  1003
  $ rm -rf empty
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents: 15742
diff changeset
  1004
16594
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1005
Push a largefiles repository to a served empty repository
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1006
  $ hg init r8
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1007
  $ echo c3 > r8/f1
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1008
  $ hg add --large r8/f1 -R r8
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1009
  $ hg commit -m "m1" -R r8
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1010
  Invoking status precommit hook
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1011
  A f1
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1012
  $ hg init empty
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1013
  $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1014
  >   --config 'web.allow_push=*' --config web.push_ssl=False
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1015
  $ cat hg.pid >> $DAEMON_PIDS
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
  1016
  $ rm "${USERCACHE}"/*
16594
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1017
  $ hg push -R r8 http://localhost:$HGPORT2
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1018
  pushing to http://localhost:$HGPORT2/
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1019
  searching for changes
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1020
  searching for changes
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1021
  remote: adding changesets
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1022
  remote: adding manifests
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1023
  remote: adding file changes
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1024
  remote: added 1 changesets with 1 changes to 1 files
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1025
  $ rm -rf empty
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1026
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1027
used all HGPORTs, kill all daemons
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1028
  $ "$TESTDIR/killdaemons.py"
5516fdf3fe24 largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents: 16586
diff changeset
  1029
17089
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
  1030
#endif
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
  1031
0c1d10351869 tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents: 17088
diff changeset
  1032
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16908
diff changeset
  1033
#if unix-permissions
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16908
diff changeset
  1034
15318
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1035
Clone a local repository owned by another user
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1036
We have to simulate that here by setting $HOME and removing write permissions
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1037
  $ ORIGHOME="$HOME"
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1038
  $ mkdir alice
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1039
  $ HOME="`pwd`/alice"
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1040
  $ cd alice
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1041
  $ hg init pubrepo
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1042
  $ cd pubrepo
16494
e1f0305eabe4 tests: don't use /dev/urandom for largefiles testing
Mads Kiilerich <mads@kiilerich.com>
parents: 16449
diff changeset
  1043
  $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
15318
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1044
  $ hg add --large a-large-file
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1045
  $ hg commit -m "Add a large file"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
  1046
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
  1047
  A a-large-file
15318
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1048
  $ cd ..
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1049
  $ chmod -R a-w pubrepo
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1050
  $ cd ..
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1051
  $ mkdir bob
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1052
  $ HOME="`pwd`/bob"
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1053
  $ cd bob
15374
6cb8b46ea90a tests: fix spurious largefiles test failure on Cygwin
Matt Mackall <mpm@selenic.com>
parents: 15372
diff changeset
  1054
  $ hg clone --pull ../alice/pubrepo pubrepo
15318
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1055
  requesting all changes
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1056
  adding changesets
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1057
  adding manifests
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1058
  adding file changes
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1059
  added 1 changesets with 1 changes to 1 files
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1060
  updating to branch default
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1061
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1062
  getting changed largefiles
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1063
  1 largefiles updated, 0 removed
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1064
  $ cd ..
15514
dd856380cce3 tests: don't leave temporary directories without write permission behind
Mads Kiilerich <mads@kiilerich.com>
parents: 15447
diff changeset
  1065
  $ chmod -R u+w alice/pubrepo
15318
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents: 15313
diff changeset
  1066
  $ HOME="$ORIGHOME"
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1067
16986
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16908
diff changeset
  1068
#endif
79902f7e27df tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16908
diff changeset
  1069
16908
6a997aacba5d tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16900
diff changeset
  1070
#if symlink
6a997aacba5d tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16900
diff changeset
  1071
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1072
Symlink to a large largefile should behave the same as a symlink to a normal file
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1073
  $ hg init largesymlink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1074
  $ cd largesymlink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1075
  $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1076
  $ hg add --large largefile
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1077
  $ hg commit -m "commit a large file"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
  1078
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
  1079
  A largefile
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1080
  $ ln -s largefile largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1081
  $ hg add largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1082
  $ hg commit -m "commit a large symlink"
15795
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
  1083
  Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents: 15792
diff changeset
  1084
  A largelink
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1085
  $ rm -f largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1086
  $ hg up >/dev/null
15372
695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests
Matt Mackall <mpm@selenic.com>
parents: 15370
diff changeset
  1087
  $ test -f largelink
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1088
  [1]
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1089
  $ test -L largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1090
  [1]
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1091
  $ rm -f largelink # make next part of the test independent of the previous
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1092
  $ hg up -C >/dev/null
15372
695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests
Matt Mackall <mpm@selenic.com>
parents: 15370
diff changeset
  1093
  $ test -f largelink
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1094
  $ test -L largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1095
  $ cd ..
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1096
16908
6a997aacba5d tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16900
diff changeset
  1097
#endif
6a997aacba5d tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16900
diff changeset
  1098
16110
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1099
test for pattern matching on 'hg status':
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1100
to boost performance, largefiles checks whether specified patterns are
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1101
related to largefiles in working directory (NOT to STANDIN) or not.
15369
b4ea79f88268 largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents: 15366
diff changeset
  1102
16110
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1103
  $ hg init statusmatch
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1104
  $ cd statusmatch
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1105
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1106
  $ mkdir -p a/b/c/d
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1107
  $ echo normal > a/b/c/d/e.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1108
  $ hg add a/b/c/d/e.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1109
  $ echo large > a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1110
  $ hg add --large a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1111
  $ mkdir -p a/b/c/x
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1112
  $ echo normal > a/b/c/x/y.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1113
  $ hg add a/b/c/x/y.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1114
  $ hg commit -m 'add files'
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1115
  Invoking status precommit hook
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1116
  A a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1117
  A a/b/c/d/e.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1118
  A a/b/c/x/y.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1119
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1120
(1) no pattern: no performance boost
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1121
  $ hg status -A
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1122
  C a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1123
  C a/b/c/d/e.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1124
  C a/b/c/x/y.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1125
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1126
(2) pattern not related to largefiles: performance boost
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1127
  $ hg status -A a/b/c/x
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1128
  C a/b/c/x/y.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1129
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1130
(3) pattern related to largefiles: no performance boost
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1131
  $ hg status -A a/b/c/d
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1132
  C a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1133
  C a/b/c/d/e.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1134
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1135
(4) pattern related to STANDIN (not to largefiles): performance boost
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1136
  $ hg status -A .hglf/a
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1137
  C .hglf/a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1138
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1139
(5) mixed case: no performance boost
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1140
  $ hg status -A a/b/c/x a/b/c/d
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1141
  C a/b/c/d/e.large.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1142
  C a/b/c/d/e.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1143
  C a/b/c/x/y.normal.txt
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1144
16141
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1145
verify that largefiles doesn't break filesets
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1146
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1147
  $ hg log --rev . --exclude "set:binary()"
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1148
  changeset:   0:41bd42f10efa
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1149
  tag:         tip
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1150
  user:        test
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1151
  date:        Thu Jan 01 00:00:00 1970 +0000
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1152
  summary:     add files
f346de4dff57 largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 16110
diff changeset
  1153
  
16515
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1154
verify that large files in subrepos handled properly
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1155
  $ hg init subrepo
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1156
  $ echo "subrepo = subrepo" > .hgsub
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1157
  $ hg add .hgsub
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1158
  $ hg ci -m "add subrepo"
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1159
  Invoking status precommit hook
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1160
  A .hgsub
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1161
  ? .hgsubstate
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1162
  $ echo "rev 1" > subrepo/large.txt
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1163
  $ hg -R subrepo add --large subrepo/large.txt
16516
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1164
  $ hg sum
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1165
  parent: 1:8ee150ea2e9c tip
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1166
   add subrepo
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1167
  branch: default
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1168
  commit: 1 subrepos
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1169
  update: (current)
16515
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1170
  $ hg st
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1171
  $ hg st -S
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1172
  A subrepo/large.txt
16516
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1173
  $ hg ci -S -m "commit top repo"
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1174
  committing subrepository subrepo
16515
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1175
  Invoking status precommit hook
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1176
  A large.txt
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1177
  Invoking status precommit hook
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1178
  M .hgsubstate
16516
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1179
# No differences
16515
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1180
  $ hg st -S
16516
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1181
  $ hg sum
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1182
  parent: 2:ce4cd0c527a6 tip
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1183
   commit top repo
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1184
  branch: default
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1185
  commit: (clean)
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1186
  update: (current)
16515
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1187
  $ echo "rev 2" > subrepo/large.txt
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1188
  $ hg st -S
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents: 16494
diff changeset
  1189
  M subrepo/large.txt
16516
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1190
  $ hg sum
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1191
  parent: 2:ce4cd0c527a6 tip
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1192
   commit top repo
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1193
  branch: default
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1194
  commit: 1 subrepos
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1195
  update: (current)
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1196
  $ hg ci -m "this commit should fail without -S"
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1197
  abort: uncommitted changes in subrepo subrepo
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1198
  (use --subrepos for recursive commit)
597ddcb41b32 largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents: 16515
diff changeset
  1199
  [255]
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1200
16581
48dfd9ae924a test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents: 16580
diff changeset
  1201
Add a normal file to the subrepo, then test archiving
48dfd9ae924a test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents: 16580
diff changeset
  1202
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1203
  $ echo 'normal file' > subrepo/normal.txt
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1204
  $ hg -R subrepo add subrepo/normal.txt
16581
48dfd9ae924a test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents: 16580
diff changeset
  1205
48dfd9ae924a test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents: 16580
diff changeset
  1206
Lock in subrepo, otherwise the change isn't archived
48dfd9ae924a test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents: 16580
diff changeset
  1207
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1208
  $ hg ci -S -m "add normal file to top level"
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1209
  committing subrepository subrepo
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1210
  Invoking status precommit hook
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1211
  M large.txt
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1212
  A normal.txt
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1213
  Invoking status precommit hook
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1214
  M .hgsubstate
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1215
  $ hg archive -S lf_subrepo_archive
16580
80da0352a037 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents: 16578
diff changeset
  1216
  $ find lf_subrepo_archive | sort
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1217
  lf_subrepo_archive
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1218
  lf_subrepo_archive/.hg_archival.txt
16580
80da0352a037 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents: 16578
diff changeset
  1219
  lf_subrepo_archive/.hgsub
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1220
  lf_subrepo_archive/.hgsubstate
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1221
  lf_subrepo_archive/a
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1222
  lf_subrepo_archive/a/b
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1223
  lf_subrepo_archive/a/b/c
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1224
  lf_subrepo_archive/a/b/c/d
16580
80da0352a037 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents: 16578
diff changeset
  1225
  lf_subrepo_archive/a/b/c/d/e.large.txt
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1226
  lf_subrepo_archive/a/b/c/d/e.normal.txt
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1227
  lf_subrepo_archive/a/b/c/x
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1228
  lf_subrepo_archive/a/b/c/x/y.normal.txt
16580
80da0352a037 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents: 16578
diff changeset
  1229
  lf_subrepo_archive/subrepo
80da0352a037 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents: 16578
diff changeset
  1230
  lf_subrepo_archive/subrepo/large.txt
80da0352a037 test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents: 16578
diff changeset
  1231
  lf_subrepo_archive/subrepo/normal.txt
16578
43fb170a23bd largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents: 16541
diff changeset
  1232
16110
41417443b7d0 largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15983
diff changeset
  1233
  $ cd ..