Mercurial > hg
view tests/test-commandserver.py.out @ 20275:2123d27ff75d
backout: avoid update on simple case.
Before the changeset the backout process was:
1) go to <target>
2) revert to <target> parent
3) update back to changeset we came from
The two update steps can takes a very long time to move back and forth unrelated
file change between <target> and current working directory.
The new process is just merging current working directory with the parent of
<target> using <target> as ancestor. This give the very same result but skip
the two updates. On big repo with a lot of files and changes that save a lots of
time (x20 for one week window).
The "merge" version (hg backout --merge) is still done with upgrades. We could
imagine using in memory commit to speed it up but this is another fish.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 08 Jan 2014 14:53:46 -0800 |
parents | 49d4919d21c2 |
children | 69a0d22b9677 |
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 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.shelve=--date "0 0" defaults.tag=-d "0 0" ui.slash=True ui.interactive=False ui.foo=bar runcommand init foo runcommand -R foo showconfig ui defaults defaults.backout=-d "0 0" defaults.commit=-d "0 0" defaults.shelve=--date "0 0" defaults.tag=-d "0 0" ui.slash=True ui.interactive=False 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 testing phasecacheafterstrip: runcommand update -C 0 1 files updated, 0 files merged, 2 files removed, 0 files unresolved runcommand commit -Am. a created new head runcommand log -Gq @ 5:731265503d86 | | o 4:7966c8e3734d | | | o 3:b9b85890c400 | | | o 2:aef17e88f5f0 | | | o 1:d3a0a68be6de |/ o 0:eff892de26ec runcommand phase -p . runcommand phase . 5: public runcommand branches default 1:731265503d86