view tests/test-merge1.out @ 2309:b2f37c7026ca

remove: rewrite to be ~400x faster, bit more friendly

old remove code called localrepo.changes for each file.
was very expensive:

  $ hg --time rm arch>/dev/null
  Time: real 1066.120 secs (user 1014.450+0.000 sys 18.090+0.000)

new code, same files:

  $ hg --time rm arch>/dev/null
  Time: real 2.770 secs (user 2.190+0.000 sys 0.580+0.000)

also mention "-f" if not removing files. also allow "-f" to forget
added files.

make test a bit better.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
%% no merges expected
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
%% merge should fail
abort: 'b' already exists in the working dir and differs from remote
%% merge of b expected
merging for b
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
%%
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Contents of b should be "this is file b1"
This is file b1
%% merge fails
abort: outstanding uncommitted changes
%% merge expected!
merging for b
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% merge of b should fail
abort: outstanding uncommitted changes
%% merge of b expected
merging for b
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)