Mercurial > hg
view tests/test-histedit-revspec.t @ 17658:a02c1ffddae9 stable
largefiles: handle commit -A properly, after a --large commit (issue3542)
Previous to this, 'commit -A' would add as normal files, files that were already
committed as largefiles, resulting in files being listed twice by 'status -A'.
It also missed when (only) a largefile was deleted, even though status reported
it as '!'. This also has the side effect of properly reporting the state of the
affected largefiles in the post commit hook after a remove that also affected a
normal file (the largefiles used to be 'R', now are properly absent).
Since scmutil.addremove() is called both by the ui command (after some trivial
argument validation) and during the commit process when -A is specified, it
seems like a more appropriate method to wrap than the addremove command.
Currently, a repo is only enabled to use largefiles after an add that explicitly
identifies some file as large, and a subsequent commit. Therefore, this patch
only changes behavior after such a largefile enabling commit.
Note that in the test, if the final commit had a '-v', 'removing large8' would
be printed twice. Both of these originate in removelargefiles(). The first
print is in verbose mode after traversing remove + forget, the second is because
the '_isaddremove' attr is set and 'after' is not.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 30 Jul 2012 20:56:41 -0400 |
parents | 949e241b5573 |
children | d9da327516f8 |
line wrap: on
line source
This test requires parentrevspec support in revsets, so check for that and skip the test if we're on an unusual hg that supports .t tests but not parentrevspec. $ python -c 'from mercurial import revset ; revset.methods["parentpost"]' || exit 80 Enable extensions used by this test. $ cat >>$HGRCPATH <<EOF > [extensions] > graphlog= > histedit= > EOF Repo setup. $ hg init foo $ cd foo $ echo alpha >> alpha $ hg addr adding alpha $ hg ci -m one $ echo alpha >> alpha $ hg ci -m two $ echo alpha >> alpha $ hg ci -m three $ echo alpha >> alpha $ hg ci -m four $ echo alpha >> alpha $ hg ci -m five $ hg log --style compact --graph @ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test | five | o 3 c8e68270e35a 1970-01-01 00:00 +0000 test | four | o 2 eb57da33312f 1970-01-01 00:00 +0000 test | three | o 1 579e40513370 1970-01-01 00:00 +0000 test | two | o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test one Run a dummy edit to make sure we get tip^^ correctly via revsingle. $ HGEDITOR=cat hg histedit "tip^^" pick eb57da33312f 2 three pick c8e68270e35a 3 four pick 08d98a8350f3 4 five # Edit history between eb57da33312f and 08d98a8350f3 # # Commands: # p, pick = use commit # e, edit = use commit, but stop for amending # f, fold = use commit, but fold into previous commit (combines N and N-1) # d, drop = remove commit from history # m, mess = edit message without changing commit content # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved