sapling/eden/scm/tests/test-fsmonitor-filemerge.t

#require fsmonitor

(Run this test using HGFSMONITOR_TESTS=1)

  $ newrepo

  $ hg debugdrawdag << EOS
  > C   # C/A=0\n1\n
  > |   # B/A=1\n2\n
  > | B # C/2=1\n
  > |/  # B/2=2\n
  > A   # A/A=1\n
  > EOS

  $ enable fsmonitor rebase hgevents
  $ setconfig blackbox.track=merge_resolve,watchman blackbox.logsource=true

  $ hg rebase -s B -d C --tool=false
  rebasing 65f3e88a53bc "B" (B)
  merging 2
  merging A
  merging 2 failed!
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]

  $ hg blackbox --no-timestamp --no-sid --pattern '{"watchman":"_"}' | egrep '(watchman.*state.*)'
  [watchman] command ["state-enter",{"metadata":{"distance":3,"merge":false,"partial":false,"rev":"0000000000000000000000000000000000000000","status":"ok"},"name":"hg.update"}] finished in 0 ms
  [watchman] command ["state-leave",{"metadata":{"distance":3,"merge":false,"partial":false,"rev":"2e2f27616b65209eecd4710c454df0f678f271d9","status":"ok"},"name":"hg.update"}] finished in 0 ms
  [watchman] command ["state-enter",{"metadata":{"distance":3,"merge":true,"partial":false,"rev":"2e2f27616b65209eecd4710c454df0f678f271d9","status":"ok"},"name":"hg.update"}] finished in 0 ms
  [watchman] command ["state-enter",{"metadata":{"path":"2"},"name":"hg.filemerge"}] finished in 0 ms
  [watchman] command ["state-leave",{"metadata":{"path":"2"},"name":"hg.filemerge"}] finished in 0 ms
  [watchman] command ["state-leave",{"metadata":{"distance":3,"merge":true,"partial":false,"rev":"65f3e88a53bc0f5183deea0cdbc46738777ec005","status":"ok"},"name":"hg.update"}] finished in 0 ms
fsmonitor: send state about filemerge Summary: The merge process could be interactive, and tools like Hack wants to scan changed files when the user is resolving conflicts. There is a "hg.update" watchman state and "state-enter", "state-exit" events that help detect the "update" process. However, the interactive "ui.merge" process is inside the "update" process and cannot be easily decoupled confidently (i.e. hard to end "update" state before doing the merge). It's also hard to have a general "merge" state due to the current watchman design. Because a merge might be across multiple hg processes (ex. non-interactive ui.merge, hg exits, returns to the shell, and the user invokes `hg resolve --mark` to end the merge state), and the current watchman implementation will force end all states associated with a watchman socket connection. If a hg process exits, it will disconnect from the watchman socket and the merge state will be forced terminated, although there is still unresolved conflicts. Previous attempt on this is D7286181. This patch adds a "hg.filemerge" watchman state that could make watchman users aware of ongoing interactive merge resolutions. The event fires when an external merge tool is called, per conflicted file. It is strictly a sub interval of an "update" state, which is within a single process. So it does not have the problem that a "merge" state has. Differential Revision: D7648929 fbshipit-source-id: 858beba1bff261e8da5bd4d8b08a388dcbc8a9ef 2018-04-19 22:38:59 +03:00			`#require fsmonitor`

			`(Run this test using HGFSMONITOR_TESTS=1)`

			`$ newrepo`

			`$ hg debugdrawdag << EOS`
			`> C # C/A=0\n1\n`
			`> \| # B/A=1\n2\n`
			`> \| B # C/2=1\n`
			`> \|/ # B/2=2\n`
			`> A # A/A=1\n`
			`> EOS`

commands: provide in-core blackbox command Summary: The in-core blackbox command displays blackbox entries in the given time range. The `blackbox` command provided by the blackbox extension was removed. They can still be accessed via `.hg/blackbox.log`, though. Tests are updated. Most `\| grep` patterns were changed to use structured pattern matching `--pattern` instead. Tests that are not interesting (ex. bundlebackup, since we are moving away from bundle files slowly) are just removed. Reviewed By: markbt Differential Revision: D15640718 fbshipit-source-id: 7e5da60ca2b15ae9495d0242b340a066979d5a4f 2019-06-26 20:59:13 +03:00			`$ enable fsmonitor rebase hgevents`
blackbox: clean up blackbox logging and log more during rage Summary: Clean up some of the calls to `ui.log` and how they appear in blackbox logging. * Make the names of the events consistently use `snake_case`. * For watchman, only log once for each watchman command. Include whether or not it failed. * Unify `fsmonitor` logging under the `fsmonitor` event. * Omit the second argument when it is empty - it is optional and does nothing when empty. * Increase the number of blackbox lines included in rage to 100. Reviewed By: quark-zju Differential Revision: D14949868 fbshipit-source-id: a9aa8251e71ae7ca556c08116f8f7c61ff472218 2019-04-23 12:45:38 +03:00			`$ setconfig blackbox.track=merge_resolve,watchman blackbox.logsource=true`
fsmonitor: send state about filemerge Summary: The merge process could be interactive, and tools like Hack wants to scan changed files when the user is resolving conflicts. There is a "hg.update" watchman state and "state-enter", "state-exit" events that help detect the "update" process. However, the interactive "ui.merge" process is inside the "update" process and cannot be easily decoupled confidently (i.e. hard to end "update" state before doing the merge). It's also hard to have a general "merge" state due to the current watchman design. Because a merge might be across multiple hg processes (ex. non-interactive ui.merge, hg exits, returns to the shell, and the user invokes `hg resolve --mark` to end the merge state), and the current watchman implementation will force end all states associated with a watchman socket connection. If a hg process exits, it will disconnect from the watchman socket and the merge state will be forced terminated, although there is still unresolved conflicts. Previous attempt on this is D7286181. This patch adds a "hg.filemerge" watchman state that could make watchman users aware of ongoing interactive merge resolutions. The event fires when an external merge tool is called, per conflicted file. It is strictly a sub interval of an "update" state, which is within a single process. So it does not have the problem that a "merge" state has. Differential Revision: D7648929 fbshipit-source-id: 858beba1bff261e8da5bd4d8b08a388dcbc8a9ef 2018-04-19 22:38:59 +03:00
			`$ hg rebase -s B -d C --tool=false`
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697 2019-10-16 02:28:01 +03:00			`rebasing 65f3e88a53bc "B" (B)`
fsmonitor: send state about filemerge Summary: The merge process could be interactive, and tools like Hack wants to scan changed files when the user is resolving conflicts. There is a "hg.update" watchman state and "state-enter", "state-exit" events that help detect the "update" process. However, the interactive "ui.merge" process is inside the "update" process and cannot be easily decoupled confidently (i.e. hard to end "update" state before doing the merge). It's also hard to have a general "merge" state due to the current watchman design. Because a merge might be across multiple hg processes (ex. non-interactive ui.merge, hg exits, returns to the shell, and the user invokes `hg resolve --mark` to end the merge state), and the current watchman implementation will force end all states associated with a watchman socket connection. If a hg process exits, it will disconnect from the watchman socket and the merge state will be forced terminated, although there is still unresolved conflicts. Previous attempt on this is D7286181. This patch adds a "hg.filemerge" watchman state that could make watchman users aware of ongoing interactive merge resolutions. The event fires when an external merge tool is called, per conflicted file. It is strictly a sub interval of an "update" state, which is within a single process. So it does not have the problem that a "merge" state has. Differential Revision: D7648929 fbshipit-source-id: 858beba1bff261e8da5bd4d8b08a388dcbc8a9ef 2018-04-19 22:38:59 +03:00			`merging 2`
			`merging A`
			`merging 2 failed!`
			`unresolved conflicts (see hg resolve, then hg rebase --continue)`
			`[1]`

logging: migrate watchman command logs to new blackbox event Summary: Migrate ui.log("watchman", <str>) to blackbox.log(<Rust Event::Watchman>). Reviewed By: markbt Differential Revision: D15710675 fbshipit-source-id: e5aabb4447b03921adc968bb8f03f140f6056501 2019-07-06 12:41:45 +03:00			`$ hg blackbox --no-timestamp --no-sid --pattern '{"watchman":"_"}' \| egrep '(watchman.state.)'`
			`[watchman] command ["state-enter",{"metadata":{"distance":3,"merge":false,"partial":false,"rev":"0000000000000000000000000000000000000000","status":"ok"},"name":"hg.update"}] finished in 0 ms`
			`[watchman] command ["state-leave",{"metadata":{"distance":3,"merge":false,"partial":false,"rev":"2e2f27616b65209eecd4710c454df0f678f271d9","status":"ok"},"name":"hg.update"}] finished in 0 ms`
			`[watchman] command ["state-enter",{"metadata":{"distance":3,"merge":true,"partial":false,"rev":"2e2f27616b65209eecd4710c454df0f678f271d9","status":"ok"},"name":"hg.update"}] finished in 0 ms`
			`[watchman] command ["state-enter",{"metadata":{"path":"2"},"name":"hg.filemerge"}] finished in 0 ms`
			`[watchman] command ["state-leave",{"metadata":{"path":"2"},"name":"hg.filemerge"}] finished in 0 ms`
			`[watchman] command ["state-leave",{"metadata":{"distance":3,"merge":true,"partial":false,"rev":"65f3e88a53bc0f5183deea0cdbc46738777ec005","status":"ok"},"name":"hg.update"}] finished in 0 ms`