Mercurial > hg
annotate tests/test-strict.t @ 23976:344939126579 stable
largefiles: don't interfere with logging normal files
The previous code was adding standin files to the matcher's file list when
neither the standin file nor the original existed in the context. Somehow, this
was confusing the logging code into behaving differently from when the extension
wasn't loaded.
It seems that this was an attempt to support naming a directory that only
contains largefiles, as a test fails if the else clause is dropped entirely.
Therefore, only append the "standin" if it is a directory. This was found by
running the test suite with --config extensions.largefiles=.
The first added test used to log an additional cset that wasn't logged normally.
The only relation it had to file 'a' is that 'a' was the source of a move, but
it isn't clear why having '.hglf/a' in the list causes this change:
@@ -47,6 +47,11 @@
Make sure largefiles doesn't interfere with logging a regular file
$ hg log a --config extensions.largefiles=
+ changeset: 3:2ca5ba701980
+ user: test
+ date: Thu Jan 01 00:00:04 1970 +0000
+ summary: d
+
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
The second added test used to complain about a file not being in the parent
revision:
@@ -1638,10 +1643,8 @@
Ensure that largefiles doesn't intefere with following a normal file
$ hg --config extensions.largefiles= log -f d -T '{desc}' -G
- @ c
- |
- o a
-
+ abort: cannot follow file not in parent revision: ".hglf/d"
+ [255]
$ hg log -f d/a -T '{desc}' -G
@ c
|
Note that there is still something fishy with the largefiles code, because when
using a glob pattern like this:
$ hg log 'glob:sub/*'
the pattern list would contain '.hglf/glob:sub/*'. None of the tests show this
(this test lives in test-largefiles.t at 1349), it was just something that I
noticed when the code was loaded up with print statements.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 30 Jan 2015 20:44:11 -0500 |
parents | 3bd577a3283e |
children | 7109d5ddeb0c |
rev | line source |
---|---|
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
1 $ hg init |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
3 $ echo a > a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
4 $ hg ci -Ama |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
5 adding a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
7 $ hg an a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
8 0: a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
16591
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
10 $ hg --config ui.strict=False an a |
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
11 0: a |
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
12 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
13 $ echo "[ui]" >> $HGRCPATH |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
14 $ echo "strict=True" >> $HGRCPATH |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
16 $ hg an a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
17 hg: unknown command 'an' |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
18 Mercurial Distributed SCM |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
19 |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
20 basic commands: |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
21 |
16853
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
22 add add the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
23 annotate show changeset information by line for each file |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
24 clone make a copy of an existing repository |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
25 commit commit the specified files or all outstanding changes |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
26 diff diff repository (or selected files) |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
27 export dump the header and diffs for one or more changesets |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
28 forget forget the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
29 init create a new repository in the given directory |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
30 log show revision history of entire repository or files |
23400
3bd577a3283e
merge: be precise about what merged into what in short desc
anatoly techtonik <techtonik@gmail.com>
parents:
22118
diff
changeset
|
31 merge merge another revision into working directory |
16853
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
32 pull pull changes from the specified source |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
33 push push changes to the specified destination |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
34 remove remove the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
35 serve start stand-alone webserver |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
36 status show changed files in the working directory |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
37 summary summarize working directory state |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
38 update update working directory (or switch revisions) |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
39 |
22118
9a299c39de01
help: normalize helplist hints
Matt Mackall <mpm@selenic.com>
parents:
17981
diff
changeset
|
40 (use "hg help" for the full list of commands or "hg -v" for details) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12097
diff
changeset
|
41 [255] |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
42 $ hg annotate a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
43 0: a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
44 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
45 should succeed - up is an alias, not an abbreviation |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
46 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
47 $ hg up |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |