mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
8f9bcf232a
Summary: Modify the status command to prefer comparing content sha256 when comparing files over comparing content directly, using cached aux data when possible and writing newly computed hashes to cache. A new config option, `scmstore.status`, gates this new behavior. When `scmstore.status` is enabled, the `status` output should be more accurate, not assuming files with non-matching `HgId`s in an arbitrary pair of revisions are different. As written, this will cause fetching of data that wouldn't otherwise be fetched, but remote fetching of aux data is planned. This change also doesn't introduce batch fetching, this is planned. Reviewed By: DurhamG Differential Revision: D28826219 fbshipit-source-id: dcd253f169723983738148559d61ba655dd453a4
593 lines
11 KiB
Perl
593 lines
11 KiB
Perl
#chg-compatible
|
|
|
|
$ newserver server
|
|
$ newremoterepo
|
|
$ setconfig scmstore.auxindexedlog=true
|
|
$ setconfig scmstore.status=true
|
|
|
|
$ mkdir a b a/1 b/1 b/2
|
|
$ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
|
|
|
|
hg status in repo root:
|
|
|
|
$ hg status
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
|
|
hg status . in repo root:
|
|
|
|
$ hg status .
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
|
|
$ hg status --cwd a
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
$ hg status --cwd a .
|
|
? 1/in_a_1
|
|
? in_a
|
|
$ hg status --cwd a ..
|
|
? 1/in_a_1
|
|
? in_a
|
|
? ../b/1/in_b_1
|
|
? ../b/2/in_b_2
|
|
? ../b/in_b
|
|
? ../in_root
|
|
|
|
$ hg status --cwd b
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
$ hg status --cwd b .
|
|
? 1/in_b_1
|
|
? 2/in_b_2
|
|
? in_b
|
|
$ hg status --cwd b ..
|
|
? ../a/1/in_a_1
|
|
? ../a/in_a
|
|
? 1/in_b_1
|
|
? 2/in_b_2
|
|
? in_b
|
|
? ../in_root
|
|
|
|
$ hg status --cwd a/1
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
$ hg status --cwd a/1 .
|
|
? in_a_1
|
|
$ hg status --cwd a/1 ..
|
|
? in_a_1
|
|
? ../in_a
|
|
|
|
$ hg status --cwd b/1
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
$ hg status --cwd b/1 .
|
|
? in_b_1
|
|
$ hg status --cwd b/1 ..
|
|
? in_b_1
|
|
? ../2/in_b_2
|
|
? ../in_b
|
|
|
|
$ hg status --cwd b/2
|
|
? a/1/in_a_1
|
|
? a/in_a
|
|
? b/1/in_b_1
|
|
? b/2/in_b_2
|
|
? b/in_b
|
|
? in_root
|
|
$ hg status --cwd b/2 .
|
|
? in_b_2
|
|
$ hg status --cwd b/2 ..
|
|
? ../1/in_b_1
|
|
? in_b_2
|
|
? ../in_b
|
|
|
|
combining patterns with root and patterns without a root works
|
|
|
|
$ hg st a/in_a re:.*b$
|
|
? a/in_a
|
|
? b/in_b
|
|
|
|
relative paths can be requested
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [commands]
|
|
> status.relative = True
|
|
> EOF
|
|
$ hg status --cwd a
|
|
? 1/in_a_1
|
|
? in_a
|
|
? ../b/1/in_b_1
|
|
? ../b/2/in_b_2
|
|
? ../b/in_b
|
|
? ../in_root
|
|
$ HGPLAIN=1 hg status --cwd a
|
|
? a/1/in_a_1 (glob)
|
|
? a/in_a (glob)
|
|
? b/1/in_b_1 (glob)
|
|
? b/2/in_b_2 (glob)
|
|
? b/in_b (glob)
|
|
? in_root
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [commands]
|
|
> status.relative = False
|
|
> EOF
|
|
|
|
$ cd ..
|
|
|
|
$ newremoterepo
|
|
$ setconfig scmstore.auxindexedlog=true
|
|
$ setconfig scmstore.status=true
|
|
$ touch modified removed deleted ignored
|
|
$ echo "ignored" > .gitignore
|
|
$ hg ci -A -m 'initial checkin'
|
|
adding .gitignore
|
|
adding deleted
|
|
adding modified
|
|
adding removed
|
|
$ touch modified added unknown ignored
|
|
$ hg add added
|
|
$ hg remove removed
|
|
$ rm deleted
|
|
|
|
hg status:
|
|
|
|
$ hg status
|
|
A added
|
|
R removed
|
|
! deleted
|
|
? unknown
|
|
|
|
hg status modified added removed deleted unknown never-existed ignored:
|
|
|
|
$ hg status modified added removed deleted unknown never-existed ignored
|
|
never-existed: * (glob)
|
|
A added
|
|
R removed
|
|
! deleted
|
|
? unknown
|
|
|
|
$ hg copy modified copied
|
|
|
|
hg status -C:
|
|
|
|
$ hg status -C
|
|
A added
|
|
A copied
|
|
modified
|
|
R removed
|
|
! deleted
|
|
? unknown
|
|
|
|
hg status -A:
|
|
|
|
$ hg status -A
|
|
A added
|
|
A copied
|
|
modified
|
|
R removed
|
|
! deleted
|
|
? unknown
|
|
I ignored
|
|
C .gitignore
|
|
C modified
|
|
|
|
$ hg status -A -Tjson
|
|
[
|
|
{
|
|
"path": "added",
|
|
"status": "A"
|
|
},
|
|
{
|
|
"copy": "modified",
|
|
"path": "copied",
|
|
"status": "A"
|
|
},
|
|
{
|
|
"path": "removed",
|
|
"status": "R"
|
|
},
|
|
{
|
|
"path": "deleted",
|
|
"status": "!"
|
|
},
|
|
{
|
|
"path": "unknown",
|
|
"status": "?"
|
|
},
|
|
{
|
|
"path": "ignored",
|
|
"status": "I"
|
|
},
|
|
{
|
|
"path": ".gitignore",
|
|
"status": "C"
|
|
},
|
|
{
|
|
"path": "modified",
|
|
"status": "C"
|
|
}
|
|
]
|
|
|
|
$ echo "ignoreddir/" > .gitignore
|
|
$ mkdir ignoreddir
|
|
$ touch ignoreddir/file
|
|
|
|
Test templater support:
|
|
|
|
$ hg status -AT "[{status}]\t{if(copy, '{copy} -> ')}{path}\n"
|
|
[M] .gitignore
|
|
[A] added
|
|
[A] modified -> copied
|
|
[R] removed
|
|
[!] deleted
|
|
[?] ignored
|
|
[?] unknown
|
|
[I] ignoreddir/file
|
|
[C] modified
|
|
$ hg status -AT default
|
|
M .gitignore
|
|
A added
|
|
A copied
|
|
modified
|
|
R removed
|
|
! deleted
|
|
? ignored
|
|
? unknown
|
|
I ignoreddir/file
|
|
C modified
|
|
$ hg status -T compact
|
|
abort: "status" not in template map
|
|
[255]
|
|
$ hg status --cwd ignoreddir -AT "{status}: {path} :: {relpath(path)}\n"
|
|
M: .gitignore :: ../.gitignore
|
|
A: added :: ../added
|
|
A: copied :: ../copied
|
|
R: removed :: ../removed
|
|
!: deleted :: ../deleted
|
|
?: ignored :: ../ignored
|
|
?: unknown :: ../unknown
|
|
I: ignoreddir/file :: file
|
|
C: modified :: ../modified
|
|
|
|
hg status ignoreddir/file:
|
|
|
|
$ hg status ignoreddir/file
|
|
|
|
hg status -i ignoreddir/file:
|
|
|
|
$ hg status -i ignoreddir/file
|
|
I ignoreddir/file
|
|
$ cd ..
|
|
|
|
Check 'status -q' and some combinations
|
|
|
|
$ newremoterepo
|
|
$ setconfig scmstore.auxindexedlog=true
|
|
$ setconfig scmstore.status=true
|
|
$ touch modified removed deleted ignored
|
|
$ echo "ignored" > .gitignore
|
|
$ hg commit -A -m 'initial checkin'
|
|
adding .gitignore
|
|
adding deleted
|
|
adding modified
|
|
adding removed
|
|
$ touch added unknown ignored
|
|
$ hg add added
|
|
$ echo "test" >> modified
|
|
$ hg remove removed
|
|
$ rm deleted
|
|
$ hg copy modified copied
|
|
|
|
Specify working directory revision explicitly, that should be the same as
|
|
"hg status"
|
|
|
|
$ hg status --change "wdir()"
|
|
M modified
|
|
A added
|
|
A copied
|
|
R removed
|
|
! deleted
|
|
? unknown
|
|
|
|
Run status with 2 different flags.
|
|
Check if result is the same or different.
|
|
If result is not as expected, raise error
|
|
|
|
$ assert() {
|
|
> hg status $1 > ../a
|
|
> hg status $2 > ../b
|
|
> if diff ../a ../b > /dev/null; then
|
|
> out=0
|
|
> else
|
|
> out=1
|
|
> fi
|
|
> if [ $3 -eq 0 ]; then
|
|
> df="same"
|
|
> else
|
|
> df="different"
|
|
> fi
|
|
> if [ $out -ne $3 ]; then
|
|
> echo "Error on $1 and $2, should be $df."
|
|
> fi
|
|
> }
|
|
|
|
Assert flag1 flag2 [0-same | 1-different]
|
|
|
|
$ assert "-q" "-mard" 0
|
|
$ assert "-A" "-marduicC" 0
|
|
$ assert "-qA" "-mardcC" 0
|
|
$ assert "-qAui" "-A" 0
|
|
$ assert "-qAu" "-marducC" 0
|
|
$ assert "-qAi" "-mardicC" 0
|
|
$ assert "-qu" "-u" 0
|
|
$ assert "-q" "-u" 1
|
|
$ assert "-m" "-a" 1
|
|
$ assert "-r" "-d" 1
|
|
$ cd ..
|
|
|
|
$ newremoterepo
|
|
$ setconfig scmstore.auxindexedlog=true
|
|
$ setconfig scmstore.status=true
|
|
$ touch modified removed deleted
|
|
$ hg ci -q -A -m 'initial checkin'
|
|
$ touch added unknown
|
|
$ hg add added
|
|
$ hg remove removed
|
|
$ rm deleted
|
|
$ echo x > modified
|
|
$ hg copy modified copied
|
|
$ hg ci -m 'test checkin' -d "1000001 0"
|
|
$ rm *
|
|
$ touch unrelated
|
|
$ hg ci -q -A -m 'unrelated checkin' -d "1000002 0"
|
|
|
|
hg status --change 1:
|
|
|
|
$ hg status --change 'desc(test)'
|
|
M modified
|
|
A added
|
|
A copied
|
|
R removed
|
|
|
|
hg status --change 1 unrelated:
|
|
|
|
$ hg status --change 'desc(test)' unrelated
|
|
|
|
hg status -C --change 1 added modified copied removed deleted:
|
|
|
|
$ hg status -C --change 'desc(test)' added modified copied removed deleted
|
|
M modified
|
|
A added
|
|
A copied
|
|
modified
|
|
R removed
|
|
|
|
hg status -A --change 1 and revset:
|
|
|
|
$ hg status -A --change '1|1'
|
|
M modified
|
|
A added
|
|
A copied
|
|
modified
|
|
R removed
|
|
C deleted
|
|
|
|
$ cd ..
|
|
|
|
hg status with --rev and reverted changes:
|
|
|
|
$ newremoterepo
|
|
$ setconfig scmstore.auxindexedlog=true
|
|
$ setconfig scmstore.status=true
|
|
$ echo a > file
|
|
$ hg add file
|
|
$ hg ci -m a
|
|
$ echo b > file
|
|
$ hg ci -m b
|
|
|
|
reverted file should appear clean
|
|
|
|
$ hg revert -r 'desc(a)' .
|
|
reverting file
|
|
$ hg status -A --rev 'desc(a)'
|
|
C file
|
|
|
|
#if execbit
|
|
reverted file with changed flag should appear modified
|
|
|
|
$ chmod +x file
|
|
$ hg status -A --rev 'desc(a)'
|
|
M file
|
|
|
|
$ hg revert -r 'desc(a)' .
|
|
reverting file
|
|
|
|
reverted and committed file with changed flag should appear modified
|
|
|
|
$ hg co -C .
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ chmod +x file
|
|
$ hg ci -m 'change flag'
|
|
$ hg status -A --rev 1 --rev 2
|
|
M file
|
|
$ hg diff -r 1 -r 2
|
|
|
|
#endif
|
|
|
|
$ cd ..
|
|
|
|
hg status of binary file starting with '\1\n', a separator for metadata:
|
|
|
|
$ newremoterepo
|
|
>>> _ = open("010a", "wb").write(b"\1\nfoo")
|
|
$ hg ci -q -A -m 'initial checkin'
|
|
$ hg status -A
|
|
C 010a
|
|
|
|
>>> _ = open("010a", "wb").write(b"\1\nbar")
|
|
$ hg status -A
|
|
M 010a
|
|
$ hg ci -q -m 'modify 010a'
|
|
$ hg status -A --rev 'desc(initial)':'desc(modify)'
|
|
M 010a
|
|
|
|
$ touch empty
|
|
$ hg ci -q -A -m 'add another file'
|
|
$ hg status -A --rev 'desc(modify)':'desc(add)' 010a
|
|
C 010a
|
|
|
|
$ cd ..
|
|
|
|
test "hg status" with "directory pattern" which matches against files
|
|
only known on target revision.
|
|
|
|
$ newremoterepo
|
|
$ setconfig scmstore.auxindexedlog=true
|
|
$ setconfig scmstore.status=true
|
|
|
|
$ echo a > a.txt
|
|
$ hg add a.txt
|
|
$ hg commit -m '#0'
|
|
$ mkdir -p 1/2/3/4/5
|
|
$ echo b > 1/2/3/4/5/b.txt
|
|
$ hg add 1/2/3/4/5/b.txt
|
|
$ hg commit -m '#1'
|
|
|
|
$ hg update -C 10edc5093fbb6ac8a9eea22a09d22f54188ab09b > /dev/null
|
|
$ hg status -A
|
|
C a.txt
|
|
|
|
the directory matching against specified pattern should be removed,
|
|
because directory existence prevents 'dirstate.walk()' from showing
|
|
warning message about such pattern.
|
|
|
|
$ test ! -d 1
|
|
$ hg status -A --rev ee72294a8de6a26660665d7de06754da195b361c 1/2/3/4/5/b.txt
|
|
R 1/2/3/4/5/b.txt
|
|
$ hg status -A --rev ee72294a8de6a26660665d7de06754da195b361c 1/2/3/4/5
|
|
R 1/2/3/4/5/b.txt
|
|
$ hg status -A --rev ee72294a8de6a26660665d7de06754da195b361c 1/2/3
|
|
R 1/2/3/4/5/b.txt
|
|
$ hg status -A --rev ee72294a8de6a26660665d7de06754da195b361c 1
|
|
R 1/2/3/4/5/b.txt
|
|
|
|
$ hg status --config ui.formatdebug=True --rev ee72294a8de6a26660665d7de06754da195b361c 1
|
|
status = [
|
|
{*'path': '1/2/3/4/5/b.txt'*}, (glob)
|
|
]
|
|
|
|
#if windows
|
|
$ hg --config ui.slash=false status -A --rev 1 1
|
|
R 1\2\3\4\5\b.txt
|
|
$ HGPLAIN=1 hg --config ui.slash=false status -A --rev 1 1
|
|
R 1/2/3/4/5/b.txt
|
|
$ hg --config ui.slash=true status -A --rev 1 1
|
|
R 1/2/3/4/5/b.txt
|
|
#endif
|
|
|
|
$ cd ..
|
|
|
|
Status after move overwriting a file (issue4458)
|
|
=================================================
|
|
|
|
|
|
$ hg init issue4458
|
|
$ cd issue4458
|
|
$ echo a > a
|
|
$ echo b > b
|
|
$ hg commit -Am base
|
|
adding a
|
|
adding b
|
|
|
|
|
|
with --force
|
|
|
|
$ hg mv b --force a
|
|
$ hg st --copies
|
|
M a
|
|
b
|
|
R b
|
|
$ hg revert --all
|
|
reverting a
|
|
undeleting b
|
|
$ rm *.orig
|
|
|
|
without force
|
|
|
|
$ hg rm a
|
|
$ hg st --copies
|
|
R a
|
|
$ hg mv b a
|
|
$ hg st --copies
|
|
M a
|
|
b
|
|
R b
|
|
|
|
using ui.statuscopies setting
|
|
$ hg st --config ui.statuscopies=true
|
|
M a
|
|
b
|
|
R b
|
|
$ hg st --config ui.statuscopies=false
|
|
M a
|
|
R b
|
|
|
|
using log status template (issue5155)
|
|
$ hg log -Tstatus -r 'wdir()' -C
|
|
commit: ffffffffffff
|
|
user: test
|
|
date: * (glob)
|
|
files:
|
|
M a
|
|
b
|
|
R b
|
|
|
|
|
|
Other "bug" highlight, the revision status does not report the copy information.
|
|
This is buggy behavior.
|
|
|
|
$ hg commit -m 'blah'
|
|
$ hg st --copies --change .
|
|
M a
|
|
R b
|
|
|
|
using log status template, the copy information is displayed correctly.
|
|
$ hg log -Tstatus -r. -C
|
|
commit: 6685fde43d21
|
|
user: test
|
|
date: * (glob)
|
|
summary: blah
|
|
files:
|
|
M a
|
|
b
|
|
R b
|
|
|
|
|
|
$ cd ..
|