facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
582f47c3b4
sapling/tests/test-undo.t

707 lines
21 KiB
Perl
Raw Normal View History

undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
$ cat >> $HGRCPATH <<EOF
> [extensions]
> undo = $TESTDIR/../hgext3rd/undo.py
undo: implements relative undo, hg redo and tests Implements, and makes default relative undos and adds redos. A relative undo behaves differently only if you haven't performend any repo changing operations since your previous undo or redo, in which case you operate relative to that undo/redo. This means that a second undo will not undo the previous undo but instead bring you furter back. Differential Revision: https://phab.mercurial-scm.org/D52
2017-07-20 03:49:21 +03:00
> inhibit=$TESTDIR/../hgext3rd/inhibit.py
undo: improved performance and prep for hg undo Implements lighttransaction(repo) which improves performance of hg undo and prevents infinite loops caused by hooks that run true hg commands. Also adds _getrevlog and _invertindex commands, factoring out code that will be reused. Changes output for gaps when typing hg debugundohistory -l for slightly better ui and clearer testing. Lastly, changes lock from repo lock to new undolog lock and tests this. In the future, with some changes to undo.log, we may be able to take the lock later, bypassing the need to take it for read-only operations. Differential Revision: https://phab.mercurial-scm.org/D50
2017-07-17 23:18:54 +03:00
> [undo]
> _duringundologlock=1
undo: implements relative undo, hg redo and tests Implements, and makes default relative undos and adds redos. A relative undo behaves differently only if you haven't performend any repo changing operations since your previous undo or redo, in which case you operate relative to that undo/redo. This means that a second undo will not undo the previous undo but instead bring you furter back. Differential Revision: https://phab.mercurial-scm.org/D52
2017-07-20 03:49:21 +03:00
> [experimental]
> evolution=createmarkers
undo: meaningful obs markers for undos Makes obs markers for undos more meaningful. When an undo performs a strict one to one change, the written obs marker reflects that and the user even gets a helpful ui message in smartlog. One to many undos do not support such obs markers (currently) because we can't tell splits and divergence apart easily. Differential Revision: https://phab.mercurial-scm.org/D108
2017-07-20 03:49:21 +03:00
> [ui]
> interactive = true
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
> EOF
Build up a repo
$ hg init repo
$ cd repo
undo: allow user to list or see details about undoable commands run Summary: add hg debugundohistory -l to view recent undoable transactions Test Plan: unit test Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, mitrandir, durham, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5325772 Tasks: 19646287 Signature: t1:5325772:1499122626:48dd25cee8ed8912c07a6c1dabb3d4286483a8b7
2017-07-04 05:01:09 +03:00
Test data store
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
$ hg book master
$ touch a1 && hg add a1 && hg ci -ma1
$ touch a2 && hg add a2 && hg ci -ma2
$ hg book feature1
$ touch b && hg add b && hg ci -mb
$ hg up -q master
$ touch c1 && hg add c1 && hg ci -mc1
created new head
$ touch c2 && hg add c2 && hg ci -mc2
$ hg book feature2
$ touch d && hg add d && hg ci -md
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugindex .hg/undolog/command.i
undo: replace delta with base in test output Summary: I haven't tracked down where this change came from, but it looks fairly benign and straightforward to fix. Test Plan: The test now passes Reviewers: #fbhgext, stash Reviewed By: #fbhgext, stash Differential Revision: https://phab.mercurial-scm.org/D147
2017-07-19 17:08:21 +03:00
rev offset length base linkrev nodeid p1 p2
0 0 0 0 1 b80de5d13875 000000000000 000000000000
1 0 12 1 1 440cdcef588f 000000000000 000000000000
2 12 8 2 1 86fddc37572c 000000000000 000000000000
3 20 8 3 1 388d40a434df 000000000000 000000000000
4 28 14 4 1 1cafbfad488a 000000000000 000000000000
5 42 7 5 1 8879b3bd818b 000000000000 000000000000
6 49 13 6 1 b0f66da09921 000000000000 000000000000
7 62 8 7 1 004b7198dafe 000000000000 000000000000
8 70 8 8 1 60920018c706 000000000000 000000000000
9 78 14 9 1 c3e212568400 000000000000 000000000000
10 92 7 10 1 9d609b5b001c 000000000000 000000000000
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/command.i 0
$ hg debugdata .hg/undolog/command.i 1
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
book\x00master (no-eol) (esc)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/command.i 2
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
ci\x00-ma1 (no-eol) (esc)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/command.i 3
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
ci\x00-ma2 (no-eol) (esc)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/bookmarks.i 0
$ hg debugdata .hg/undolog/bookmarks.i 1
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
master 0000000000000000000000000000000000000000 (no-eol)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/bookmarks.i 2
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
master df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/workingparent.i 0
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
0000000000000000000000000000000000000000 (no-eol)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/workingparent.i 1
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/draftheads.i 1
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/draftheads.i 2
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
b68836a6e2cac33ba33a20249b85a486eec78186 (no-eol)
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/index.i 1
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
bookmarks 8153d44860d076e9c328951c8f36cf8daebe695a
command 440cdcef588f9a594c5530a5b6dede39a96d930d
undo: store op history Summary: Store basic operational history: bookmarks, commands, private heads, date and working copy parent Test Plan: Unit tests Reviewers: durham, #mercurial, mitrandir, quark Reviewed By: quark Subscribers: stash, mitrandir Differential Revision: https://phabricator.intern.facebook.com/D5293596 Tasks: 19261492, 19563903, 19450726 Tags: Hg Undo Signature: t1:5293596:1498245082:264e344054ee5061a439dec1c6071c2a60ffcf55
2017-06-23 22:19:09 +03:00
date * (glob)
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
draftheads b80de5d138758541c5f05265ad144ab9fa86d1db
workingparent fcb754f6a51eaf982f66d0637b39f3d2e6b520d5 (no-eol)
$ touch a3 && hg add a3
$ hg commit --amend
undo: move undolog to vfs and mark as lock-safe The upstream has added some warning around repo.svfs/vfs write operations without taking locks. For undo, we don't want to take the repo lock (since that means read-only operations like `hg log` will be blocked by another `hg commit`). So undo has its own locking and own transaction (for lower overhead). Therefore move all files we may write (including lock and transaction files) to `.hg/undolog` and whitelist the directory at `localrepository._wlockfreeprefix` to bypass the checks. Differential Revision: https://phab.mercurial-scm.org/D112
2017-07-18 21:30:05 +03:00
$ hg debugdata .hg/undolog/command.i 11
undo: amend transacts twice Summary: amend performs two transactions, second without command which breaks our assertion, but possibly isn't an issue. This fixes the assertion. Test Plan: unit tests Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5326358 Tasks: 19261492 Signature: t1:5326358:1498684945:0fde1df243cdbac67ceb092d30599ebd56a731a5
2017-06-29 01:28:40 +03:00
commit\x00--amend (no-eol) (esc)
undo: allow user to list or see details about undoable commands run Summary: add hg debugundohistory -l to view recent undoable transactions Test Plan: unit test Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, mitrandir, durham, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5325772 Tasks: 19646287 Signature: t1:5325772:1499122626:48dd25cee8ed8912c07a6c1dabb3d4286483a8b7
2017-07-04 05:01:09 +03:00
Test debugundohistory
$ hg debugundohistory -l
0: commit --amend
1: ci -md
2: book feature2
3: ci -mc2
4: ci -mc1
$ hg update master
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
(activating bookmark master)
$ echo "test" >> a1
$ hg commit -m "words"
created new head
$ hg debugundohistory -l
0: commit -m words
1: update master
2: commit --amend
3: ci -md
4: book feature2
$ hg debugundohistory -n 0
command:
commit -m words
bookmarks:
feature1 49cdb4091aca3c09f402ff001cd20cf086873683
feature2 296fda51a303650465d07a1cd054075cbe6d3cbd
master 0a3dd3e15e65b90836f492112d816f3ee073d897
date:
* (glob)
draftheads:
ADDED:
0a3dd3e15e65b90836f492112d816f3ee073d897
REMOVED:
workingparent:
0a3dd3e15e65b90836f492112d816f3ee073d897
Test gap in data (extension dis and enabled)
$ hg debugundohistory -l
0: commit -m words
1: update master
2: commit --amend
3: ci -md
4: book feature2
$ cat >> $HGRCPATH <<EOF
> [extensions]
> undo =!
> EOF
$ touch cmiss && hg add cmiss && hg ci -mcmiss
$ cat >>$HGRCPATH <<EOF
> [extensions]
> undo = $TESTDIR/../hgext3rd/undo.py
> EOF
$ touch a5 && hg add a5 && hg ci -ma5
$ hg debugundohistory -l
0: ci -ma5
undo: improved performance and prep for hg undo Implements lighttransaction(repo) which improves performance of hg undo and prevents infinite loops caused by hooks that run true hg commands. Also adds _getrevlog and _invertindex commands, factoring out code that will be reused. Changes output for gaps when typing hg debugundohistory -l for slightly better ui and clearer testing. Lastly, changes lock from repo lock to new undolog lock and tests this. In the future, with some changes to undo.log, we may be able to take the lock later, bypassing the need to take it for read-only operations. Differential Revision: https://phab.mercurial-scm.org/D50
2017-07-17 23:18:54 +03:00
1: -- gap in log --
undo: allow user to list or see details about undoable commands run Summary: add hg debugundohistory -l to view recent undoable transactions Test Plan: unit test Reviewers: #mercurial, stash, quark Reviewed By: quark Subscribers: quark, mitrandir, durham, stash, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5325772 Tasks: 19646287 Signature: t1:5325772:1499122626:48dd25cee8ed8912c07a6c1dabb3d4286483a8b7
2017-07-04 05:01:09 +03:00
2: commit -m words
3: update master
4: commit --amend
$ hg debugundohistory 1
command:
unkown command(s) run, gap in log
bookmarks:
feature1 49cdb4091aca3c09f402ff001cd20cf086873683
feature2 296fda51a303650465d07a1cd054075cbe6d3cbd
master 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa
date:
* (glob)
draftheads:
ADDED:
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa
REMOVED:
0a3dd3e15e65b90836f492112d816f3ee073d897
workingparent:
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa
Index out of bound error
$ hg debugundohistory -n 50
abort: index out of bounds
[255]
undo: deal with --hidden flag edge case Summary: Makes sure repo is filtered by the "visible" filter which hides hidden commits. Otherwise --hidden flag can mass up "draftheads" storage. Test Plan: Added a new test case. Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5357222 Tasks: 19822306 Signature: t1:5357222:1499102417:ce78065d36841601fe0dfb1d615d7b3be28c5870
2017-07-04 05:01:09 +03:00
Revset tests
undo: improved performance and prep for hg undo Implements lighttransaction(repo) which improves performance of hg undo and prevents infinite loops caused by hooks that run true hg commands. Also adds _getrevlog and _invertindex commands, factoring out code that will be reused. Changes output for gaps when typing hg debugundohistory -l for slightly better ui and clearer testing. Lastly, changes lock from repo lock to new undolog lock and tests this. In the future, with some changes to undo.log, we may be able to take the lock later, bypassing the need to take it for read-only operations. Differential Revision: https://phab.mercurial-scm.org/D50
2017-07-17 23:18:54 +03:00
$ hg log -G -r 'draft()' --hidden > /dev/null
undo: deal with --hidden flag edge case Summary: Makes sure repo is filtered by the "visible" filter which hides hidden commits. Otherwise --hidden flag can mass up "draftheads" storage. Test Plan: Added a new test case. Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5357222 Tasks: 19822306 Signature: t1:5357222:1499102417:ce78065d36841601fe0dfb1d615d7b3be28c5870
2017-07-04 05:01:09 +03:00
$ hg debugundohistory -n 0
command:
undo: add olddraft revset to return previous drafts Summary: Register `olddraft([index])` revset returning draft changesets using undo data. Test Plan: unit tests Reviewers: stash, #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5359322 Tasks: 19646287, 19261492 Signature: t1:5359322:1499122771:0a1e952a9bb4cd6b31d95a229ccb398cd6aafd1f
2017-07-04 05:01:09 +03:00
ci -ma5
undo: deal with --hidden flag edge case Summary: Makes sure repo is filtered by the "visible" filter which hides hidden commits. Otherwise --hidden flag can mass up "draftheads" storage. Test Plan: Added a new test case. Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5357222 Tasks: 19822306 Signature: t1:5357222:1499102417:ce78065d36841601fe0dfb1d615d7b3be28c5870
2017-07-04 05:01:09 +03:00
bookmarks:
feature1 49cdb4091aca3c09f402ff001cd20cf086873683
feature2 296fda51a303650465d07a1cd054075cbe6d3cbd
undo: add olddraft revset to return previous drafts Summary: Register `olddraft([index])` revset returning draft changesets using undo data. Test Plan: unit tests Reviewers: stash, #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5359322 Tasks: 19646287, 19261492 Signature: t1:5359322:1499122771:0a1e952a9bb4cd6b31d95a229ccb398cd6aafd1f
2017-07-04 05:01:09 +03:00
master aa430c8afedf9b2ec3f0655d39eef6b6b0a2ddb6
undo: deal with --hidden flag edge case Summary: Makes sure repo is filtered by the "visible" filter which hides hidden commits. Otherwise --hidden flag can mass up "draftheads" storage. Test Plan: Added a new test case. Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5357222 Tasks: 19822306 Signature: t1:5357222:1499102417:ce78065d36841601fe0dfb1d615d7b3be28c5870
2017-07-04 05:01:09 +03:00
date:
* (glob)
draftheads:
ADDED:
undo: add olddraft revset to return previous drafts Summary: Register `olddraft([index])` revset returning draft changesets using undo data. Test Plan: unit tests Reviewers: stash, #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5359322 Tasks: 19646287, 19261492 Signature: t1:5359322:1499122771:0a1e952a9bb4cd6b31d95a229ccb398cd6aafd1f
2017-07-04 05:01:09 +03:00
aa430c8afedf9b2ec3f0655d39eef6b6b0a2ddb6
undo: deal with --hidden flag edge case Summary: Makes sure repo is filtered by the "visible" filter which hides hidden commits. Otherwise --hidden flag can mass up "draftheads" storage. Test Plan: Added a new test case. Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5357222 Tasks: 19822306 Signature: t1:5357222:1499102417:ce78065d36841601fe0dfb1d615d7b3be28c5870
2017-07-04 05:01:09 +03:00
REMOVED:
undo: add olddraft revset to return previous drafts Summary: Register `olddraft([index])` revset returning draft changesets using undo data. Test Plan: unit tests Reviewers: stash, #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5359322 Tasks: 19646287, 19261492 Signature: t1:5359322:1499122771:0a1e952a9bb4cd6b31d95a229ccb398cd6aafd1f
2017-07-04 05:01:09 +03:00
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa
undo: deal with --hidden flag edge case Summary: Makes sure repo is filtered by the "visible" filter which hides hidden commits. Otherwise --hidden flag can mass up "draftheads" storage. Test Plan: Added a new test case. Reviewers: #mercurial, quark Reviewed By: quark Subscribers: quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5357222 Tasks: 19822306 Signature: t1:5357222:1499102417:ce78065d36841601fe0dfb1d615d7b3be28c5870
2017-07-04 05:01:09 +03:00
workingparent:
undo: add olddraft revset to return previous drafts Summary: Register `olddraft([index])` revset returning draft changesets using undo data. Test Plan: unit tests Reviewers: stash, #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5359322 Tasks: 19646287, 19261492 Signature: t1:5359322:1499122771:0a1e952a9bb4cd6b31d95a229ccb398cd6aafd1f
2017-07-04 05:01:09 +03:00
aa430c8afedf9b2ec3f0655d39eef6b6b0a2ddb6
Test 'olddraft([NUM])' revset
$ hg log -G -r 'olddraft(0) - olddraft(1)' --hidden -T compact
undo: implements relative undo, hg redo and tests Implements, and makes default relative undos and adds redos. A relative undo behaves differently only if you haven't performend any repo changing operations since your previous undo or redo, in which case you operate relative to that undo/redo. This means that a second undo will not undo the previous undo but instead bring you furter back. Differential Revision: https://phab.mercurial-scm.org/D52
2017-07-20 03:49:21 +03:00
@ 10[tip][master] aa430c8afedf 1970-01-01 00:00 +0000 test
undo: add olddraft revset to return previous drafts Summary: Register `olddraft([index])` revset returning draft changesets using undo data. Test Plan: unit tests Reviewers: stash, #mercurial, quark Reviewed By: quark Subscribers: mitrandir, quark, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5359322 Tasks: 19646287, 19261492 Signature: t1:5359322:1499122771:0a1e952a9bb4cd6b31d95a229ccb398cd6aafd1f
2017-07-04 05:01:09 +03:00
| a5
~
undo: localbranch revset Adds localbranch revset to be used for localbranch undos. A localbranch is a set of draft commits that are connected via draft commits. Any draft commit within a branch, or a public commit at the base of the branch, can be passed as an argument to localbranch(). This will be necessary for selecting the scope for a localbranch undo. Also fixes oldraft() output when used with other revsets. Previously olddraft() would ignore operators such as and because of a missing the necessary handling. Differential Revision: https://phab.mercurial-scm.org/D159
2017-08-04 01:17:21 +03:00
$ hg log -G -r 'olddraft(1) and draft()' -T compact
o 9 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
|
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words
|
| o 7[feature2]:4 296fda51a303 1970-01-01 00:00 +0000 test
|/ d
|
o 4 38d85b506754 1970-01-01 00:00 +0000 test
| c2
|
o 3:1 ec7553f7b382 1970-01-01 00:00 +0000 test
| c1
|
| o 2[feature1] 49cdb4091aca 1970-01-01 00:00 +0000 test
|/ b
|
o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test
| a2
|
o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test
a1
$ hg log -G -r 'olddraft(1) and public()' -T compact
undo: improved performance and prep for hg undo Implements lighttransaction(repo) which improves performance of hg undo and prevents infinite loops caused by hooks that run true hg commands. Also adds _getrevlog and _invertindex commands, factoring out code that will be reused. Changes output for gaps when typing hg debugundohistory -l for slightly better ui and clearer testing. Lastly, changes lock from repo lock to new undolog lock and tests this. In the future, with some changes to undo.log, we may be able to take the lock later, bypassing the need to take it for read-only operations. Differential Revision: https://phab.mercurial-scm.org/D50
2017-07-17 23:18:54 +03:00
Test undolog lock
$ hg log --config hooks.duringundologlock="sleep 1" > /dev/null &
$ sleep 0.1
$ hg st --time
time: real [1-9]*\..* (re)
undo: implements relative undo, hg redo and tests Implements, and makes default relative undos and adds redos. A relative undo behaves differently only if you haven't performend any repo changing operations since your previous undo or redo, in which case you operate relative to that undo/redo. This means that a second undo will not undo the previous undo but instead bring you furter back. Differential Revision: https://phab.mercurial-scm.org/D52
2017-07-20 03:49:21 +03:00
hg undo command tests
$ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark master)
$ hg log -G -T compact -l2
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
|
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words
~
$ hg update 0a3dd3e15e65
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ touch c11 && hg add c11
$ hg commit --amend
$ hg log -G -T compact -l1
@ 12[tip][master]:8 2dca609174c2 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G -T compact -l4
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
|
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words
|
| o 7[feature2]:4 296fda51a303 1970-01-01 00:00 +0000 test
|/ d
|
o 4 38d85b506754 1970-01-01 00:00 +0000 test
| c2
~
$ hg graft 296fda51a303
grafting 7:296fda51a303 "d" (feature2)
$ hg log -G -T compact -l2
@ 13[tip]:9 f007a7cf4c3d 1970-01-01 00:00 +0000 test
| d
|
o 9[master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg undo
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg book test
$ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark test)
$ hg bookmarks
feature1 2:49cdb4091aca
feature2 7:296fda51a303
master 9:1dafc0b43612
hg redo test
$ hg redo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master,test] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg undo -n 5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo -n 5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg redo -n 100
abort: index out of bounds
[255]
hg undo --absolute tests
$ hg undo -a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg undo -a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg undo -n 5
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master,test] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
$ hg undo -a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
~
undo: adds -f flag and gap edge case handling Prevents users from accidentally crossing gaps in their history and adds an overwride. In most cases undoing across a gap isn't desired as the connection between the pre and post states is unkown. While undoing across a gap is not destructive or inherently risky, it is inherently confusing to the user since we don't know how many and what commands where run. Furthermore, there is no guarantee that the pre and post states of a gap are actually connected in any sane way. Differential Revision: https://phab.mercurial-scm.org/D53
2017-07-20 03:49:21 +03:00
hg undo --force tests
$ hg debugundohistory -l 18
18: undo
19: ci -ma5
20: -- gap in log --
21: commit -m words
22: update master
$ hg undo -a -n 25
abort: attempted risky undo across missing history
[255]
$ hg undo -a -n 25 -f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo -a
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
undo: add --keep to maintian working copy changes Allow user to keep working copy changes after undo, mimicking unamend and uncommit behavior. As discussed at the team lunch, this allows undo to remain ignorant of what command the user has run while conforming to user expectations. In the future this could be done in a smarter way where we properly restore hg status dynamically. Differential Revision: https://phab.mercurial-scm.org/D55
2017-07-20 03:49:21 +03:00
hg undo --keep tests
$ touch kfl1 && hg add kfl1
$ hg st
A kfl1
$ hg commit --amend
$ hg st
$ hg undo --keep
$ hg st
A kfl1
undo: meaningful obs markers for undos Makes obs markers for undos more meaningful. When an undo performs a strict one to one change, the written obs marker reflects that and the user even gets a helpful ui message in smartlog. One to many undos do not support such obs markers (currently) because we can't tell splits and divergence apart easily. Differential Revision: https://phab.mercurial-scm.org/D108
2017-07-20 03:49:21 +03:00
$ hg commit --amend
hg undo informative obsmarkers
check 1 to 1 undos have informative obsmarker
check 1 to many undos (generally a redo of split or divergence) do not connect
the changesets with obsmarkers as we do not differentiate between split and
divergence cases in undo. The original split/divergence obsmarkers suffice for
checking split/divergence.
$ cat >> $HGRCPATH <<EOF
> [extensions]
> smartlog = $TESTDIR/../hgext3rd/smartlog.py
> tweakdefaults = $TESTDIR/../hgext3rd/tweakdefaults.py
> fbamend = $TESTDIR/../hgext3rd/fbamend/
> EOF
$ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg sl --all --hidden -T "{node|short} {if(undosuccessors, label('sl.undo', '(Undone as {join(undosuccessors% \'{shortest(undosuccessor, 6)}\', ', ')})'))}"
x db3723da827c
|
| x f007a7cf4c3d
|/
| x 128fe7e6098d
|/
| x aa430c8afedf
|/
@ 1dafc0b43612
:
: x c9476255bc2a (Undone as 1dafc0)
:/
: x 2dca609174c2
:/
: o 296fda51a303
:/
: x 551c0e5b57c9
: |
: x db92053d5c83
:/
: o 49cdb4091aca
:/
o b68836a6e2ca
|
~
$ echo "a" >> newa && echo "b" >> newb && hg add newa newb && hg ci -m "newfiles"
$ hg split --quiet << EOF
> y
> y
> n
> y
> EOF
diff --git a/newa b/newa
new file mode 100644
examine changes to 'newa'? [Ynesfdaq?] y
@@ -0,0 +1,1 @@
+a
record change 1/2 to 'newa'? [Ynesfdaq?] y
diff --git a/newb b/newb
new file mode 100644
examine changes to 'newb'? [Ynesfdaq?] n
Done splitting? [yN] y
$ hg debugobsolete | tail -5
db3723da827c373768d500ab4e3a9c59a78314a6 0 {1dafc0b436123cab96f82a8e9e8d1d42c0301aaa} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:04 1970 +0000) {'user': 'test'}
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:05 1970 +0000) {'user': 'test'}
c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:06 1970 +0000) {'operation': 'undo', 'user': 'test'}
f86734247df6db66a810e549cc938a72cd5c6d1a d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'}
$ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg debugobsolete | tail -5
d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea f86734247df6db66a810e549cc938a72cd5c6d1a 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'}
75f63379f12bf02d40fe7444587ad67be9ae81b8 0 {d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea} (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'}
f86734247df6db66a810e549cc938a72cd5c6d1a 0 {1dafc0b436123cab96f82a8e9e8d1d42c0301aaa} (Thu Jan 01 00:00:02 1970 +0000) {'operation': 'undo', 'user': 'test'}
d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'}
75f63379f12bf02d40fe7444587ad67be9ae81b8 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'}
$ cat >> $HGRCPATH <<EOF
> [extensions]
> smartlog =!
> tweakdefaults =!
> fbamend =!
> EOF
undo: file corruption handling Basic file corruption handling: if file is corrupted, we nuke our history. Downside is that we won't be able to undo furter back in case of a corruption, but considering corruption this is expected. Differential Revision: https://phab.mercurial-scm.org/D111
2017-07-20 03:49:21 +03:00
File corruption handling
$ echo 111corruptedrevlog > .hg/undolog/index.i
#if chg
(note: chg has issues with the below test)
#else
$ hg st --debug
caught revlog error. undolog/index.i was probably corrupted
#endif
$ hg debugundohistory -l
0: -- gap in log --
undo: localbranch revset Adds localbranch revset to be used for localbranch undos. A localbranch is a set of draft commits that are connected via draft commits. Any draft commit within a branch, or a public commit at the base of the branch, can be passed as an argument to localbranch(). This will be necessary for selecting the scope for a localbranch undo. Also fixes oldraft() output when used with other revsets. Previously olddraft() would ignore operators such as and because of a missing the necessary handling. Differential Revision: https://phab.mercurial-scm.org/D159
2017-08-04 01:17:21 +03:00
_localbranch revset tests
$ hg log -r '_localbranch(75f63379f12b)'
changeset: 0:df4fd610a3d6
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a1
changeset: 1:b68836a6e2ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a2
changeset: 2:49cdb4091aca
bookmark: feature1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: b
changeset: 3:ec7553f7b382
parent: 1:b68836a6e2ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: c1
changeset: 4:38d85b506754
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: c2
changeset: 7:296fda51a303
bookmark: feature2
parent: 4:38d85b506754
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: d
changeset: 8:0a3dd3e15e65
parent: 4:38d85b506754
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: words
changeset: 9:1dafc0b43612
bookmark: master
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: cmiss
changeset: 17:d0fdb9510dbf
parent: 9:1dafc0b43612
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
changeset: 18:75f63379f12b
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
Test with public commit
$ hg phase -r 0a3dd3e15e65 -p
$ hg log -r '_localbranch(75f63379f12b)'
changeset: 9:1dafc0b43612
bookmark: master
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: cmiss
changeset: 17:d0fdb9510dbf
parent: 9:1dafc0b43612
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
changeset: 18:75f63379f12b
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
$ hg log -r '_localbranch(0a3dd3e15e65)'
changeset: 9:1dafc0b43612
bookmark: master
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: cmiss
changeset: 17:d0fdb9510dbf
parent: 9:1dafc0b43612
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
changeset: 18:75f63379f12b
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
undo: basic single repo undo Add the ability to undo changes within one 'localbranch'. In the future, this will probably become default behavior. Undo -b changecontext will undo changes belonging to the local branch identified by the changecontext (see revset localbranch). Based on obs markers we can identify connected commits that we in turn reveal or hide outside of this localbranch. This undo allows users to work on multiple branches independantly. Currently, indexing for undoes is still on the repo level. This isn't good from a ux experience. Next up would be localbranch level indexing logic and redo logic. Differential Revision: https://phab.mercurial-scm.org/D160
2017-08-04 01:17:21 +03:00
localbranch undos
Make changes on two branches (old and new)
Undo only changes in one branch (old)
Includes commit and book changes
$ hg book "oldbook"
$ touch oldbranch
$ hg add oldbranch && hg ci -moldbranch
$ hg update null
0 files updated, 0 files merged, 8 files removed, 0 files unresolved
(leaving bookmark oldbook)
$ touch newbranch
$ hg add newbranch && hg ci -mnewbranch
created new head
$ hg book "newbook"
$ hg log -l 2
changeset: 20:805791ba4bcd
bookmark: newbook
tag: tip
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch
changeset: 19:7b0ef4f2a1ae
bookmark: oldbook
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: oldbranch
$ hg up 75f63379f12b
7 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark newbook)
undo: localbrach fancy indexes Adds smart indexing to localbranch undoes. This eliminates the mental burden of the user of keeping track in what order and when changes where made. Drawback is that it raises the computational complexity from the number of draft commits to draft commits times how many repo states you are undoing. Common use case should be to undo a small number of changes, so this is acceptable. hg undo -b changectx finds the closest pertinent change and undoes that. -b with -n is not supported. The reason it is not supported is that local branch level undoes are delta specific and not state specific, which in essence means that running hg undo -b # twice is not guaranteed to give you the same resault as running hg undo -b # -n 2. We could run -b multiple times for a -n, but the cost of a -b increases with a larger -n (which isn't the case for a standard undo), and abort handling would be more complicated (I'm not sure how well we can roll back a tree of obs markers?). In essence -n with -b is not that usefull a feature (bc perf limits) and would potentially require a decently large amount of time to implement correctly. Also adds redo -b since this command now makes a lot more sense when we use the smarter indexing. Adds logic to seperate undoes and redoes in different branches. You can perform relative undoes and redoes within the latest scope, while undoes and redoes within a new scope will start at the present (absolute) state. Differential Revision: https://phab.mercurial-scm.org/D186
2017-08-04 01:17:21 +03:00
3 changes within local scope: commit, book, update
$ hg undo -b 75f63379f12b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg undo -b 75f63379f12b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo -b 75f63379f12b
undo: basic single repo undo Add the ability to undo changes within one 'localbranch'. In the future, this will probably become default behavior. Undo -b changecontext will undo changes belonging to the local branch identified by the changecontext (see revset localbranch). Based on obs markers we can identify connected commits that we in turn reveal or hide outside of this localbranch. This undo allows users to work on multiple branches independantly. Currently, indexing for undoes is still on the repo level. This isn't good from a ux experience. Next up would be localbranch level indexing logic and redo logic. Differential Revision: https://phab.mercurial-scm.org/D160
2017-08-04 01:17:21 +03:00
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -l 2
changeset: 20:805791ba4bcd
bookmark: newbook
tag: tip
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch
changeset: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
Check rebase local undos of rebases
Make sure bookmarks and commits are not lost
and commits are not duplicated
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase =
> EOF
$ hg rebase -s 8057 -d 75f6
rebasing 20:805791ba4bcd "newbranch" (tip newbook)
$ hg log -l 2
changeset: 21:35324a911c0d
bookmark: newbook
tag: tip
parent: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch
changeset: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
$ hg undo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -l 2
changeset: 20:805791ba4bcd
bookmark: newbook
tag: tip
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch
changeset: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase = !
> EOF
undo: localbrach fancy indexes Adds smart indexing to localbranch undoes. This eliminates the mental burden of the user of keeping track in what order and when changes where made. Drawback is that it raises the computational complexity from the number of draft commits to draft commits times how many repo states you are undoing. Common use case should be to undo a small number of changes, so this is acceptable. hg undo -b changectx finds the closest pertinent change and undoes that. -b with -n is not supported. The reason it is not supported is that local branch level undoes are delta specific and not state specific, which in essence means that running hg undo -b # twice is not guaranteed to give you the same resault as running hg undo -b # -n 2. We could run -b multiple times for a -n, but the cost of a -b increases with a larger -n (which isn't the case for a standard undo), and abort handling would be more complicated (I'm not sure how well we can roll back a tree of obs markers?). In essence -n with -b is not that usefull a feature (bc perf limits) and would potentially require a decently large amount of time to implement correctly. Also adds redo -b since this command now makes a lot more sense when we use the smarter indexing. Adds logic to seperate undoes and redoes in different branches. You can perform relative undoes and redoes within the latest scope, while undoes and redoes within a new scope will start at the present (absolute) state. Differential Revision: https://phab.mercurial-scm.org/D186
2017-08-04 01:17:21 +03:00
Check local redo works
Simple test should be sufficient, as per usual, redo is an undo with some index
logic
$ hg redo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -l 2
changeset: 21:35324a911c0d
bookmark: newbook
tag: tip
parent: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch
changeset: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles
$ touch a9 && hg add a9 && hg ci -m a9
created new head
$ hg log -r . -T {node}
3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol)
$ hg undo -b 3532
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo -b 75f6
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo -b 75f6
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -l 2
changeset: 22:3ee6a6880888
tag: tip
parent: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a9
changeset: 21:35324a911c0d
bookmark: newbook
parent: 18:75f63379f12b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch
Check local undo with facebook style strip
$ cat >> $HGRCPATH <<EOF
> [extensions]
> strip =
> fbamend =
> EOF
$ hg strip 3ee6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 75f63379f12b
1 changesets pruned
$ hg undo -b 3532
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -T {node}
3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol)
$ cat >> $HGRCPATH <<EOF
> [extensions]
> strip =!
> fbamend =!
> EOF
Reference in New Issue Copy Permalink