annotate tests/test-default-push.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 2be7d5ebd4d0
children 10917b062adf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
1 $ hg init a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
2
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
3 $ echo a > a/a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
4 $ hg --cwd a ci -Ama
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
5 adding a
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
6
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
7 $ hg clone a c
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
8 updating to branch default
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
10
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
11 $ hg clone a b
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
12 updating to branch default
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
14
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
15 $ echo b >> b/a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
16 $ hg --cwd b ci -mb
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
17
20558
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
18 Push should provide a hint when both 'default' and 'default-push' not set:
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
19 $ cd c
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
20 $ hg push --config paths.default=
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
21 pushing to default-push
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
22 abort: default repository not configured!
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
23 (see the "path" section in "hg help config")
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
24 [255]
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
25
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
26 $ cd ..
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
27
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
28 Push should push to 'default' when 'default-push' not set:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
29
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
30 $ hg --cwd b push
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
31 pushing to $TESTTMP/a (glob)
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
32 searching for changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
33 adding changesets
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
34 adding manifests
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
35 adding file changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
36 added 1 changesets with 1 changes to 1 files
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
37
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
38 Push should push to 'default-push' when set:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
39
22837
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 20558
diff changeset
40 $ echo '[paths]' >> b/.hg/hgrc
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
41 $ echo 'default-push = ../c' >> b/.hg/hgrc
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
42 $ hg --cwd b push
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
43 pushing to $TESTTMP/c (glob)
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
44 searching for changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
45 adding changesets
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
46 adding manifests
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
47 adding file changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
48 added 1 changesets with 1 changes to 1 files