tests/test-revert.out
author David Greenaway <hg-dev@davidgreenaway.com>
Sat, 03 Apr 2010 11:58:16 +1100
changeset 11060 e6df01776e08
parent 8518 3f4f14eab085
child 12067 a4fbbe0fbc38
permissions -rw-r--r--
findrenames: Optimise "addremove -s100" by matching files by their SHA1 hashes. We speed up 'findrenames' for the usecase when a user specifies they want a similarity of 100% by matching files by their exact SHA1 hash value. This reduces the number of comparisons required to find exact matches from O(n^2) to O(n). While it would be nice if we could just use mercurial's pre-calculated SHA1 hash for existing files, this hash includes the file's ancestor information making it unsuitable for our purposes. Instead, we calculate the hash of old content from scratch. The following benchmarks were taken on the current head of crew: addremove 100% similarity: rm -rf *; hg up -C; mv tests tests.new hg --time addremove -s100 --dry-run before: real 176.350 secs (user 128.890+0.000 sys 47.430+0.000) after: real 2.130 secs (user 1.890+0.000 sys 0.240+0.000) addremove 75% similarity: rm -rf *; hg up -C; mv tests tests.new; \ for i in tests.new/*; do echo x >> $i; done hg --time addremove -s75 --dry-run before: real 264.560 secs (user 215.130+0.000 sys 49.410+0.000) after: real 218.710 secs (user 172.790+0.000 sys 45.870+0.000)

%% should show b unknown
? b
%% should show b unknown and c modified
M c
? b
%% should show b added and c modified
M c
A b
%% should show a removed, b added and c modified
M c
A b
R a
%% should show b added, copy saved, and c modified
M c
A b
%% should show b unknown, and c modified
M c
? b
%% should show unknown: b
? b
%% should show b added
A b
%% should show b deleted
! b
forgetting b
%% should not find b
b: No such file or directory
%% should show a c e
a
c
e
%% should verbosely save backup to e.orig
saving current version of e as e.orig
reverting e
%% should say no changes needed
no changes needed to a
%% should say file not managed
file not managed: q
%% should say file not found
notfound: No such file in rev 095eacd0c0d7
A z
? e.orig
%% should add a, remove d, forget z
adding a
removing d
forgetting z
%% should forget a, undelete d
forgetting a
undeleting d
%% should silently add a
A a
R d
%% should silently keep d removed
R d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
reverting c
%% should print non-executable
non-executable
reverting c
%% should print executable
executable
%% issue 241
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail - no arguments
abort: no files or directories specified; use --all to revert the whole repo
% should succeed
reverting a
%% issue332
adding b/b
created new head
reverting b/b
forgetting newdir/newfile
reverting b/b
% reverting a rename target should revert the source
? newa
%% 4 ignored files (we will add/commit everything)
I ignored
I ignoreddir/file
I ignoreddir/removed
I removed
%% should revert ignored* and undelete *removed
reverting ignored
reverting ignoreddir/file
undeleting ignoreddir/removed
undeleting removed
%% should silently revert the named files