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
0be8e8ce29
sapling/eden/scm/tests/test-backout.t

109 lines
2.2 KiB
Perl
Raw Normal View History

tests: enable chg for 572 tests Summary: Add `#chg-compatible` to 572 tests that seem to pass with chg enabled. This should make them run faster. Reviewed By: xavierd Differential Revision: D18870507 fbshipit-source-id: fe895e733efffc9286cd3d17c7a156c803124395
2019-12-10 02:24:31 +03:00
#chg-compatible
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
$ configure modern
$ newrepo basic
$ drawdag << 'EOS'
> D
> |
> C E # C/A=(removed)
> |/ # C/B=B1
> B
> |
> A
> EOS
$ hg up -qC $D
tests: unify test-backout
2010-08-14 04:28:53 +04:00
tests: fix a bunch of pointless #s in unified tests
2010-09-18 02:03:08 +04:00
should complain
tests: unify test-backout
2010-08-14 04:28:53 +04:00
$ hg backout
abort: please specify a revision to backout
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
$ hg backout -r $A $B
tests: unify test-backout
2010-08-14 04:28:53 +04:00
abort: please specify just one revision
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
$ hg backout $E
backout: improve confusing 'cannot backout change on a different branch' abort These days 'branch' usually refer to a named branch. Instead, abort with 'cannot backout change that not is an ancestor'.
2014-02-25 01:42:14 +04:00
abort: cannot backout change that is not an ancestor
tests: add exit codes to unified tests
2010-09-17 02:51:32 +04:00
[255]
hook: centralize passing HG_PENDING to external hook process This patch centralizes passing HG_PENDING to external hook process into '_exthook()'. To make in-memory changes visible to external hook process, this patch does: - write (or schedule to write) in-memory dirstate changes, and - set HG_PENDING environment variable, if: - a transaction is running, and - there are in-memory changes to be visible This patch tests some commands with some hooks, because transaction activity of a same hook differs from each other ("---": "not tested"). ======== ========= ========= ============ command preupdate precommit pretxncommit ======== ========= ========= ============ unshelve o --- --- backout x --- --- import --- o o qrefresh --- x o ======== ========= ========= ============ Each hooks are examined separately to prevent in-memory changes from being visible to external process accidentally by side effect of hooks previously invoked.
2015-10-16 19:15:34 +03:00
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
basic operation
backout: provide linear backout as a default (without --merge option) This changes backouts changeset to retain linear history, .e. it is committed as a child of the working directory parent, not the reverted changeset parent. The default behavior was previously to just commit a reverted change as a child of the backed out changeset - thus creating a new head. Most of the time, you would use the --merge option, as it does not make sense to keep this dangling head as is. The previous behavior could be obtained by using 'hg update --clean .' after a 'hg backout --merge'. The --merge option itself is not affected by this change. There is also still an autocommit of the backout if a merge is not needed, i.e. in case the backout is the parent of the working directory. Previously we had (pwd = parent of the working directory): pwd older backout auto merge backout --merge auto commit With the new linear approach: pwd older backout auto commit backout --merge auto commit auto: commit done by the backout command merge: backout also already committed but explicit merge and commit needed commit: user need to commit the update/merge
2010-09-10 12:28:18 +04:00
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
$ hg backout -d '1000 +0800' $C --no-edit
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
backout: remove revnum from output Reviewed By: singhsrb Differential Revision: D24201935 fbshipit-source-id: e1f4a9c9c82f401cc5b5ed9df464a58da64a0b65
2020-10-09 08:27:14 +03:00
changeset d2f56590172c backs out changeset 2e4218cf3ee0
backout: provide linear backout as a default (without --merge option) This changes backouts changeset to retain linear history, .e. it is committed as a child of the working directory parent, not the reverted changeset parent. The default behavior was previously to just commit a reverted change as a child of the backed out changeset - thus creating a new head. Most of the time, you would use the --merge option, as it does not make sense to keep this dangling head as is. The previous behavior could be obtained by using 'hg update --clean .' after a 'hg backout --merge'. The --merge option itself is not affected by this change. There is also still an autocommit of the backout if a merge is not needed, i.e. in case the backout is the parent of the working directory. Previously we had (pwd = parent of the working directory): pwd older backout auto merge backout --merge auto commit With the new linear approach: pwd older backout auto commit backout --merge auto commit auto: commit done by the backout command merge: backout also already committed but explicit merge and commit needed commit: user need to commit the update/merge
2010-09-10 12:28:18 +04:00
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
backout of backout is as if nothing happened
backout: accept '--edit' like other commands creating new changeset After this patch, users can invoke editor for the commit message by '--edit' option regardless of '--message'/'--logfile'.
2014-05-31 19:08:32 +04:00
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
$ hg backout -d '2000 +0800' tip --no-edit
removing A
reverting B
adding C
backout: remove revnum from output Reviewed By: singhsrb Differential Revision: D24201935 fbshipit-source-id: e1f4a9c9c82f401cc5b5ed9df464a58da64a0b65
2020-10-09 08:27:14 +03:00
changeset 6916acf22814 backs out changeset d2f56590172c
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
check the changes
$ hg log -Gr 'desc(Back)' -T '{desc}' -p --config diff.git=1
@ Back out "Back out "C""
config: use Rust graph render as default Summary: Change the legacy Python graph render to Rust renderer. Reviewed By: DurhamG Differential Revision: D24317802 fbshipit-source-id: 4c3dc3a6dd02b7ebe79596a8e77f4b6b139d2e20
2020-10-20 03:05:23 +03:00
│
│ Original commit changeset: d2f56590172cdiff --git a/A b/A
│ deleted file mode 100644
│ --- a/A
│ +++ /dev/null
│ @@ -1,1 +0,0 @@
│ -A
│ \ No newline at end of file
│ diff --git a/B b/B
│ --- a/B
│ +++ b/B
│ @@ -1,1 +1,1 @@
│ -B
│ \ No newline at end of file
│ +B1
│ \ No newline at end of file
│ diff --git a/C b/C
│ new file mode 100644
│ --- /dev/null
│ +++ b/C
│ @@ -0,0 +1,1 @@
│ +C
│ \ No newline at end of file
│
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
o Back out "C"
config: use Rust graph render as default Summary: Change the legacy Python graph render to Rust renderer. Reviewed By: DurhamG Differential Revision: D24317802 fbshipit-source-id: 4c3dc3a6dd02b7ebe79596a8e77f4b6b139d2e20
2020-10-20 03:05:23 +03:00
│
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
~ Original commit changeset: 2e4218cf3ee0diff --git a/A b/A
new file mode 100644
--- /dev/null
+++ b/A
@@ -0,0 +1,1 @@
+A
\ No newline at end of file
diff --git a/B b/B
--- a/B
+++ b/B
@@ -1,1 +1,1 @@
-B1
\ No newline at end of file
+B
\ No newline at end of file
diff --git a/C b/C
deleted file mode 100644
--- a/C
+++ /dev/null
@@ -1,1 +0,0 @@
-C
\ No newline at end of file
backout: accept '--edit' like other commands creating new changeset After this patch, users can invoke editor for the commit message by '--edit' option regardless of '--message'/'--logfile'.
2014-05-31 19:08:32 +04:00
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
test --no-commit
resolve: use "other" changeset from merge state (issue4163) We can use the "other" data from the recorded merge state instead of inferring what the other could be from working copy parent. This will allow resolve to fulfil its duty even when the second parent have been dropped. Most direct benefit is fixing a regression in backout.
2014-02-26 06:45:01 +04:00
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
$ hg up -qC $E
backout: fix --no-commit option (issue5054)
2016-01-20 19:16:58 +03:00
$ hg backout --no-commit .
test-backout: rewrite the test in a basic form Summary: The original test is unmaintainable. Rewrite it to test key features. I dropped detailed tests about merge conflict / content handling. In the future we probalby will have a clean Rust implementation of "applying diff between X and Y to Z" which can replace various unmaintainable patch application logic in Python. We can test that Rust library extensively and commands will just use the clean library (ex. revert, backout) Reviewed By: sfilipco Differential Revision: D22240184 fbshipit-source-id: 4d6c65fe02ccc92e64c62a48f702187678973086
2020-07-07 00:00:16 +03:00
removing E
changeset 49cb92066bfd backed out, don't forget to commit.
$ hg diff --config diff.git=1
diff --git a/E b/E
deleted file mode 100644
--- a/E
+++ /dev/null
@@ -1,1 +0,0 @@
-E
\ No newline at end of file
Reference in New Issue Copy Permalink