Mercurial > hg
view tests/test-histedit-bookmark-motion.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 | a79776f427b4 |
children | bb6149f1db83 |
line wrap: on
line source
$ . "$TESTDIR/histedit-helpers.sh" $ cat >> $HGRCPATH <<EOF > [extensions] > graphlog= > histedit= > EOF $ hg init r $ cd r $ for x in a b c d e f ; do > echo $x > $x > hg add $x > hg ci -m $x > done $ hg book -r 1 will-move-backwards $ hg book -r 2 two $ hg book -r 2 also-two $ hg book -r 3 three $ hg book -r 4 four $ hg book -r tip five $ hg log --graph @ changeset: 5:652413bf663e | bookmark: five | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | o changeset: 4:e860deea161a | bookmark: four | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | o changeset: 3:055a42cdd887 | bookmark: three | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d | o changeset: 2:177f92b77385 | bookmark: also-two | bookmark: two | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: c | o changeset: 1:d2ae7f538514 | bookmark: will-move-backwards | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: b | o changeset: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a $ HGEDITOR=cat hg histedit 1 pick d2ae7f538514 1 b pick 177f92b77385 2 c pick 055a42cdd887 3 d pick e860deea161a 4 e pick 652413bf663e 5 f # Edit history between d2ae7f538514 and 652413bf663e # # 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 $ cat >> commands.txt <<EOF > pick 177f92b77385 2 c > drop d2ae7f538514 1 b > pick 055a42cdd887 3 d > fold e860deea161a 4 e > pick 652413bf663e 5 f > EOF $ hg histedit 1 --commands commands.txt --verbose | grep histedit histedit: Should update metadata for the following changes: histedit: 055a42cdd887 to ae467701c500 histedit: moving bookmarks three histedit: 177f92b77385 to d36c0562f908 histedit: moving bookmarks also-two, two histedit: 652413bf663e to 0efacef7cb48 histedit: moving bookmarks five histedit: d2ae7f538514 to cb9a9f314b8b histedit: moving bookmarks will-move-backwards histedit: e860deea161a to ae467701c500 histedit: moving bookmarks four saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob) saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg (glob) $ hg log --graph @ changeset: 3:0efacef7cb48 | bookmark: five | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | o changeset: 2:ae467701c500 | bookmark: four | bookmark: three | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d | o changeset: 1:d36c0562f908 | bookmark: also-two | bookmark: two | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: c | o changeset: 0:cb9a9f314b8b bookmark: will-move-backwards user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a $ HGEDITOR=cat hg histedit 1 pick d36c0562f908 1 c pick ae467701c500 2 d pick 0efacef7cb48 3 f # Edit history between d36c0562f908 and 0efacef7cb48 # # 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 $ cat > commands.txt << EOF > pick d36c0562f908 1 c > pick 0efacef7cb48 3 f > pick ae467701c500 2 d > EOF $ hg histedit 1 --commands commands.txt --verbose | grep histedit histedit: Should update metadata for the following changes: histedit: 0efacef7cb48 to 1be9c35b4cb2 histedit: moving bookmarks five histedit: 0efacef7cb48 to 7c044e3e33a9 histedit: ae467701c500 to 1be9c35b4cb2 histedit: moving bookmarks four, three saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg (glob) We expect 'five' to stay at tip, since the tipmost bookmark is most likely the useful signal. $ hg log --graph @ changeset: 3:1be9c35b4cb2 | bookmark: five | bookmark: four | bookmark: three | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d | o changeset: 2:7c044e3e33a9 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | o changeset: 1:d36c0562f908 | bookmark: also-two | bookmark: two | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: c | o changeset: 0:cb9a9f314b8b bookmark: will-move-backwards user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a