Mercurial > hg
annotate tests/test-revlog-packentry.t @ 23923:ab6fd3205dad stable
largefiles: fix commit of a directory with no largefile changes (issue4330)
When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory. The directory is
then dropped from the list, so that committing a directory with no normal file
changes works. It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.
The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list. It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:
abort: .hglf/foo/bar: no match under directory!
This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().
The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences. It is not necessary to append '.'
for Windows to run the largefiles tests cleanly. But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory. The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory. This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4. It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit. I dont have access to an OS X machine ATM to test
there.
Maybe there's a better way to do this. But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this. There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is. The
added tests confirm this.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 18 Jan 2015 15:15:40 -0500 |
parents | 6cc1f388ac80 |
children | 009d0283de5f |
rev | line source |
---|---|
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
1 $ hg init repo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
2 $ cd repo |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
4 $ touch foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
5 $ hg ci -Am 'add foo' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
6 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
7 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
8 $ hg up -C null |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
9 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
11 this should be stored as a delta against rev 0 |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
13 $ echo foo bar baz > foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
14 $ hg ci -Am 'add foo again' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
15 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
16 created new head |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
11919
diff
changeset
|
18 $ hg debugindex foo |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
19 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
20 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) |
23285
6cc1f388ac80
revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents:
17132
diff
changeset
|
21 1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
22 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
23 $ cd .. |