Update

[ghstack-poisoned]
ezyang · Jan 2, 2024 · 074ea9a · 074ea9a
1 parent 6893bb2
commit 074ea9a
Show file tree

Hide file tree

Showing 29 changed files with 452 additions and 456 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
         """,
     )