#require no-reposimplestore

This file focuses mainly on updating largefiles in the working

directory (and ".hg/largefiles/dirstate")

  $ cat >> $HGRCPATH <<EOF

  > [ui]

  > merge = internal:merge

  > [extensions]

  > largefiles =

  > [extdiff]

  > # for portability:

  > pdiff = sh "$RUNTESTDIR/pdiff"

  > EOF

  $ hg init repo

  $ cd repo

  $ echo large1 > large1

  $ echo large2 > large2

  $ hg add --large large1 large2

  $ echo normal1 > normal1

  $ hg add normal1

  $ hg commit -m '#0'

  $ echo 'large1 in #1' > large1

  $ echo 'normal1 in #1' > normal1

  $ hg commit -m '#1'

  $ hg pdiff -r '.^' --config extensions.extdiff=

  diff -Nru repo.0d9d9b8dc9a3/.hglf/large1 repo/.hglf/large1

  --- repo.0d9d9b8dc9a3/.hglf/large1	* (glob)

  +++ repo/.hglf/large1	* (glob)

  @@ -1* +1* @@ (glob)

  -4669e532d5b2c093a78eca010077e708a071bb64

  +58e24f733a964da346e2407a2bee99d9001184f5

  diff -Nru repo.0d9d9b8dc9a3/normal1 repo/normal1

  --- repo.0d9d9b8dc9a3/normal1	* (glob)

  +++ repo/normal1	* (glob)

  @@ -1* +1* @@ (glob)

  -normal1

  +normal1 in #1

  [1]

  $ hg update -q -C 0

  $ echo 'large2 in #2' > large2

  $ hg commit -m '#2'

  created new head

Test that update also updates the lfdirstate of 'unsure' largefiles after

hashing them:

The previous operations will usually have left us with largefiles with a mtime

within the same second as the dirstate was written.

The lfdirstate entries will thus have been written with an invalidated/unset

mtime to make sure further changes within the same second is detected.

We will however occasionally be "lucky" and get a tick between writing

largefiles and writing dirstate so we get valid lfdirstate timestamps. The

following verification is thus disabled but can be verified manually.

#if false

  $ hg debugdirstate --large --nodate

  n 644          7 unset               large1

  n 644         13 unset               large2

#endif

Wait to make sure we get a tick so the mtime of the largefiles become valid.

  $ sleep 1

A linear merge will update standins before performing the actual merge. It will

do a lfdirstate status walk and find 'unset'/'unsure' files, hash them, and

update the corresponding standins.

Verify that it actually marks the clean files as clean in lfdirstate so

we don't have to hash them again next time we update.

# note:

#    We do this less agressively now, to avoid race condition, however the

#    cache

#    is properly set after the next status

#

#    The "changed" output is marked as missing-correct-output/known-bad-output

#    for clarify

  $ hg up

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  updated to "f74e50bd9e55: #2"

  1 other heads for branch "default"

  $ hg debugdirstate --large --nodate

  n 644          7 set                 large1 (missing-correct-output !)

  n 644         13 set                 large2 (missing-correct-output !)

  n   0         -1 unset               large1 (known-bad-output !)

  n   0         -1 unset               large2 (known-bad-output !)

  $ sleep 1 # so that mtime are not ambiguous

  $ hg status

  $ hg debugdirstate --large --nodate

  n 644          7 set                 large1

  n 644         13 set                 large2

Test that lfdirstate keeps track of last modification of largefiles and

prevents unnecessary hashing of content - also after linear/noop update

(XXX Since there is a possible race during update, we only do this after the next

status call, this is slower, but more correct)

  $ sleep 1

  $ hg st

  $ hg debugdirstate --large --nodate

  n 644          7 set                 large1

  n 644         13 set                 large2

  $ hg up

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  updated to "f74e50bd9e55: #2"

  1 other heads for branch "default"

  $ hg debugdirstate --large --nodate

  n 644          7 set                 large1 (missing-correct-output !)

  n 644         13 set                 large2 (missing-correct-output !)

  n   0         -1 unset               large1 (known-bad-output !)

  n   0         -1 unset               large2 (known-bad-output !)

  $ sleep 1 # so that mtime are not ambiguous

  $ hg status

  $ hg debugdirstate --large --nodate

  n 644          7 set                 large1

  n 644         13 set                 large2

Test that "hg merge" updates largefiles from "other" correctly

(getting largefiles from "other" normally)

  $ hg status -A large1

  C large1

  $ cat large1

  large1

  $ cat .hglf/large1

  4669e532d5b2c093a78eca010077e708a071bb64

  $ hg merge --config debug.dirstate.delaywrite=2

  getting changed largefiles

  1 largefiles updated, 0 removed

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg status -A large1

  M large1

  $ cat large1

  large1 in #1

  $ cat .hglf/large1

  58e24f733a964da346e2407a2bee99d9001184f5

  $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]'

  -4669e532d5b2c093a78eca010077e708a071bb64

  +58e24f733a964da346e2407a2bee99d9001184f5

(getting largefiles from "other" via conflict prompt)

  $ hg update -q -C 2

  $ echo 'large1 in #3' > large1

  $ echo 'normal1 in #3' > normal1

  $ hg commit -m '#3'

  $ cat .hglf/large1

  e5bb990443d6a92aaf7223813720f7566c9dd05b

  $ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF

  > o

  > EOF

  largefile large1 has a merge conflict

  ancestor was 4669e532d5b2c093a78eca010077e708a071bb64

  you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.

  what do you want to do? o

  merging normal1

  warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')

  getting changed largefiles

  1 largefiles updated, 0 removed

  0 files updated, 1 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ hg status -A large1

  M large1

  $ cat large1

  large1 in #1

  $ cat .hglf/large1

  58e24f733a964da346e2407a2bee99d9001184f5

  $ rm normal1.orig

(merge non-existing largefiles from "other" via conflict prompt -

make sure the following commit doesn't abort in a confusing way when trying to

mark the non-existing file as normal in lfdirstate)

  $ mv .hg/largefiles/58e24f733a964da346e2407a2bee99d9001184f5 .

  $ hg update -q -C 3

  $ hg merge --config largefiles.usercache=not --config debug.dirstate.delaywrite=2 --tool :local --config ui.interactive=True <<EOF

  > o

  > EOF

  largefile large1 has a merge conflict

  ancestor was 4669e532d5b2c093a78eca010077e708a071bb64

  you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.

  what do you want to do? o

  getting changed largefiles

  large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob)

  0 largefiles updated, 0 removed

  0 files updated, 2 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg commit -m '1-2-3 testing' --config largefiles.usercache=not

  large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from local store

  $ hg up -C . --config largefiles.usercache=not

  getting changed largefiles

  large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob)

  0 largefiles updated, 0 removed

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg st large1

  ! large1

  $ hg rollback -q

  $ mv 58e24f733a964da346e2407a2bee99d9001184f5 .hg/largefiles/

Test that "hg revert -r REV" updates largefiles from "REV" correctly

  $ hg update -q -C 3

  $ hg status -A large1

  C large1

  $ cat large1

  large1 in #3

  $ cat .hglf/large1

  e5bb990443d6a92aaf7223813720f7566c9dd05b

  $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]'

  -4669e532d5b2c093a78eca010077e708a071bb64

  +58e24f733a964da346e2407a2bee99d9001184f5

  $ hg revert --no-backup -r 1 --config debug.dirstate.delaywrite=2 large1

  $ hg status -A large1

  M large1

  $ cat large1

  large1 in #1

  $ cat .hglf/large1

  58e24f733a964da346e2407a2bee99d9001184f5

Test that "hg rollback" restores status of largefiles correctly

  $ hg update -C -q

  $ hg remove large1

  $ test -f .hglf/large1

  [1]

  $ hg forget large2

  $ test -f .hglf/large2

  [1]

  $ echo largeX > largeX

  $ hg add --large largeX

  $ cat .hglf/largeX

  $ hg commit -m 'will be rollback-ed soon'

  $ echo largeY > largeY

  $ hg add --large largeY

  $ hg status -A large1

  large1: $ENOENT$

  $ hg status -A large2

  ? large2

  $ hg status -A largeX

  C largeX

  $ hg status -A largeY

  A largeY

  $ hg rollback

  repository tip rolled back to revision 3 (undo commit)

  working directory now based on revision 3

  $ hg status -A large1

  R large1

  $ test -f .hglf/large1

  [1]

  $ hg status -A large2

  R large2

  $ test -f .hglf/large2

  [1]

  $ hg status -A largeX

  A largeX

  $ cat .hglf/largeX

  $ hg status -A largeY

  ? largeY

  $ test -f .hglf/largeY

  [1]

  $ rm largeY

Test that "hg rollback" restores standins correctly

  $ hg commit -m 'will be rollback-ed soon'

  $ hg update -q -C 2

  $ cat large1

  large1

  $ cat .hglf/large1

  4669e532d5b2c093a78eca010077e708a071bb64

  $ cat large2

  large2 in #2

  $ cat .hglf/large2

  3cfce6277e7668985707b6887ce56f9f62f6ccd9

  $ hg rollback -q -f

  $ cat large1

  large1

  $ cat .hglf/large1

  4669e532d5b2c093a78eca010077e708a071bb64

  $ cat large2

  large2 in #2

  $ cat .hglf/large2

  3cfce6277e7668985707b6887ce56f9f62f6ccd9

(rollback the parent of the working directory, when the parent of it

is not branch-tip)

  $ hg update -q -C 1

  $ cat .hglf/large1

  58e24f733a964da346e2407a2bee99d9001184f5

  $ cat .hglf/large2

  1deebade43c8c498a3c8daddac0244dc55d1331d

  $ echo normalX > normalX

  $ hg add normalX

  $ hg commit -m 'will be rollback-ed soon'

  $ hg rollback -q

  $ cat .hglf/large1

  58e24f733a964da346e2407a2bee99d9001184f5

  $ cat .hglf/large2

  1deebade43c8c498a3c8daddac0244dc55d1331d

  $ rm normalX

Test that "hg status" shows status of largefiles correctly just after

automated commit like rebase/transplant

  $ cat >> .hg/hgrc <<EOF

  > [extensions]

  > rebase =

  > strip =

  > transplant =

  > EOF

  $ hg update -q -C 1

  $ hg remove large1

  $ echo largeX > largeX

  $ hg add --large largeX

  $ hg commit -m '#4'

  $ hg rebase -s 1 -d 2 --keep

  rebasing 1:72518492caa6 "#1"

  rebasing 4:07d6153b5c04 tip "#4"

  $ hg status -A large1

  large1: $ENOENT$

  $ hg status -A largeX

  C largeX

  $ hg strip -q 5

  $ hg update -q -C 2

  $ hg transplant -q 1 4

  $ hg status -A large1

  large1: $ENOENT$

  $ hg status -A largeX

  C largeX

  $ hg strip -q 5

  $ hg update -q -C 2

  $ hg transplant -q --merge 1 --merge 4

  $ hg status -A large1

  large1: $ENOENT$

  $ hg status -A largeX

  C largeX

  $ hg strip -q 5

Test that linear merge can detect modification (and conflict) correctly

(linear merge without conflict)

  $ echo 'large2 for linear merge (no conflict)' > large2

  $ hg update 3 --config debug.dirstate.delaywrite=2

  getting changed largefiles

  1 largefiles updated, 0 removed

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg status -A large2

  M large2

  $ cat large2

  large2 for linear merge (no conflict)

  $ cat .hglf/large2

  9c4bf8f1b33536d6e5f89447e10620cfe52ea710

(linear merge with conflict, choosing "other")

  $ hg update -q -C 2

  $ echo 'large1 for linear merge (conflict)' > large1

  $ hg update 3 --config ui.interactive=True <<EOF

  > o

  > EOF

  largefile large1 has a merge conflict