##// END OF EJS Templates
run-tests: define the default merge tool through configuration...
run-tests: define the default merge tool through configuration Using the `HGMERGE` environment variable generates confusion as it overrides any value set through configuration. By setting the default value through the default HGRC, the usual overriding rules apply and it should reduce confusion.

File last commit:

r40500:37e75be0 default
r40506:d6b6f1b4 default
Show More
test-largefiles-update.t
796 lines | 23.5 KiB | text/troff | Tads3Lexer
/ tests / test-largefiles-update.t
Gregory Szorc
tests: skip largefiles and lfs tests when using simple store...
r37366 #require no-reposimplestore
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 This file focuses mainly on updating largefiles in the working
directory (and ".hg/largefiles/dirstate")
Boris Feld
tests: adjust merge tool config in test-largefiles-update.t...
r40500 $ unset HGMERGE
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 $ cat >> $HGRCPATH <<EOF
> [ui]
Boris Feld
tests: adjust merge tool config in test-largefiles-update.t...
r40500 > merge = internal:merge
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 > [extensions]
> largefiles =
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
r28052 > [extdiff]
> # for portability:
> pdiff = sh "$RUNTESTDIR/pdiff"
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 > 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'
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
r28052 $ hg pdiff -r '.^' --config extensions.extdiff=
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
r28033 diff -Nru repo.0d9d9b8dc9a3/.hglf/large1 repo/.hglf/large1
Matt Harbison
extdiff: use archiver to take snapshots of committed revisions...
r25812 --- repo.0d9d9b8dc9a3/.hglf/large1 * (glob)
+++ repo/.hglf/large1 * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
r28035 @@ -1* +1* @@ (glob)
Matt Harbison
extdiff: use archiver to take snapshots of committed revisions...
r25812 -4669e532d5b2c093a78eca010077e708a071bb64
+58e24f733a964da346e2407a2bee99d9001184f5
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
r28033 diff -Nru repo.0d9d9b8dc9a3/normal1 repo/normal1
Matt Harbison
extdiff: use archiver to take snapshots of committed revisions...
r25812 --- repo.0d9d9b8dc9a3/normal1 * (glob)
+++ repo/normal1 * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
r28035 @@ -1* +1* @@ (glob)
Matt Harbison
extdiff: use archiver to take snapshots of committed revisions...
r25812 -normal1
+normal1 in #1
[1]
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 $ hg update -q -C 0
$ echo 'large2 in #2' > large2
$ hg commit -m '#2'
created new head
Mads Kiilerich
largefiles: make linear update set unsure largefiles normal if unchanged...
r23841 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.
$ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
r32698 updated to "f74e50bd9e55: #2"
Pierre-Yves David
update: warn about other topological heads on bare update...
r28029 1 other heads for branch "default"
Mads Kiilerich
largefiles: make linear update set unsure largefiles normal if unchanged...
r23841 $ hg debugdirstate --large --nodate
n 644 7 set large1
n 644 13 set large2
Mads Kiilerich
tests: add test coverage for lfdirstate invalidation of linear update...
r23694 Test that lfdirstate keeps track of last modification of largefiles and
prevents unnecessary hashing of content - also after linear/noop update
$ sleep 1
$ hg st
$ hg debugdirstate --large --nodate
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 n 644 7 set large1
n 644 13 set large2
Mads Kiilerich
tests: add test coverage for lfdirstate invalidation of linear update...
r23694 $ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
r32698 updated to "f74e50bd9e55: #2"
Pierre-Yves David
update: warn about other topological heads on bare update...
r28029 1 other heads for branch "default"
Mads Kiilerich
tests: add test coverage for lfdirstate invalidation of linear update...
r23694 $ hg debugdirstate --large --nodate
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 n 644 7 set large1
n 644 13 set large2
Mads Kiilerich
tests: add test coverage for lfdirstate invalidation of linear update...
r23694
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 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
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288 getting changed largefiles
1 largefiles updated, 0 removed
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 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
FUJIWARA Katsunori
largefiles: invoke "normallookup" on "lfdirstate" for merged files...
r21933 (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
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
merging normal1
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288 getting changed largefiles
1 largefiles updated, 0 removed
FUJIWARA Katsunori
largefiles: invoke "normallookup" on "lfdirstate" for merged files...
r21933 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
Pulkit Goyal
merge: add `--abort` flag which can abort the merge...
r35722 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
FUJIWARA Katsunori
largefiles: invoke "normallookup" on "lfdirstate" for merged files...
r21933 [1]
$ hg status -A large1
M large1
$ cat large1
large1 in #1
$ cat .hglf/large1
58e24f733a964da346e2407a2bee99d9001184f5
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ rm normal1.orig
FUJIWARA Katsunori
largefiles: invoke "normallookup" on "lfdirstate" for merged files...
r21933
Mads Kiilerich
largefiles: better handling of merge of largefiles that not are available...
r26627 (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
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? 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)
Mads Kiilerich
largefiles: fix commit of missing largefiles...
r27903 $ 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
Mads Kiilerich
largefiles: better handling of merge of largefiles that not are available...
r26627 $ hg rollback -q
Mads Kiilerich
largefiles: fix commit of missing largefiles...
r27903 $ mv 58e24f733a964da346e2407a2bee99d9001184f5 .hg/largefiles/
Mads Kiilerich
largefiles: better handling of merge of largefiles that not are available...
r26627
FUJIWARA Katsunori
largefiles: use "normallookup" on "lfdirstate" while reverting...
r21934 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
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 Test that "hg rollback" restores status of largefiles correctly
$ hg update -C -q
$ hg remove large1
FUJIWARA Katsunori
largefiles: restore standins according to restored dirstate...
r22285 $ test -f .hglf/large1
[1]
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ hg forget large2
FUJIWARA Katsunori
largefiles: restore standins according to restored dirstate...
r22285 $ test -f .hglf/large2
[1]
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ echo largeX > largeX
$ hg add --large largeX
FUJIWARA Katsunori
largefiles: restore standins according to restored dirstate...
r22285 $ cat .hglf/largeX
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ hg commit -m 'will be rollback-ed soon'
FUJIWARA Katsunori
largefiles: drop orphan entries from lfdristat at "hg rollback"...
r22097 $ echo largeY > largeY
$ hg add --large largeY
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows...
r23058 $ hg status -A large1
Matt Harbison
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages...
r35230 large1: $ENOENT$
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ hg status -A large2
? large2
$ hg status -A largeX
C largeX
FUJIWARA Katsunori
largefiles: drop orphan entries from lfdristat at "hg rollback"...
r22097 $ hg status -A largeY
A largeY
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ hg rollback
repository tip rolled back to revision 3 (undo commit)
working directory now based on revision 3
$ hg status -A large1
R large1
FUJIWARA Katsunori
largefiles: restore standins according to restored dirstate...
r22285 $ test -f .hglf/large1
[1]
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ hg status -A large2
R large2
FUJIWARA Katsunori
largefiles: restore standins according to restored dirstate...
r22285 $ test -f .hglf/large2
[1]
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096 $ hg status -A largeX
A largeX
FUJIWARA Katsunori
largefiles: restore standins according to restored dirstate...
r22285 $ cat .hglf/largeX
FUJIWARA Katsunori
largefiles: drop orphan entries from lfdristat at "hg rollback"...
r22097 $ hg status -A largeY
? largeY
FUJIWARA Katsunori
largefiles: unlink standins not known to the restored dirstate at rollback...
r22286 $ test -f .hglf/largeY
[1]
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ rm largeY
FUJIWARA Katsunori
largefiles: restore R status of removed largefiles correctly at "hg rollback"...
r22096
FUJIWARA Katsunori
largefiles: omit restoring standins if working parent is not rollbacked...
r22283 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
FUJIWARA Katsunori
largefiles: restore standins from non branch-tip parent at rollback correctly...
r22284 (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
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ rm normalX
FUJIWARA Katsunori
largefiles: restore standins from non branch-tip parent at rollback correctly...
r22284
FUJIWARA Katsunori
largefiles: synchronize lfdirstate with dirstate after automated committing...
r22098 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
Mads Kiilerich
rebase: show more useful status information while rebasing...
r23517 rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4" (tip)
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows...
r23058 $ hg status -A large1
Matt Harbison
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages...
r35230 large1: $ENOENT$
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
largefiles: synchronize lfdirstate with dirstate after automated committing...
r22098 $ hg status -A largeX
C largeX
$ hg strip -q 5
$ hg update -q -C 2
$ hg transplant -q 1 4
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows...
r23058 $ hg status -A large1
Matt Harbison
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages...
r35230 large1: $ENOENT$
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
largefiles: synchronize lfdirstate with dirstate after automated committing...
r22098 $ hg status -A largeX
C largeX
$ hg strip -q 5
$ hg update -q -C 2
$ hg transplant -q --merge 1 --merge 4
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows...
r23058 $ hg status -A large1
Matt Harbison
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages...
r35230 large1: $ENOENT$
Matt Harbison
test-largefiles-update: conditionalize output instead of tests
r33344
FUJIWARA Katsunori
largefiles: synchronize lfdirstate with dirstate after automated committing...
r22098 $ hg status -A largeX
C largeX
$ hg strip -q 5
FUJIWARA Katsunori
largefiles: add test for large/normal conflict at linear merging...
r22195 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
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o
getting changed largefiles
FUJIWARA Katsunori
largefiles: add test for large/normal conflict at linear merging...
r22195 1 largefiles updated, 0 removed
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg status -A large1
C large1
$ cat large1
large1 in #3
$ cat .hglf/large1
e5bb990443d6a92aaf7223813720f7566c9dd05b
(linear merge with conflict, choosing "local")
$ hg update -q -C 2
$ echo 'large1 for linear merge (conflict)' > large1
$ hg update 3 --config debug.dirstate.delaywrite=2
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg status -A large1
M large1
$ cat large1
large1 for linear merge (conflict)
$ cat .hglf/large1
ba94c2efe5b7c5e0af8d189295ce00553b0612b7
FUJIWARA Katsunori
largefiles: keep largefiles from colliding with normal one during linear merge...
r22196 Test a linear merge to a revision containing same-name normal file
$ hg update -q -C 3
$ hg remove large2
$ echo 'large2 as normal file' > large2
$ hg add large2
$ echo 'large3 as normal file' > large3
$ hg add large3
$ hg commit -m '#5'
$ hg manifest
.hglf/large1
large2
large3
normal1
(modified largefile is already switched to normal)
$ hg update -q -C 2
$ echo 'modified large2 for linear merge' > large2
$ hg update -q 5
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
Martin von Zweigbergk
debugdirstate: deprecate --nodates in favor of --no-dates...
r39796 $ hg debugdirstate --no-dates | grep large2
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 a 0 -1 unset .hglf/large2
r 0 0 set large2
FUJIWARA Katsunori
largefiles: update lfdirstate for unchanged largefiles during linear merging...
r22197 $ hg status -A large2
A large2
FUJIWARA Katsunori
largefiles: keep largefiles from colliding with normal one during linear merge...
r22196 $ cat large2
modified large2 for linear merge
(added largefile is already committed as normal)
$ hg update -q -C 2
$ echo 'large3 as large file for linear merge' > large3
$ hg add --large large3
$ hg update -q 5
remote turned local largefile large3 into a normal file
keep (l)argefile or use (n)ormal file? l
Martin von Zweigbergk
debugdirstate: deprecate --nodates in favor of --no-dates...
r39796 $ hg debugdirstate --no-dates | grep large3
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 a 0 -1 unset .hglf/large3
r 0 0 set large3
FUJIWARA Katsunori
largefiles: update lfdirstate for unchanged largefiles during linear merging...
r22197 $ hg status -A large3
A large3
FUJIWARA Katsunori
largefiles: keep largefiles from colliding with normal one during linear merge...
r22196 $ cat large3
large3 as large file for linear merge
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 $ rm -f large3 .hglf/large3
Test that the internal linear merging works correctly
(both heads are stripped to keep pairing of revision number and commit log)
$ hg update -q -C 2
$ hg strip 3 4
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg
Durham Goode
bundles: do not overwrite existing backup bundles (BC)...
r23835 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287
(internal linear merging at "hg pull --update")
$ echo 'large1 for linear merge (conflict)' > large1
$ echo 'large2 for linear merge (conflict with normal file)' > large2
Durham Goode
bundles: do not overwrite existing backup bundles (BC)...
r23835 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
r32698 updated to "d65e59e952a9: #5"
Pierre-Yves David
update: warn about other topological head in pull and unbundle...
r28030 1 other heads for branch "default"
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287
$ hg status -A large1
M large1
$ cat large1
large1 for linear merge (conflict)
$ cat .hglf/large1
ba94c2efe5b7c5e0af8d189295ce00553b0612b7
$ hg status -A large2
A large2
$ cat large2
large2 for linear merge (conflict with normal file)
$ cat .hglf/large2
d7591fe9be0f6227d90bddf3e4f52ff41fc1f544
(internal linear merging at "hg unbundle --update")
$ hg update -q -C 2
$ hg rollback -q
$ echo 'large1 for linear merge (conflict)' > large1
$ echo 'large2 for linear merge (conflict with normal file)' > large2
Durham Goode
bundles: do not overwrite existing backup bundles (BC)...
r23835 $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 adding changesets
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
r32698 updated to "d65e59e952a9: #5"
Pierre-Yves David
update: warn about other topological head in pull and unbundle...
r28030 1 other heads for branch "default"
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287
$ hg status -A large1
M large1
$ cat large1
large1 for linear merge (conflict)
$ cat .hglf/large1
ba94c2efe5b7c5e0af8d189295ce00553b0612b7
$ hg status -A large2
A large2
$ cat large2
large2 for linear merge (conflict with normal file)
$ cat .hglf/large2
d7591fe9be0f6227d90bddf3e4f52ff41fc1f544
(internal linear merging in subrepo at "hg update")
FUJIWARA Katsunori
largefiles: keep largefiles from colliding with normal one during linear merge...
r22196
FUJIWARA Katsunori
largefiles: use "normallookup", if "mtime" of standin is unset...
r21932 $ cd ..
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 $ hg init subparent
$ cd subparent
$ hg clone -q -u 2 ../repo sub
$ cat > .hgsub <<EOF
> sub = sub
> EOF
$ hg add .hgsub
$ hg commit -m '#0@parent'
$ cat .hgsubstate
f74e50bd9e5594b7cf1e6c5cbab86ddd25f3ca2f sub
$ hg -R sub update -q
$ hg commit -m '#1@parent'
$ cat .hgsubstate
d65e59e952a9638e2ce863b41a420ca723dd3e8d sub
$ hg update -q 0
$ echo 'large1 for linear merge (conflict)' > sub/large1
$ echo 'large2 for linear merge (conflict with normal file)' > sub/large2
$ hg update --config ui.interactive=True --config debug.dirstate.delaywrite=2 <<EOF
> m
> r
> l
> l
> EOF
subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9)
Simon Farnsworth
merge: use labels in subrepo merge...
r30060 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 subrepository sources for sub differ (in checked out version)
Mads Kiilerich
subrepo: remove superfluous newline from subrepo prompt
r22590 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
FUJIWARA Katsunori
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
r22287 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R sub status -A sub/large1
M sub/large1
$ cat sub/large1
large1 for linear merge (conflict)
$ cat sub/.hglf/large1
ba94c2efe5b7c5e0af8d189295ce00553b0612b7
$ hg -R sub status -A sub/large2
A sub/large2
$ cat sub/large2
large2 for linear merge (conflict with normal file)
$ cat sub/.hglf/large2
d7591fe9be0f6227d90bddf3e4f52ff41fc1f544
$ cd ..
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288 $ cd repo
Test that rebase updates largefiles in the working directory even if
it is aborted by conflict.
$ hg update -q -C 3
$ cat .hglf/large1
e5bb990443d6a92aaf7223813720f7566c9dd05b
$ cat large1
large1 in #3
$ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF
> o
> EOF
Mads Kiilerich
rebase: show more useful status information while rebasing...
r23517 rebasing 1:72518492caa6 "#1"
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288 largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
merging normal1
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288 unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ cat .hglf/large1
58e24f733a964da346e2407a2bee99d9001184f5
$ cat large1
large1 in #1
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ rm normal1.orig
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288
FUJIWARA Katsunori
largefiles: update standins only at the 1st commit of "hg rebase --continue"...
r23187 Test that rebase updates standins for manually modified largefiles at
the 1st commit of resuming.
$ echo "manually modified before 'hg rebase --continue'" > large1
$ hg resolve -m normal1
(no more unresolved files)
timeless
rebase: hook afterresolvedstates
r27626 continue: hg rebase --continue
FUJIWARA Katsunori
largefiles: update standins only at the 1st commit of "hg rebase --continue"...
r23187 $ hg rebase --continue --config ui.interactive=True <<EOF
> c
> EOF
Mads Kiilerich
rebase: show more useful status information while rebasing...
r23517 rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4"
Pulkit Goyal
filemerge: fix the wrong placements of messages in prompt...
r39321 file '.hglf/large1' was deleted in other [source] but was modified in local [dest].
Augie Fackler
merge: improve interactive one-changed one-deleted message (issue5550)...
r39313 What do you want to do?
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to change/delete prompts...
r27163 use (c)hanged version, (d)elete, or leave (u)nresolved? c
FUJIWARA Katsunori
largefiles: update standins only at the 1st commit of "hg rebase --continue"...
r23187
$ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
-e5bb990443d6a92aaf7223813720f7566c9dd05b
+8a4f783556e7dea21139ca0466eafce954c75c13
$ rm -f large1
$ hg update -q -C tip
$ cat large1
manually modified before 'hg rebase --continue'
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288
FUJIWARA Katsunori
largefiles: update largefiles even if transplant is aborted by conflict...
r22289 Test that transplant updates largefiles, of which standins are safely
changed, even if it is aborted by conflict of other.
$ hg update -q -C 5
$ cat .hglf/large1
e5bb990443d6a92aaf7223813720f7566c9dd05b
$ cat large1
large1 in #3
$ hg diff -c 4 .hglf/largeX | grep '^[+-][0-9a-z]'
+fa44618ea25181aff4f48b70428294790cec9f61
$ hg transplant 4
applying 07d6153b5c04
patching file .hglf/large1
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file .hglf/large1.rej
patch failed to apply
timeless
transplant: correct language to use working directory
r27676 abort: fix up the working directory and run hg transplant --continue
FUJIWARA Katsunori
largefiles: update largefiles even if transplant is aborted by conflict...
r22289 [255]
$ hg status -A large1
C large1
$ cat .hglf/large1
e5bb990443d6a92aaf7223813720f7566c9dd05b
$ cat large1
large1 in #3
$ hg status -A largeX
A largeX
$ cat .hglf/largeX
fa44618ea25181aff4f48b70428294790cec9f61
$ cat largeX
largeX
FUJIWARA Katsunori
largefiles: update standins only at the 1st commit of "transplant --continue"...
r23274 Test that transplant updates standins for manually modified largefiles
at the 1st commit of resuming.
$ echo "manually modified before 'hg transplant --continue'" > large1
$ hg transplant --continue
07d6153b5c04 transplanted as f1bf30eb88cc
$ hg diff -c tip .hglf/large1 | grep '^[+-][0-9a-z]'
-e5bb990443d6a92aaf7223813720f7566c9dd05b
+6a4f36d4075fbe0f30ec1d26ca44e63c05903671
$ rm -f large1
$ hg update -q -C tip
$ cat large1
manually modified before 'hg transplant --continue'
FUJIWARA Katsunori
largefiles: ignore removal status of files not managed in the target context...
r23089 Test that "hg status" doesn't show removal of largefiles not managed
in the target context.
$ hg update -q -C 4
$ hg remove largeX
$ hg status -A largeX
R largeX
$ hg status -A --rev '.^1' largeX
FUJIWARA Katsunori
largefiles: add examination of exec bit in "hg status --rev REV" case...
r23090 #if execbit
Test that "hg status" against revisions other than parent notices exec
bit changes of largefiles.
$ hg update -q -C 4
(the case that large2 doesn't have exec bit in the target context but
in the working context)
$ chmod +x large2
$ hg status -A --rev 0 large2
M large2
$ hg commit -m 'chmod +x large2'
(the case that large2 has exec bit in the target context but not in
the working context)
$ echo dummy > dummy
$ hg add dummy
$ hg commit -m 'revision for separation'
$ chmod -x large2
$ hg status -A --rev '.^1' large2
M large2
FUJIWARA Katsunori
largefiles: avoid exec-bit examination on the platform being unaware of it...
r23383 #else
Test that "hg status" against revisions other than parent ignores exec
bit correctly on the platform being unaware of it.
$ hg update -q -C 4
FUJIWARA Katsunori
tests: put temporary file outside the working directory for test portability...
r30239 $ cat > ../exec-bit.patch <<EOF
FUJIWARA Katsunori
largefiles: avoid exec-bit examination on the platform being unaware of it...
r23383 > # HG changeset patch
> # User test
> # Date 0 0
> # Thu Jan 01 00:00:00 1970 +0000
> # Node ID be1b433a65b12b27b5519d92213e14f7e1769b90
> # Parent 07d6153b5c04313efb75deec9ba577de7faeb727
> chmod +x large2
>
> diff --git a/.hglf/large2 b/.hglf/large2
> old mode 100644
> new mode 100755
> EOF
FUJIWARA Katsunori
tests: put temporary file outside the working directory for test portability...
r30239 $ hg import --exact --bypass ../exec-bit.patch
applying ../exec-bit.patch
FUJIWARA Katsunori
largefiles: avoid exec-bit examination on the platform being unaware of it...
r23383 $ hg status -A --rev tip large2
C large2
FUJIWARA Katsunori
largefiles: add examination of exec bit in "hg status --rev REV" case...
r23090 #endif
Matt Harbison
revset: evaluate filesets against each revision for 'file()' (issue5778)...
r35835 The fileset revset is evaluated for each revision, instead of once on wdir(),
and then patterns matched on each revision. Here, no exec bits are set in
wdir(), but a matching revision is detected.
(Teach large2 is not an executable. Maybe this is a bug of largefiles.)
#if execbit
$ chmod -x .hglf/large2
#endif
$ hg files 'set:exec()'
[1]
$ hg log -qr 'file("set:exec()")'
9:be1b433a65b1
Mads Kiilerich
largefiles: more safe handling of interruptions while updating modifications...
r30190 Test a fatal error interrupting an update. Verify that status report dirty
files correctly after an interrupted update. Also verify that checking all
hashes reveals it isn't clean.
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189
Start with clean dirstates:
Augie Fackler
tests: correct (I think) command in test-largefiles-update...
r30858 $ hg up --quiet --clean --rev "8^"
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ sleep 1
$ hg st
Mads Kiilerich
largefiles: more safe handling of interruptions while updating modifications...
r30190 Update standins without updating largefiles - large1 is modified and largeX is
added:
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ cat << EOF > ../crashupdatelfiles.py
> import hgext.largefiles.lfutil
> def getlfilestoupdate(oldstandins, newstandins):
> raise SystemExit(7)
> hgext.largefiles.lfutil.getlfilestoupdate = getlfilestoupdate
> EOF
$ hg up -Cr "8" --config extensions.crashupdatelfiles=../crashupdatelfiles.py
[7]
Mads Kiilerich
largefiles: more safe handling of interruptions while updating modifications...
r30190 Check large1 content and status ... and that update will undo modifications:
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ cat large1
large1 in #3
$ hg st
Mads Kiilerich
largefiles: more safe handling of interruptions while updating modifications...
r30190 M large1
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 ! largeX
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ hg up -Cr .
Mads Kiilerich
largefiles: more safe handling of interruptions while updating modifications...
r30190 getting changed largefiles
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 2 largefiles updated, 0 removed
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
largefiles: more safe handling of interruptions while updating modifications...
r30190 $ cat large1
manually modified before 'hg transplant --continue'
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ hg st
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 Force largefiles rehashing and check that all changes have been caught by
status and update:
Mads Kiilerich
largefiles: test coverage of fatal interruption of update...
r30189 $ rm .hg/largefiles/dirstate
$ hg st
FUJIWARA Katsunori
largefiles: update largefiles even if rebase is aborted by conflict...
r22288 $ cd ..
FUJIWARA Katsunori
largefiles: move "copyalltostore" invocation into "markcommitted"...
r23276
Test that "hg convert" avoids copying largefiles from the working
directory into store, because "hg convert" doesn't update largefiles
in the working directory (removing files under ".cache/largefiles"
forces "hg convert" to copy corresponding largefiles)
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
> EOF
$ rm $TESTTMP/.cache/largefiles/6a4f36d4075fbe0f30ec1d26ca44e63c05903671
$ hg convert -q repo repo.converted