mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
3c940eb21b
The problem was that the former name and the new name are both normalized to the case in dirstate, so matcher._files would be ['ABC.txt', 'ABC.txt']. localrepo.commit() calls localrepo.status(), passing along the matcher. Inside dirstate.status(), _walkexplicit() simply grabs matcher.files() and processes those items. Since the old name isn't present, it is silently dropped. There's a fundamental tension here, because the status command should also accept files that don't match the filesystem, so we can't drop the normalization in status. The problem originated in d70aa474bd84. Unfortunately with this change, the case of the old file must still be specified exactly, or the old file is again silently excluded. I went back to d70aa474bd84^, and that had the same behavior, so we are no worse off. I'm open to ideas from a matcher or dirstate expert on how to fix that half.
250 lines
5.2 KiB
Perl
250 lines
5.2 KiB
Perl
$ hg init a
|
|
$ cd a
|
|
$ echo a > a
|
|
$ hg add -n
|
|
adding a
|
|
$ hg st
|
|
? a
|
|
$ hg add
|
|
adding a
|
|
$ hg st
|
|
A a
|
|
$ hg forget a
|
|
$ hg add
|
|
adding a
|
|
$ hg st
|
|
A a
|
|
|
|
$ echo b > b
|
|
$ hg add -n b
|
|
$ hg st
|
|
A a
|
|
? b
|
|
$ hg add b
|
|
$ hg st
|
|
A a
|
|
A b
|
|
|
|
should fail
|
|
|
|
$ hg add b
|
|
b already tracked!
|
|
$ hg st
|
|
A a
|
|
A b
|
|
|
|
#if no-windows
|
|
$ echo foo > con.xml
|
|
$ hg --config ui.portablefilenames=jump add con.xml
|
|
abort: ui.portablefilenames value is invalid ('jump')
|
|
[255]
|
|
$ hg --config ui.portablefilenames=abort add con.xml
|
|
abort: filename contains 'con', which is reserved on Windows: 'con.xml'
|
|
[255]
|
|
$ hg st
|
|
A a
|
|
A b
|
|
? con.xml
|
|
$ hg add con.xml
|
|
warning: filename contains 'con', which is reserved on Windows: 'con.xml'
|
|
$ hg st
|
|
A a
|
|
A b
|
|
A con.xml
|
|
$ hg forget con.xml
|
|
$ rm con.xml
|
|
#endif
|
|
|
|
#if eol-in-paths
|
|
$ echo bla > 'hello:world'
|
|
$ hg --config ui.portablefilenames=abort add
|
|
adding hello:world
|
|
abort: filename contains ':', which is reserved on Windows: 'hello:world'
|
|
[255]
|
|
$ hg st
|
|
A a
|
|
A b
|
|
? hello:world
|
|
$ hg --config ui.portablefilenames=ignore add
|
|
adding hello:world
|
|
$ hg st
|
|
A a
|
|
A b
|
|
A hello:world
|
|
#endif
|
|
|
|
$ hg ci -m 0 --traceback
|
|
|
|
$ hg log -r "heads(. or wdir() & file('**'))"
|
|
changeset: 0:* (glob)
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: 0
|
|
|
|
should fail
|
|
|
|
$ hg add a
|
|
a already tracked!
|
|
|
|
$ echo aa > a
|
|
$ hg ci -m 1
|
|
$ hg up 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo aaa > a
|
|
$ hg ci -m 2
|
|
created new head
|
|
|
|
$ hg merge
|
|
merging a
|
|
warning: conflicts during merge.
|
|
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
$ hg st
|
|
M a
|
|
? a.orig
|
|
|
|
wdir doesn't cause a crash, and can be dynamically selected if dirty
|
|
|
|
$ hg log -r "heads(. or wdir() & file('**'))"
|
|
changeset: 2147483647:ffffffffffff
|
|
parent: 2:* (glob)
|
|
parent: 1:* (glob)
|
|
user: test
|
|
date: * (glob)
|
|
|
|
should fail
|
|
|
|
$ hg add a
|
|
a already tracked!
|
|
$ hg st
|
|
M a
|
|
? a.orig
|
|
$ hg resolve -m a
|
|
(no more unresolved files)
|
|
$ hg ci -m merge
|
|
|
|
Issue683: peculiarity with hg revert of an removed then added file
|
|
|
|
$ hg forget a
|
|
$ hg add a
|
|
$ hg st
|
|
? a.orig
|
|
$ hg rm a
|
|
$ hg st
|
|
R a
|
|
? a.orig
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg st
|
|
M a
|
|
? a.orig
|
|
|
|
Forgotten file can be added back (as either clean or modified)
|
|
|
|
$ hg forget b
|
|
$ hg add b
|
|
$ hg st -A b
|
|
C b
|
|
$ hg forget b
|
|
$ echo modified > b
|
|
$ hg add b
|
|
$ hg st -A b
|
|
M b
|
|
$ hg revert -qC b
|
|
|
|
$ hg add c && echo "unexpected addition of missing file"
|
|
c: * (glob)
|
|
[1]
|
|
$ echo c > c
|
|
$ hg add d c && echo "unexpected addition of missing file"
|
|
d: * (glob)
|
|
[1]
|
|
$ hg st
|
|
M a
|
|
A c
|
|
? a.orig
|
|
$ hg up -C
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
forget and get should have the right order: added but missing dir should be
|
|
forgotten before file with same name is added
|
|
|
|
$ echo file d > d
|
|
$ hg add d
|
|
$ hg ci -md
|
|
$ hg rm d
|
|
$ mkdir d
|
|
$ echo a > d/a
|
|
$ hg add d/a
|
|
$ rm -r d
|
|
$ hg up -C
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cat d
|
|
file d
|
|
|
|
Test that adding a directory doesn't require case matching (issue4578)
|
|
#if icasefs
|
|
$ mkdir -p CapsDir1/CapsDir
|
|
$ echo abc > CapsDir1/CapsDir/AbC.txt
|
|
$ mkdir CapsDir1/CapsDir/SubDir
|
|
$ echo def > CapsDir1/CapsDir/SubDir/Def.txt
|
|
|
|
$ hg add capsdir1/capsdir
|
|
adding CapsDir1/CapsDir/AbC.txt (glob)
|
|
adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
|
|
$ hg forget capsdir1/capsdir/abc.txt
|
|
removing CapsDir1/CapsDir/AbC.txt (glob)
|
|
|
|
$ hg forget capsdir1/capsdir
|
|
removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
|
|
$ hg add capsdir1
|
|
adding CapsDir1/CapsDir/AbC.txt (glob)
|
|
adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
|
|
$ hg ci -m "AbCDef" capsdir1/capsdir
|
|
|
|
$ hg status -A capsdir1/capsdir
|
|
C CapsDir1/CapsDir/AbC.txt
|
|
C CapsDir1/CapsDir/SubDir/Def.txt
|
|
|
|
$ hg files capsdir1/capsdir
|
|
CapsDir1/CapsDir/AbC.txt (glob)
|
|
CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
|
|
$ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt
|
|
$ hg ci -m xyz capsdir1/capsdir/subdir/def.txt
|
|
|
|
$ hg revert -r '.^' capsdir1/capsdir
|
|
reverting CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
|
|
The conditional tests above mean the hash on the diff line differs on Windows
|
|
and OS X
|
|
$ hg diff capsdir1/capsdir
|
|
diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
--- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob)
|
|
@@ -1,1 +1,1 @@
|
|
-xyz
|
|
+def
|
|
|
|
$ hg mv CapsDir1/CapsDir/abc.txt CapsDir1/CapsDir/ABC.txt
|
|
moving CapsDir1/CapsDir/AbC.txt to CapsDir1/CapsDir/ABC.txt (glob)
|
|
$ hg ci -m "case changing rename" CapsDir1/CapsDir/AbC.txt CapsDir1/CapsDir/ABC.txt
|
|
|
|
$ hg status -A capsdir1/capsdir
|
|
M CapsDir1/CapsDir/SubDir/Def.txt
|
|
C CapsDir1/CapsDir/ABC.txt
|
|
|
|
$ hg remove -f 'glob:**.txt' -X capsdir1/capsdir
|
|
$ hg remove -f 'glob:**.txt' -I capsdir1/capsdir
|
|
removing CapsDir1/CapsDir/ABC.txt (glob)
|
|
removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
|
#endif
|
|
|
|
$ cd ..
|