diff --git a/ghstack/submit.py b/ghstack/submit.py index 8b9f66f..02fc1ca 100644 --- a/ghstack/submit.py +++ b/ghstack/submit.py @@ -1199,9 +1199,7 @@ def _create_non_orig_branches( *ghstack.gpg_sign.gpg_args_if_necessary(self.sh), *base_args, base.tree, - input='Update base for {} on "{}"\n\n[ghstack-poisoned]'.format( - self.msg, diff.title - ), + input="{} (base update)\n\n[ghstack-poisoned]".format(self.msg), ) ) head_args.extend(("-p", new_base)) @@ -1356,9 +1354,7 @@ def _create_non_orig_branches( *ghstack.gpg_sign.gpg_args_if_necessary(self.sh), *head_args, diff.tree, - input='{} on "{}"\n\n[ghstack-poisoned]'.format( - self.msg, diff.title - ), + input="{}\n\n[ghstack-poisoned]".format(self.msg), ) ) if self.direct: diff --git a/test/land/default_branch_change.py.test b/test/land/default_branch_change.py.test index 0c89867..0448d20 100644 --- a/test/land/default_branch_change.py.test +++ b/test/land/default_branch_change.py.test @@ -25,14 +25,14 @@ assert_github_state( This is commit A - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 Repository state: - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) @@ -71,7 +71,7 @@ assert_github_state( This is commit A - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -80,18 +80,18 @@ assert_github_state( This is commit B - * f16bff9 Initial 2 on "Commit B" + * f30ebce Initial 2 Repository state: - * f16bff9 (gh/ezyang/2/head) - | Initial 2 on "Commit B" - * c7e3a0c (gh/ezyang/2/base) - Update base for Initial 2 on "Commit B" - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * f30ebce (gh/ezyang/2/head) + | Initial 2 + * 94673ed (gh/ezyang/2/base) + Initial 2 (base update) + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/land/invalid_resubmit.py.test b/test/land/invalid_resubmit.py.test index 187797a..8b717cf 100644 --- a/test/land/invalid_resubmit.py.test +++ b/test/land/invalid_resubmit.py.test @@ -44,14 +44,14 @@ else: This is commit A - * 856b1b6 New PR on "Commit A" + * 5f66713 New PR Repository state: - * 856b1b6 (gh/ezyang/1/head) - | New PR on "Commit A" - * 787f322 (gh/ezyang/1/base) - Update base for New PR on "Commit A" + * 5f66713 (gh/ezyang/1/head) + | New PR + * dd7d794 (gh/ezyang/1/base) + New PR (base update) """ ) diff --git a/test/land/update_after_land.py.test b/test/land/update_after_land.py.test index a7ab3d1..4e07516 100644 --- a/test/land/update_after_land.py.test +++ b/test/land/update_after_land.py.test @@ -55,19 +55,19 @@ else: This is commit B - * 6528345 Run 3 on "Commit B" - * e93dd90 Initial 1 on "Commit B" + * ea56242 Run 3 + * a3419f5 Initial 1 Repository state: - * 6528345 (gh/ezyang/2/head) - |\\ Run 3 on "Commit B" - | * 2c00bc7 (gh/ezyang/2/base) - | | Update base for Run 3 on "Commit B" - * | e93dd90 - |/ Initial 1 on "Commit B" - * 211ed82 - Update base for Initial 1 on "Commit B" + * ea56242 (gh/ezyang/2/head) + |\\ Run 3 + | * c7cbff7 (gh/ezyang/2/base) + | | Run 3 (base update) + * | a3419f5 + |/ Initial 1 + * c66825d + Initial 1 (base update) """ ) diff --git a/test/submit/amend.py.test b/test/submit/amend.py.test index 5f3eb62..470c700 100644 --- a/test/submit/amend.py.test +++ b/test/submit/amend.py.test @@ -15,15 +15,15 @@ if is_direct(): This is commit A - * e3902de Update A on "Commit A" - * c3ca023 Initial 1 on "Commit A" + * 324abac Update A + * 8c7d059 Initial 1 Repository state: - * e3902de (gh/ezyang/1/next, gh/ezyang/1/head) - | Update A on "Commit A" - * c3ca023 - | Initial 1 on "Commit A" + * 324abac (gh/ezyang/1/next, gh/ezyang/1/head) + | Update A + * 8c7d059 + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -38,16 +38,16 @@ else: This is commit A - * e46afee Update A on "Commit A" - * f4778ef Initial 1 on "Commit A" + * 5d7b4a1 Update A + * 36498d0 Initial 1 Repository state: - * e46afee (gh/ezyang/1/head) - | Update A on "Commit A" - * f4778ef - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 5d7b4a1 (gh/ezyang/1/head) + | Update A + * 36498d0 + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """, ) diff --git a/test/submit/amend_all.py.test b/test/submit/amend_all.py.test index 363527e..85c1b4c 100644 --- a/test/submit/amend_all.py.test +++ b/test/submit/amend_all.py.test @@ -21,26 +21,26 @@ if is_direct(): This is commit A - * 9d56b39 Update A on "Commit A" - * c3ca023 Initial 1 on "Commit A" + * 60bc096 Update A + * 8c7d059 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * e3873c9 Update A on "Commit B" - * 09a6970 Initial 2 on "Commit B" + * 797401a Update A + * 0243aa2 Initial 2 Repository state: - * e3873c9 (gh/ezyang/2/next, gh/ezyang/2/head) - |\\ Update A on "Commit B" - | * 9d56b39 (gh/ezyang/1/next, gh/ezyang/1/head) - | | Update A on "Commit A" - * | 09a6970 - |/ Initial 2 on "Commit B" - * c3ca023 - | Initial 1 on "Commit A" + * 797401a (gh/ezyang/2/next, gh/ezyang/2/head) + |\\ Update A + | * 60bc096 (gh/ezyang/1/next, gh/ezyang/1/head) + | | Update A + * | 0243aa2 + |/ Initial 2 + * 8c7d059 + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -56,8 +56,8 @@ else: This is commit A - * 98de643 Update A on "Commit A" - * f4778ef Initial 1 on "Commit A" + * 2beb1f1 Update A + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -67,24 +67,24 @@ else: This is commit B - * 870e05a Update A on "Commit B" - * f16bff9 Initial 2 on "Commit B" + * 4430ba6 Update A + * f30ebce Initial 2 Repository state: - * 98de643 (gh/ezyang/1/head) - | Update A on "Commit A" - * f4778ef - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" - * 870e05a (gh/ezyang/2/head) - |\\ Update A on "Commit B" - | * 293b569 (gh/ezyang/2/base) - | | Update base for Update A on "Commit B" - * | f16bff9 - |/ Initial 2 on "Commit B" - * c7e3a0c - Update base for Initial 2 on "Commit B" + * 2beb1f1 (gh/ezyang/1/head) + | Update A + * 36498d0 + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) + * 4430ba6 (gh/ezyang/2/head) + |\\ Update A + | * d315f95 (gh/ezyang/2/base) + | | Update A (base update) + * | f30ebce + |/ Initial 2 + * 94673ed + Initial 2 (base update) """ ) diff --git a/test/submit/amend_bottom.py.test b/test/submit/amend_bottom.py.test index 42763a2..89fbeae 100644 --- a/test/submit/amend_bottom.py.test +++ b/test/submit/amend_bottom.py.test @@ -21,26 +21,26 @@ if is_direct(): This is commit A - * f22b24c Update A on "Commit A" - * c3ca023 Initial 1 on "Commit A" + * 014ce24 Update A + * 8c7d059 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * 165ebd2 Update B on "Commit B" - * 09a6970 Initial 2 on "Commit B" + * f7f05ff Update B + * 0243aa2 Initial 2 Repository state: - * 165ebd2 (gh/ezyang/2/next, gh/ezyang/2/head) - |\\ Update B on "Commit B" - | * f22b24c (gh/ezyang/1/next, gh/ezyang/1/head) - | | Update A on "Commit A" - * | 09a6970 - |/ Initial 2 on "Commit B" - * c3ca023 - | Initial 1 on "Commit A" + * f7f05ff (gh/ezyang/2/next, gh/ezyang/2/head) + |\\ Update B + | * 014ce24 (gh/ezyang/1/next, gh/ezyang/1/head) + | | Update A + * | 0243aa2 + |/ Initial 2 + * 8c7d059 + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -56,8 +56,8 @@ else: This is commit A - * 79e3249 Update A on "Commit A" - * f4778ef Initial 1 on "Commit A" + * 23930b1 Update A + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -67,24 +67,24 @@ else: This is commit B - * dd9d87d Update B on "Commit B" - * f16bff9 Initial 2 on "Commit B" + * 976c018 Update B + * f30ebce Initial 2 Repository state: - * dd9d87d (gh/ezyang/2/head) - |\\ Update B on "Commit B" - | * e24c5c2 (gh/ezyang/2/base) - | | Update base for Update B on "Commit B" - * | f16bff9 - |/ Initial 2 on "Commit B" - * c7e3a0c - Update base for Initial 2 on "Commit B" - * 79e3249 (gh/ezyang/1/head) - | Update A on "Commit A" - * f4778ef - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 976c018 (gh/ezyang/2/head) + |\\ Update B + | * e3a6e9d (gh/ezyang/2/base) + | | Update B (base update) + * | f30ebce + |/ Initial 2 + * 94673ed + Initial 2 (base update) + * 23930b1 (gh/ezyang/1/head) + | Update A + * 36498d0 + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """, ) diff --git a/test/submit/amend_message_only.py.test b/test/submit/amend_message_only.py.test index 921cc4d..714075d 100644 --- a/test/submit/amend_message_only.py.test +++ b/test/submit/amend_message_only.py.test @@ -16,12 +16,12 @@ if is_direct(): This is commit AAA - * 9bd4255 Initial 1 on "Commit AAA" + * 5cd944b Initial 1 Repository state: - * 9bd4255 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit AAA" + * 5cd944b (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -36,14 +36,14 @@ else: This is commit AAA - * 95822ad Initial 1 on "Commit AAA" + * 6f7501b Initial 1 Repository state: - * 95822ad (gh/ezyang/1/head) - | Initial 1 on "Commit AAA" - * 15927ae (gh/ezyang/1/base) - Update base for Initial 1 on "Commit AAA" + * 6f7501b (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """, ) diff --git a/test/submit/amend_top.py.test b/test/submit/amend_top.py.test index 42d7ced..332418c 100644 --- a/test/submit/amend_top.py.test +++ b/test/submit/amend_top.py.test @@ -18,23 +18,23 @@ if is_direct(): This is commit A - * c3ca023 Initial 1 on "Commit A" + * 8c7d059 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * 20bbb07 Update A on "Commit B" - * 09a6970 Initial 2 on "Commit B" + * 4138a07 Update A + * 0243aa2 Initial 2 Repository state: - * 20bbb07 (gh/ezyang/2/next, gh/ezyang/2/head) - | Update A on "Commit B" - * 09a6970 - | Initial 2 on "Commit B" - * c3ca023 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 4138a07 (gh/ezyang/2/next, gh/ezyang/2/head) + | Update A + * 0243aa2 + | Initial 2 + * 8c7d059 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -50,7 +50,7 @@ else: This is commit A - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -60,20 +60,20 @@ else: This is commit B - * d4be138 Update A on "Commit B" - * f16bff9 Initial 2 on "Commit B" + * 339d734 Update A + * f30ebce Initial 2 Repository state: - * d4be138 (gh/ezyang/2/head) - | Update A on "Commit B" - * f16bff9 - | Initial 2 on "Commit B" - * c7e3a0c (gh/ezyang/2/base) - Update base for Initial 2 on "Commit B" - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 339d734 (gh/ezyang/2/head) + | Update A + * f30ebce + | Initial 2 + * 94673ed (gh/ezyang/2/base) + Initial 2 (base update) + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """, ) diff --git a/test/submit/bullet_divider.py.test b/test/submit/bullet_divider.py.test index 041cd5e..cf662b6 100644 --- a/test/submit/bullet_divider.py.test +++ b/test/submit/bullet_divider.py.test @@ -22,12 +22,12 @@ if is_direct(): * It starts with a fabulous * Bullet list - * c092307 Initial on "This is my commit" + * b167219 Initial Repository state: - * c092307 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial on "This is my commit" + * b167219 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial * dc8bfe4 (HEAD -> master) Initial commit """ @@ -45,14 +45,14 @@ else: * It starts with a fabulous * Bullet list - * 840eb38 Initial on "This is my commit" + * 6ee2f33 Initial Repository state: - * 840eb38 (gh/ezyang/1/head) - | Initial on "This is my commit" - * b059a32 (gh/ezyang/1/base) - Update base for Initial on "This is my commit" + * 6ee2f33 (gh/ezyang/1/head) + | Initial + * 4e54cdd (gh/ezyang/1/base) + Initial (base update) """ ) diff --git a/test/submit/cherry_pick.py.test b/test/submit/cherry_pick.py.test index f658935..1f35e02 100644 --- a/test/submit/cherry_pick.py.test +++ b/test/submit/cherry_pick.py.test @@ -22,26 +22,26 @@ if is_direct(): This is commit A - * 2949b6b Initial 2 on "Commit A" + * 2193fd2 Initial 2 [O] #501 Commit B (gh/ezyang/2/head -> master) This is commit B - * 89cac20 Cherry pick on "Commit B" - * d8884f2 Initial 2 on "Commit B" - * 2949b6b Initial 2 on "Commit A" + * 6d41420 Cherry pick + * ce2fa9b Initial 2 + * 2193fd2 Initial 2 Repository state: - * 89cac20 (gh/ezyang/2/next, gh/ezyang/2/head) - |\\ Cherry pick on "Commit B" + * 6d41420 (gh/ezyang/2/next, gh/ezyang/2/head) + |\\ Cherry pick | * 7ceeaa9 (HEAD -> master) | | Commit M - * | d8884f2 - | | Initial 2 on "Commit B" - * | 2949b6b (gh/ezyang/1/next, gh/ezyang/1/head) - |/ Initial 2 on "Commit A" + * | ce2fa9b + | | Initial 2 + * | 2193fd2 (gh/ezyang/1/next, gh/ezyang/1/head) + |/ Initial 2 * dc8bfe4 Initial commit """ @@ -57,7 +57,7 @@ else: This is commit A - * 48cad68 Initial 2 on "Commit A" + * ab3db60 Initial 2 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -66,22 +66,22 @@ else: This is commit B - * c1946ee Cherry pick on "Commit B" - * f16bff9 Initial 2 on "Commit B" + * 40beaad Cherry pick + * f30ebce Initial 2 Repository state: - * c1946ee (gh/ezyang/2/head) - |\\ Cherry pick on "Commit B" - | * cd14633 (gh/ezyang/2/base) - | | Update base for Cherry pick on "Commit B" - * | f16bff9 - |/ Initial 2 on "Commit B" - * c7e3a0c - Update base for Initial 2 on "Commit B" - * 48cad68 (gh/ezyang/1/head) - | Initial 2 on "Commit A" - * adb13d7 (gh/ezyang/1/base) - Update base for Initial 2 on "Commit A" + * 40beaad (gh/ezyang/2/head) + |\\ Cherry pick + | * 3bf3b56 (gh/ezyang/2/base) + | | Cherry pick (base update) + * | f30ebce + |/ Initial 2 + * 94673ed + Initial 2 (base update) + * ab3db60 (gh/ezyang/1/head) + | Initial 2 + * e957508 (gh/ezyang/1/base) + Initial 2 (base update) """ ) diff --git a/test/submit/commit_amended_to_empty.py.test b/test/submit/commit_amended_to_empty.py.test index 7e29774..d56804c 100644 --- a/test/submit/commit_amended_to_empty.py.test +++ b/test/submit/commit_amended_to_empty.py.test @@ -24,13 +24,13 @@ if not is_direct(): This is my first commit - * 8b630a1 Initial on "Commit 1" + * cfa2c39 Initial Repository state: - * 8b630a1 (gh/ezyang/1/head) - | Initial on "Commit 1" - * 1658d0f (gh/ezyang/1/base) - Update base for Initial on "Commit 1" + * cfa2c39 (gh/ezyang/1/head) + | Initial + * bd0a7b9 (gh/ezyang/1/base) + Initial (base update) """, ) diff --git a/test/submit/do_not_revert_local_commit_msg_on_skip.py.test b/test/submit/do_not_revert_local_commit_msg_on_skip.py.test index 284e172..8900357 100644 --- a/test/submit/do_not_revert_local_commit_msg_on_skip.py.test +++ b/test/submit/do_not_revert_local_commit_msg_on_skip.py.test @@ -38,12 +38,12 @@ if is_direct(): This is commit TO_REPLACE - * 0d352e8 Initial on "Commit TO_REPLACE" + * 43ce90d Initial Repository state: - * 0d352e8 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial on "Commit TO_REPLACE" + * 43ce90d (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial * dc8bfe4 (HEAD -> master) Initial commit """ @@ -58,14 +58,14 @@ else: This is commit TO_REPLACE - * 37fd652 Initial on "Commit TO_REPLACE" + * bfe45a3 Initial Repository state: - * 37fd652 (gh/ezyang/1/head) - | Initial on "Commit TO_REPLACE" - * b6bd9bb (gh/ezyang/1/base) - Update base for Initial on "Commit TO_REPLACE" + * bfe45a3 (gh/ezyang/1/head) + | Initial + * 4e54cdd (gh/ezyang/1/base) + Initial (base update) """ ) diff --git a/test/submit/empty_commit.py.test b/test/submit/empty_commit.py.test index e7681b0..45967b4 100644 --- a/test/submit/empty_commit.py.test +++ b/test/submit/empty_commit.py.test @@ -17,13 +17,13 @@ else: This is commit B - * 0a47f30 Initial on "Commit B" + * 672cd30 Initial Repository state: - * 0a47f30 (gh/ezyang/1/head) - | Initial on "Commit B" - * 481ab4c (gh/ezyang/1/base) - Update base for Initial on "Commit B" + * 672cd30 (gh/ezyang/1/head) + | Initial + * 4e54cdd (gh/ezyang/1/base) + Initial (base update) """ ) diff --git a/test/submit/multi.py.test b/test/submit/multi.py.test index 3f56817..93ba0be 100644 --- a/test/submit/multi.py.test +++ b/test/submit/multi.py.test @@ -11,20 +11,20 @@ if is_direct(): This is commit A - * c5b379e Initial 1 and 2 on "Commit A" + * 6eac261 Initial 1 and 2 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * fd9fc99 Initial 1 and 2 on "Commit B" + * 49a82f5 Initial 1 and 2 Repository state: - * fd9fc99 (gh/ezyang/2/next, gh/ezyang/2/head) - | Initial 1 and 2 on "Commit B" - * c5b379e (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 and 2 on "Commit A" + * 49a82f5 (gh/ezyang/2/next, gh/ezyang/2/head) + | Initial 1 and 2 + * 6eac261 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 and 2 * dc8bfe4 (HEAD -> master) Initial commit """, @@ -40,7 +40,7 @@ else: This is commit A - * 01a577e Initial 1 and 2 on "Commit A" + * 777af59 Initial 1 and 2 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -50,17 +50,17 @@ else: This is commit B - * 4bc08ea Initial 1 and 2 on "Commit B" + * 3c3426d Initial 1 and 2 Repository state: - * 01a577e (gh/ezyang/1/head) - | Initial 1 and 2 on "Commit A" - * 7557970 (gh/ezyang/1/base) - Update base for Initial 1 and 2 on "Commit A" - * 4bc08ea (gh/ezyang/2/head) - | Initial 1 and 2 on "Commit B" - * 0db1241 (gh/ezyang/2/base) - Update base for Initial 1 and 2 on "Commit B" + * 777af59 (gh/ezyang/1/head) + | Initial 1 and 2 + * 873273a (gh/ezyang/1/base) + Initial 1 and 2 (base update) + * 3c3426d (gh/ezyang/2/head) + | Initial 1 and 2 + * 9f0da86 (gh/ezyang/2/base) + Initial 1 and 2 (base update) """ ) diff --git a/test/submit/no_clobber.py.test b/test/submit/no_clobber.py.test index 0df2ca6..eee3f72 100644 --- a/test/submit/no_clobber.py.test +++ b/test/submit/no_clobber.py.test @@ -30,12 +30,12 @@ if is_direct(): Directly updated message body - * aed2eaf Initial 1 on "Commit 1" + * 6c1d876 Initial 1 Repository state: - * aed2eaf (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit 1" + * 6c1d876 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -50,14 +50,14 @@ else: Directly updated message body - * e0c08a4 Initial 1 on "Commit 1" + * 20ec3e0 Initial 1 Repository state: - * e0c08a4 (gh/ezyang/1/head) - | Initial 1 on "Commit 1" - * bf7ce67 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit 1" + * 20ec3e0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) @@ -77,15 +77,15 @@ if is_direct(): Directly updated message body - * 8e58607 Update 1 on "Commit 1" - * aed2eaf Initial 1 on "Commit 1" + * 3c9d67f Update 1 + * 6c1d876 Initial 1 Repository state: - * 8e58607 (gh/ezyang/1/next, gh/ezyang/1/head) - | Update 1 on "Commit 1" - * aed2eaf - | Initial 1 on "Commit 1" + * 3c9d67f (gh/ezyang/1/next, gh/ezyang/1/head) + | Update 1 + * 6c1d876 + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -100,16 +100,16 @@ else: Directly updated message body - * 5c110bc Update 1 on "Commit 1" - * e0c08a4 Initial 1 on "Commit 1" + * 4300988 Update 1 + * 20ec3e0 Initial 1 Repository state: - * 5c110bc (gh/ezyang/1/head) - | Update 1 on "Commit 1" - * e0c08a4 - | Initial 1 on "Commit 1" - * bf7ce67 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit 1" + * 4300988 (gh/ezyang/1/head) + | Update 1 + * 20ec3e0 + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/submit/no_clobber_carriage_returns.py.test b/test/submit/no_clobber_carriage_returns.py.test index 9e3752e..83efb72 100644 --- a/test/submit/no_clobber_carriage_returns.py.test +++ b/test/submit/no_clobber_carriage_returns.py.test @@ -18,12 +18,12 @@ if is_direct(): Original message - * aed2eaf Initial 1 on "Commit 1" + * 6c1d876 Initial 1 Repository state: - * aed2eaf (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit 1" + * 6c1d876 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -38,14 +38,14 @@ else: Original message - * e0c08a4 Initial 1 on "Commit 1" + * 20ec3e0 Initial 1 Repository state: - * e0c08a4 (gh/ezyang/1/head) - | Initial 1 on "Commit 1" - * bf7ce67 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit 1" + * 20ec3e0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) @@ -78,20 +78,20 @@ if is_direct(): Directly updated message body - * aed2eaf Initial 1 on "Commit 1" + * 6c1d876 Initial 1 [O] #501 Commit 2 (gh/ezyang/2/head -> gh/ezyang/1/head) - * 3b3a497 Initial 2 on "Commit 2" + * ea46774 Initial 2 Repository state: - * 3b3a497 (gh/ezyang/2/next, gh/ezyang/2/head) - | Initial 2 on "Commit 2" - * aed2eaf (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit 1" + * ea46774 (gh/ezyang/2/next, gh/ezyang/2/head) + | Initial 2 + * 6c1d876 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -107,7 +107,7 @@ else: Directly updated message body - * e0c08a4 Initial 1 on "Commit 1" + * 20ec3e0 Initial 1 [O] #501 Commit 2 (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -117,17 +117,17 @@ else: - * 9357368 Initial 2 on "Commit 2" + * 43303fd Initial 2 Repository state: - * 9357368 (gh/ezyang/2/head) - | Initial 2 on "Commit 2" - * f1dde2f (gh/ezyang/2/base) - Update base for Initial 2 on "Commit 2" - * e0c08a4 (gh/ezyang/1/head) - | Initial 1 on "Commit 1" - * bf7ce67 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit 1" + * 43303fd (gh/ezyang/2/head) + | Initial 2 + * 7315319 (gh/ezyang/2/base) + Initial 2 (base update) + * 20ec3e0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/submit/non_standard_base.py.test b/test/submit/non_standard_base.py.test index 57d8f87..65a8570 100644 --- a/test/submit/non_standard_base.py.test +++ b/test/submit/non_standard_base.py.test @@ -27,12 +27,12 @@ if is_direct(): This is commit A - * 6ba7821 Initial 1 on "Commit A" + * 503142b Initial 1 Repository state: - * 6ba7821 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 503142b (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * 9ac8806 (release) | Commit R * dc8bfe4 @@ -49,14 +49,14 @@ else: This is commit A - * 60198a4 Initial 1 on "Commit A" + * dedc4f1 Initial 1 Repository state: - * 60198a4 (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 78d3774 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * dedc4f1 (gh/ezyang/1/head) + | Initial 1 + * ab82953 (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/submit/rebase.py.test b/test/submit/rebase.py.test index 2ed09c4..030d9f5 100644 --- a/test/submit/rebase.py.test +++ b/test/submit/rebase.py.test @@ -23,28 +23,28 @@ if is_direct(): This is commit A - * dc45e07 Rebase on "Commit A" - * c3ca023 Initial 1 on "Commit A" + * b0558d8 Rebase + * 8c7d059 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * 952418e Rebase on "Commit B" - * 09a6970 Initial 2 on "Commit B" + * 0f3659f Rebase + * 0243aa2 Initial 2 Repository state: - * 952418e (gh/ezyang/2/next, gh/ezyang/2/head) - |\\ Rebase on "Commit B" - | * dc45e07 (gh/ezyang/1/next, gh/ezyang/1/head) - | |\\ Rebase on "Commit A" + * 0f3659f (gh/ezyang/2/next, gh/ezyang/2/head) + |\\ Rebase + | * b0558d8 (gh/ezyang/1/next, gh/ezyang/1/head) + | |\\ Rebase | | * 7ceeaa9 (HEAD -> master) | | | Commit M - * | | 09a6970 - |/ / Initial 2 on "Commit B" - * / c3ca023 - |/ Initial 1 on "Commit A" + * | | 0243aa2 + |/ / Initial 2 + * / 8c7d059 + |/ Initial 1 * dc8bfe4 Initial commit """ @@ -60,8 +60,8 @@ else: This is commit A - * 51b1590 Rebase on "Commit A" - * f4778ef Initial 1 on "Commit A" + * 0ed6144 Rebase + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -71,26 +71,26 @@ else: This is commit B - * f33fe2b Rebase on "Commit B" - * f16bff9 Initial 2 on "Commit B" + * e92f0ac Rebase + * f30ebce Initial 2 Repository state: - * 51b1590 (gh/ezyang/1/head) - |\\ Rebase on "Commit A" - | * 0c51c0c (gh/ezyang/1/base) - | | Update base for Rebase on "Commit A" - * | f4778ef - |/ Initial 1 on "Commit A" - * 6b23cb6 - Update base for Initial 1 on "Commit A" - * f33fe2b (gh/ezyang/2/head) - |\\ Rebase on "Commit B" - | * 96db6fb (gh/ezyang/2/base) - | | Update base for Rebase on "Commit B" - * | f16bff9 - |/ Initial 2 on "Commit B" - * c7e3a0c - Update base for Initial 2 on "Commit B" + * 0ed6144 (gh/ezyang/1/head) + |\\ Rebase + | * a094338 (gh/ezyang/1/base) + | | Rebase (base update) + * | 36498d0 + |/ Initial 1 + * 3e4048c + Initial 1 (base update) + * e92f0ac (gh/ezyang/2/head) + |\\ Rebase + | * c1ad9fe (gh/ezyang/2/base) + | | Rebase (base update) + * | f30ebce + |/ Initial 2 + * 94673ed + Initial 2 (base update) """ ) diff --git a/test/submit/reject_head_stack.py.test b/test/submit/reject_head_stack.py.test index 8ad689b..48c78f4 100644 --- a/test/submit/reject_head_stack.py.test +++ b/test/submit/reject_head_stack.py.test @@ -34,7 +34,7 @@ else: assert_expected_raises_inline( RuntimeError, lambda: gh_submit("Initial 2"), - """The commit bf7ce671c293e697b02ea2e5b53c794305d9eb73 has 0 parents, which makes my head explode. `git rebase -i` your diffs into a stack, then try again.""", + """The commit 3e4048c2f33782ae288f36f5fa10281ce0bdb6ec has 0 parents, which makes my head explode. `git rebase -i` your diffs into a stack, then try again.""", ) # ------------------------------------------------------------------------- # diff --git a/test/submit/remove_bottom_commit.py.test b/test/submit/remove_bottom_commit.py.test index 31b2349..043bdbd 100644 --- a/test/submit/remove_bottom_commit.py.test +++ b/test/submit/remove_bottom_commit.py.test @@ -21,24 +21,24 @@ if is_direct(): This is commit A - * 2949b6b Initial 2 on "Commit A" + * 2193fd2 Initial 2 [O] #501 Commit B (gh/ezyang/2/head -> master) This is commit B - * 558bd88 Cherry pick on "Commit B" - * d8884f2 Initial 2 on "Commit B" - * 2949b6b Initial 2 on "Commit A" + * 64a7ca2 Cherry pick + * ce2fa9b Initial 2 + * 2193fd2 Initial 2 Repository state: - * 558bd88 (gh/ezyang/2/next, gh/ezyang/2/head) - | Cherry pick on "Commit B" - * d8884f2 - | Initial 2 on "Commit B" - * 2949b6b (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 2 on "Commit A" + * 64a7ca2 (gh/ezyang/2/next, gh/ezyang/2/head) + | Cherry pick + * ce2fa9b + | Initial 2 + * 2193fd2 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 2 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -54,7 +54,7 @@ else: This is commit A - * 48cad68 Initial 2 on "Commit A" + * ab3db60 Initial 2 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -63,23 +63,23 @@ else: This is commit B - * 721a3b9 Cherry pick on "Commit B" - * f16bff9 Initial 2 on "Commit B" + * 4c3b577 Cherry pick + * f30ebce Initial 2 Repository state: - * 721a3b9 (gh/ezyang/2/head) - |\\ Cherry pick on "Commit B" - | * 610abfa (gh/ezyang/2/base) - | | Update base for Cherry pick on "Commit B" - * | f16bff9 - |/ Initial 2 on "Commit B" - * c7e3a0c - Update base for Initial 2 on "Commit B" - * 48cad68 (gh/ezyang/1/head) - | Initial 2 on "Commit A" - * adb13d7 (gh/ezyang/1/base) - Update base for Initial 2 on "Commit A" + * 4c3b577 (gh/ezyang/2/head) + |\\ Cherry pick + | * f368920 (gh/ezyang/2/base) + | | Cherry pick (base update) + * | f30ebce + |/ Initial 2 + * 94673ed + Initial 2 (base update) + * ab3db60 (gh/ezyang/1/head) + | Initial 2 + * e957508 (gh/ezyang/1/base) + Initial 2 (base update) """ ) diff --git a/test/submit/reorder.py.test b/test/submit/reorder.py.test index e286668..ddb2349 100644 --- a/test/submit/reorder.py.test +++ b/test/submit/reorder.py.test @@ -18,26 +18,26 @@ if is_direct(): This is commit A - * 3a17667 Reorder on "Commit A" + * f61b335 Reorder [O] #501 Commit B (gh/ezyang/2/head -> master) This is commit B - * 5f812b3 Reorder on "Commit B" - * 60b80d9 Initial on "Commit B" - * 8bf3ca1 Initial on "Commit A" + * d5456ba Reorder + * 14761ce Initial + * 92a6dc7 Initial Repository state: - * 3a17667 (gh/ezyang/1/next, gh/ezyang/1/head) - |\\ Reorder on "Commit A" - | * 5f812b3 (gh/ezyang/2/next, gh/ezyang/2/head) - | | Reorder on "Commit B" - | * 60b80d9 - |/ Initial on "Commit B" - * 8bf3ca1 - | Initial on "Commit A" + * f61b335 (gh/ezyang/1/next, gh/ezyang/1/head) + |\\ Reorder + | * d5456ba (gh/ezyang/2/next, gh/ezyang/2/head) + | | Reorder + | * 14761ce + |/ Initial + * 92a6dc7 + | Initial * dc8bfe4 (HEAD -> master) Initial commit """ @@ -53,8 +53,8 @@ else: This is commit A - * 5a11d6e Reorder on "Commit A" - * 30f6c01 Initial on "Commit A" + * 2c54930 Reorder + * ce752f6 Initial [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -64,26 +64,26 @@ else: This is commit B - * 28e7ae2 Reorder on "Commit B" - * 4d6d2a4 Initial on "Commit B" + * d85a07e Reorder + * 20d8f25 Initial Repository state: - * 5a11d6e (gh/ezyang/1/head) - |\\ Reorder on "Commit A" - | * 48df0b3 (gh/ezyang/1/base) - | | Update base for Reorder on "Commit A" - * | 30f6c01 - |/ Initial on "Commit A" - * 7e61353 - Update base for Initial on "Commit A" - * 28e7ae2 (gh/ezyang/2/head) - |\\ Reorder on "Commit B" - | * 7be762b (gh/ezyang/2/base) - | | Update base for Reorder on "Commit B" - * | 4d6d2a4 - |/ Initial on "Commit B" - * c9e5b0d - Update base for Initial on "Commit B" + * 2c54930 (gh/ezyang/1/head) + |\\ Reorder + | * df39342 (gh/ezyang/1/base) + | | Reorder (base update) + * | ce752f6 + |/ Initial + * 5a1c625 + Initial (base update) + * d85a07e (gh/ezyang/2/head) + |\\ Reorder + | * 47b1e1f (gh/ezyang/2/base) + | | Reorder (base update) + * | 20d8f25 + |/ Initial + * 770af83 + Initial (base update) """ ) diff --git a/test/submit/simple.py.test b/test/submit/simple.py.test index 1f7aa92..a30f0ea 100644 --- a/test/submit/simple.py.test +++ b/test/submit/simple.py.test @@ -17,20 +17,20 @@ if is_direct(): This is commit A - * c3ca023 Initial 1 on "Commit A" + * 8c7d059 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * 09a6970 Initial 2 on "Commit B" + * 0243aa2 Initial 2 Repository state: - * 09a6970 (gh/ezyang/2/next, gh/ezyang/2/head) - | Initial 2 on "Commit B" - * c3ca023 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 0243aa2 (gh/ezyang/2/next, gh/ezyang/2/head) + | Initial 2 + * 8c7d059 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -46,7 +46,7 @@ else: This is commit A - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -56,18 +56,18 @@ else: This is commit B - * f16bff9 Initial 2 on "Commit B" + * f30ebce Initial 2 Repository state: - * f16bff9 (gh/ezyang/2/head) - | Initial 2 on "Commit B" - * c7e3a0c (gh/ezyang/2/base) - Update base for Initial 2 on "Commit B" - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * f30ebce (gh/ezyang/2/head) + | Initial 2 + * 94673ed (gh/ezyang/2/base) + Initial 2 (base update) + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """, ) diff --git a/test/submit/strip_mentions.py.test b/test/submit/strip_mentions.py.test index 6778711..316469d 100644 --- a/test/submit/strip_mentions.py.test +++ b/test/submit/strip_mentions.py.test @@ -29,7 +29,7 @@ amend("A2") assert_expected_inline( git("log", "--format=%B", "-n1", "origin/gh/ezyang/1/head"), """\ -Update 1 on "Commit 1" +Update 1 [ghstack-poisoned]""", ) diff --git a/test/submit/unrelated_malformed_gh_branch_ok.py.test b/test/submit/unrelated_malformed_gh_branch_ok.py.test index 19b6b13..dcb2921 100644 --- a/test/submit/unrelated_malformed_gh_branch_ok.py.test +++ b/test/submit/unrelated_malformed_gh_branch_ok.py.test @@ -25,20 +25,20 @@ if is_direct(): This is commit A - * c3ca023 Initial 1 on "Commit A" + * 8c7d059 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * 09a6970 Initial 2 on "Commit B" + * 0243aa2 Initial 2 Repository state: - * 09a6970 (gh/ezyang/2/next, gh/ezyang/2/head) - | Initial 2 on "Commit B" - * c3ca023 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 0243aa2 (gh/ezyang/2/next, gh/ezyang/2/head) + | Initial 2 + * 8c7d059 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master, gh/ezyang/non_int/head, gh/ezyang/malform) Initial commit """ @@ -54,7 +54,7 @@ else: This is commit A - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -64,18 +64,18 @@ else: This is commit B - * f16bff9 Initial 2 on "Commit B" + * f30ebce Initial 2 Repository state: - * f16bff9 (gh/ezyang/2/head) - | Initial 2 on "Commit B" - * c7e3a0c (gh/ezyang/2/base) - Update base for Initial 2 on "Commit B" - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * f30ebce (gh/ezyang/2/head) + | Initial 2 + * 94673ed (gh/ezyang/2/base) + Initial 2 (base update) + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) * dc8bfe4 (HEAD -> master, gh/ezyang/non_int/head, gh/ezyang/malform) Initial commit """, diff --git a/test/submit/update_fields.py.test b/test/submit/update_fields.py.test index d351dcc..cadfc94 100644 --- a/test/submit/update_fields.py.test +++ b/test/submit/update_fields.py.test @@ -23,12 +23,12 @@ if is_direct(): Directly updated message body - * aed2eaf Initial 1 on "Commit 1" + * 6c1d876 Initial 1 Repository state: - * aed2eaf (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit 1" + * 6c1d876 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -40,14 +40,14 @@ else: Directly updated message body - * e0c08a4 Initial 1 on "Commit 1" + * 20ec3e0 Initial 1 Repository state: - * e0c08a4 (gh/ezyang/1/head) - | Initial 1 on "Commit 1" - * bf7ce67 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit 1" + * 20ec3e0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) @@ -60,12 +60,12 @@ if is_direct(): Original message - * aed2eaf Initial 1 on "Commit 1" + * 6c1d876 Initial 1 Repository state: - * aed2eaf (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit 1" + * 6c1d876 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -80,14 +80,14 @@ else: Original message - * e0c08a4 Initial 1 on "Commit 1" + * 20ec3e0 Initial 1 Repository state: - * e0c08a4 (gh/ezyang/1/head) - | Initial 1 on "Commit 1" - * bf7ce67 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit 1" + * 20ec3e0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/submit/update_fields_preserve_differential_revision.py.test b/test/submit/update_fields_preserve_differential_revision.py.test index 821ff92..c01c54f 100644 --- a/test/submit/update_fields_preserve_differential_revision.py.test +++ b/test/submit/update_fields_preserve_differential_revision.py.test @@ -28,12 +28,12 @@ if is_direct(): Differential Revision: [D14778507](https://our.internmc.facebook.com/intern/diff/D14778507) - * c3ca023 Initial 1 on "Commit A" + * 8c7d059 Initial 1 Repository state: - * c3ca023 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 8c7d059 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -50,14 +50,14 @@ else: Differential Revision: [D14778507](https://our.internmc.facebook.com/intern/diff/D14778507) - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 Repository state: - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) @@ -72,12 +72,12 @@ if is_direct(): Differential Revision: [D14778507](https://our.internmc.facebook.com/intern/diff/D14778507) - * c3ca023 Initial 1 on "Commit A" + * 8c7d059 Initial 1 Repository state: - * c3ca023 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 8c7d059 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -94,14 +94,14 @@ else: Differential Revision: [D14778507](https://our.internmc.facebook.com/intern/diff/D14778507) - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 Repository state: - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/submit/update_fields_preserves_commit_message.py.test b/test/submit/update_fields_preserves_commit_message.py.test index 59efb9d..6615317 100644 --- a/test/submit/update_fields_preserves_commit_message.py.test +++ b/test/submit/update_fields_preserves_commit_message.py.test @@ -17,12 +17,12 @@ if is_direct(): This is commit A - * c3ca023 Initial 1 on "Commit A" + * 8c7d059 Initial 1 Repository state: - * c3ca023 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" + * 8c7d059 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -37,14 +37,14 @@ else: This is commit A - * f4778ef Initial 1 on "Commit A" + * 36498d0 Initial 1 Repository state: - * f4778ef (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * 6b23cb6 (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" + * 36498d0 (gh/ezyang/1/head) + | Initial 1 + * 3e4048c (gh/ezyang/1/base) + Initial 1 (base update) """ ) diff --git a/test/unlink/basic.py.test b/test/unlink/basic.py.test index d6f9d7d..c4b1e05 100644 --- a/test/unlink/basic.py.test +++ b/test/unlink/basic.py.test @@ -18,13 +18,13 @@ if is_direct(): This is commit A - * 13fa3c4 Initial 1 on "Commit A" + * b6f9660 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/1/head) This is commit B - * b293916 Initial 1 on "Commit B" + * 30b9f2a Initial 1 [O] #502 Commit A (gh/ezyang/3/head -> master) @@ -32,7 +32,7 @@ if is_direct(): - * 2949b6b Initial 2 on "Commit A" + * 2193fd2 Initial 2 [O] #503 Commit B (gh/ezyang/4/head -> gh/ezyang/3/head) @@ -40,18 +40,18 @@ if is_direct(): - * d8884f2 Initial 2 on "Commit B" + * ce2fa9b Initial 2 Repository state: - * b293916 (gh/ezyang/2/next, gh/ezyang/2/head) - | Initial 1 on "Commit B" - * 13fa3c4 (gh/ezyang/1/next, gh/ezyang/1/head) - | Initial 1 on "Commit A" - | * d8884f2 (gh/ezyang/4/next, gh/ezyang/4/head) - | | Initial 2 on "Commit B" - | * 2949b6b (gh/ezyang/3/next, gh/ezyang/3/head) - |/ Initial 2 on "Commit A" + * 30b9f2a (gh/ezyang/2/next, gh/ezyang/2/head) + | Initial 1 + * b6f9660 (gh/ezyang/1/next, gh/ezyang/1/head) + | Initial 1 + | * ce2fa9b (gh/ezyang/4/next, gh/ezyang/4/head) + | | Initial 2 + | * 2193fd2 (gh/ezyang/3/next, gh/ezyang/3/head) + |/ Initial 2 * dc8bfe4 (HEAD -> master) Initial commit """ @@ -67,7 +67,7 @@ else: This is commit A - * 7373182 Initial 1 on "Commit A" + * 55ee788 Initial 1 [O] #501 Commit B (gh/ezyang/2/head -> gh/ezyang/2/base) @@ -77,7 +77,7 @@ else: This is commit B - * e93dd90 Initial 1 on "Commit B" + * a3419f5 Initial 1 [O] #502 Commit A (gh/ezyang/3/head -> gh/ezyang/3/base) @@ -87,7 +87,7 @@ else: This is commit A - * 48cad68 Initial 2 on "Commit A" + * ab3db60 Initial 2 [O] #503 Commit B (gh/ezyang/4/head -> gh/ezyang/4/base) @@ -97,25 +97,25 @@ else: This is commit B - * f16bff9 Initial 2 on "Commit B" + * f30ebce Initial 2 Repository state: - * 7373182 (gh/ezyang/1/head) - | Initial 1 on "Commit A" - * cc75c4a (gh/ezyang/1/base) - Update base for Initial 1 on "Commit A" - * e93dd90 (gh/ezyang/2/head) - | Initial 1 on "Commit B" - * 211ed82 (gh/ezyang/2/base) - Update base for Initial 1 on "Commit B" - * 48cad68 (gh/ezyang/3/head) - | Initial 2 on "Commit A" - * adb13d7 (gh/ezyang/3/base) - Update base for Initial 2 on "Commit A" - * f16bff9 (gh/ezyang/4/head) - | Initial 2 on "Commit B" - * c7e3a0c (gh/ezyang/4/base) - Update base for Initial 2 on "Commit B" + * 55ee788 (gh/ezyang/1/head) + | Initial 1 + * 5434862 (gh/ezyang/1/base) + Initial 1 (base update) + * a3419f5 (gh/ezyang/2/head) + | Initial 1 + * c66825d (gh/ezyang/2/base) + Initial 1 (base update) + * ab3db60 (gh/ezyang/3/head) + | Initial 2 + * e957508 (gh/ezyang/3/base) + Initial 2 (base update) + * f30ebce (gh/ezyang/4/head) + | Initial 2 + * 94673ed (gh/ezyang/4/base) + Initial 2 (base update) """ )