sapling/tests/test-fb-hgext-fbamend-noinhibit.t

Set up test environment.
  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > fbamend=
  > rebase=
  > [experimental]
  > evolution = createmarkers
  > EOF
  $ hg init repo && cd repo

Perform restack without inhibit extension.
  $ hg debugbuilddag -m +3
  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg amend -m "Amended" --no-rebase
  warning: the changeset's children were left behind
  (use 'hg restack' to rebase them)
  $ hg rebase --restack
  rebasing 2:* "r2" (glob)
fbamend: use unfiltered repo when clearing preamend bookmarks Summary: Sometimes restack attempts to clear preamend bookmarks on hidden commits. This only happens when the user has a configuration error (typically inhibit is disabled) which would mess up other parts of restack. Nonetheless, there is no reason to crash here. Test Plan: Disable inhibit, perform an amend, and run `hg restack`. Unit test is forthcoming. Reviewers: #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4856640 Tasks: 16726367 Signature: t1:4856640:1491816803:56beeb11360a7a2f6bc6243069c562b08a015afc 2017-04-20 01:52:45 +03:00			`Set up test environment.`
			`$ cat >> $HGRCPATH << EOF`
			`> [extensions]`
fb-hgext: fix copied fb-hgext tests Summary: This is a big bulk of generally almost-obvious fixes to the moved tests. Mostly these fixes have to do with correct importing of the actual extensions. Depends on D6675329 Test Plan: - ./run-tests.py fails less after this commit - see further commits for more test fixes Reviewers: #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D6675344 2018-01-09 14:06:09 +03:00			`> fbamend=`
fbamend: use unfiltered repo when clearing preamend bookmarks Summary: Sometimes restack attempts to clear preamend bookmarks on hidden commits. This only happens when the user has a configuration error (typically inhibit is disabled) which would mess up other parts of restack. Nonetheless, there is no reason to crash here. Test Plan: Disable inhibit, perform an amend, and run `hg restack`. Unit test is forthcoming. Reviewers: #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4856640 Tasks: 16726367 Signature: t1:4856640:1491816803:56beeb11360a7a2f6bc6243069c562b08a015afc 2017-04-20 01:52:45 +03:00			`> rebase=`
			`> [experimental]`
			`> evolution = createmarkers`
			`> EOF`
			`$ hg init repo && cd repo`

			`Perform restack without inhibit extension.`
			`$ hg debugbuilddag -m +3`
			`$ hg update 1`
			`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`
fbamend: autorestack children for simple rebases Today, if you run 'hg amend' while in the middle of a stack of commits, it amends the commit and leaves the top of the stack behind. Users then have to run 'hg amend --restack' or 'hg restack' to bring the old top of the stack onto the new version of the commit. Add heuristic code so that an automatic restack can be performed if amending a commit did not change its manifest, nor did it leave behind a dirty working copy. This optimization can be avoided by providing the --no-rebase commandline option. Fix the existing tests that relied on the previous behaviour (so their original intent is kept), and add new ones to cover the new heuristic. Differential Revision: https://phab.mercurial-scm.org/D1784 2017-12-28 09:54:03 +03:00			`$ hg amend -m "Amended" --no-rebase`
fbamend: use unfiltered repo when clearing preamend bookmarks Summary: Sometimes restack attempts to clear preamend bookmarks on hidden commits. This only happens when the user has a configuration error (typically inhibit is disabled) which would mess up other parts of restack. Nonetheless, there is no reason to crash here. Test Plan: Disable inhibit, perform an amend, and run `hg restack`. Unit test is forthcoming. Reviewers: #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4856640 Tasks: 16726367 Signature: t1:4856640:1491816803:56beeb11360a7a2f6bc6243069c562b08a015afc 2017-04-20 01:52:45 +03:00			`warning: the changeset's children were left behind`
fbamend: change hint text to suggest running `restack` Summary: Instead of referencing `hg rebase` --restack option, just reference the `restack` subcommand. Test Plan: 1. Make a few commits 1, 2, 3, 4 on any branch 2. `hg update 1` 3. Try to amend commit 1 4. Warning message should appear about children left behind expected: Hint text does not mention `hg rebase --restack` Reviewers: durham, kulshrax Reviewed By: kulshrax Subscribers: medson, mjpieters, kkrewink Differential Revision: https://phabricator.intern.facebook.com/D5313108 Tasks: 19601780 Signature: t1:5313108:1498249314:98f31f4424341ef51997687293bf99b7297b6cd0 2017-06-26 17:31:28 +03:00			`(use 'hg restack' to rebase them)`
fbamend: use unfiltered repo when clearing preamend bookmarks Summary: Sometimes restack attempts to clear preamend bookmarks on hidden commits. This only happens when the user has a configuration error (typically inhibit is disabled) which would mess up other parts of restack. Nonetheless, there is no reason to crash here. Test Plan: Disable inhibit, perform an amend, and run `hg restack`. Unit test is forthcoming. Reviewers: #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4856640 Tasks: 16726367 Signature: t1:4856640:1491816803:56beeb11360a7a2f6bc6243069c562b08a015afc 2017-04-20 01:52:45 +03:00			`$ hg rebase --restack`
			`rebasing 2:* "r2" (glob)`