Mercurial > hg
view tests/test-commandserver.py.out @ 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 | 7863ff383894 |
children | e689b0d91546 |
line wrap: on
line source
testing hellomessage: o, 'capabilities: getencoding runcommand\nencoding: ***' runcommand id 000000000000 tip testing unknowncommand: abort: unknown command unknowncommand testing checkruncommand: runcommand Mercurial Distributed SCM basic commands: add add the specified files on the next commit annotate show changeset information by line for each file clone make a copy of an existing repository commit commit the specified files or all outstanding changes diff diff repository (or selected files) export dump the header and diffs for one or more changesets forget forget the specified files on the next commit init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit serve start stand-alone webserver status show changed files in the working directory summary summarize working directory state update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details runcommand id --quiet 000000000000 runcommand id 000000000000 tip runcommand id --config ui.quiet=True 000000000000 runcommand id 000000000000 tip testing inputeof: server exit code = 1 testing serverinput: runcommand import - applying patch from stdin runcommand log changeset: 0:eff892de26ec tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 1 testing cwd: runcommand --cwd foo st bar ? bar runcommand st foo/bar ? foo/bar testing localhgrc: runcommand showconfig bundle.mainreporoot=$TESTTMP defaults.backout=-d "0 0" defaults.commit=-d "0 0" defaults.tag=-d "0 0" ui.slash=True ui.foo=bar runcommand init foo runcommand -R foo showconfig ui defaults defaults.backout=-d "0 0" defaults.commit=-d "0 0" defaults.tag=-d "0 0" ui.slash=True testing hookoutput: runcommand --config hooks.pre-identify=python:test-commandserver.hook id hook talking now try to read something: 'some input' eff892de26ec tip testing outsidechanges: runcommand status M a runcommand tip changeset: 1:d3a0a68be6de tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 2 runcommand status testing bookmarks: runcommand bookmarks no bookmarks set runcommand bookmarks bm1 1:d3a0a68be6de bm2 1:d3a0a68be6de runcommand bookmarks * bm1 1:d3a0a68be6de bm2 1:d3a0a68be6de runcommand bookmarks bm3 runcommand commit -Amm runcommand bookmarks bm1 1:d3a0a68be6de bm2 1:d3a0a68be6de * bm3 2:aef17e88f5f0 testing tagscache: runcommand id -t -r 0 runcommand id -t -r 0 foo testing setphase: runcommand phase -r . 3: draft runcommand phase -r . 3: public testing rollback: runcommand phase -r . -p no phases changed runcommand commit -Am. runcommand rollback repository tip rolled back to revision 3 (undo commit) working directory now based on revision 3 runcommand phase -r . 3: public testing branch: runcommand branch default marked working directory as branch foo (branches are permanent and global, did you want a bookmark?) runcommand branch foo marked working directory as branch default (branches are permanent and global, did you want a bookmark?) testing hgignore: runcommand commit -Am. adding .hgignore runcommand status -i -u I ignored-file