Mercurial > hg
comparison tests/test-histedit-obsolete.t @ 34085:e8a7c1a0565a
cmdutil: remove the redundant commit during amend
There was an extra commit made during the amend operation to track the
changes to the working copy. However, this logic was written a long time back
and newer API's make this extra commit redundant. Therefore, I am removing the
extra commit. After this change, I noticed that
- Execution time of the cmdutil.amend improved by over 40%.
- Execution time of "hg commit --amend" improved by over 20%.
Test Plan:
I ensured that the all the hg tests passed after the change. I had
to fix a few tests which were aware of the extra commit made during the amend.
Differential Revision: https://phab.mercurial-scm.org/D636
author | Saurabh Singh <singhsrb@fb.com> |
---|---|
date | Fri, 01 Sep 2017 12:34:36 -0700 |
parents | 9dcc3529e002 |
children | ecc96506c49d |
comparison
equal
deleted
inserted
replaced
34084:6c5cdb02f2f9 | 34085:e8a7c1a0565a |
---|---|
41 A c | 41 A c |
42 ? plan | 42 ? plan |
43 $ hg commit --amend b | 43 $ hg commit --amend b |
44 $ hg histedit --continue | 44 $ hg histedit --continue |
45 $ hg log -G | 45 $ hg log -G |
46 @ 6:46abc7c4d873 b | 46 @ 5:46abc7c4d873 b |
47 | | 47 | |
48 o 5:49d44ab2be1b c | 48 o 4:49d44ab2be1b c |
49 | | 49 | |
50 o 0:cb9a9f314b8b a | 50 o 0:cb9a9f314b8b a |
51 | 51 |
52 $ hg debugobsolete | 52 $ hg debugobsolete |
53 e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) | 53 e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) |
54 3e30a45cf2f719e96ab3922dfe039cfd047956ce 0 {e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf} (*) {'user': 'test'} (glob) | |
55 1b2d564fad96311b45362f17c2aa855150efb35f 46abc7c4d8738e8563e577f7889e1b6db3da4199 0 (*) {'user': 'test'} (glob) | 54 1b2d564fad96311b45362f17c2aa855150efb35f 46abc7c4d8738e8563e577f7889e1b6db3da4199 0 (*) {'user': 'test'} (glob) |
56 114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) | 55 114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) |
57 | 56 |
58 With some node gone missing during the edit. | 57 With some node gone missing during the edit. |
59 | 58 |
60 $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan | 59 $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan |
61 $ echo "pick `hg log -r 6 -T '{node|short}'`" >> plan | 60 $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan |
62 $ echo "edit `hg log -r 5 -T '{node|short}'`" >> plan | 61 $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan |
63 $ hg histedit -r 'all()' --commands plan | 62 $ hg histedit -r 'all()' --commands plan |
64 Editing (49d44ab2be1b), you may commit or record as needed now. | 63 Editing (49d44ab2be1b), you may commit or record as needed now. |
65 (hg histedit --continue to resume) | 64 (hg histedit --continue to resume) |
66 [1] | 65 [1] |
67 $ hg st | 66 $ hg st |
71 $ hg commit --amend -X . -m XXXXXX | 70 $ hg commit --amend -X . -m XXXXXX |
72 $ hg commit --amend -X . -m b2 | 71 $ hg commit --amend -X . -m b2 |
73 $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup | 72 $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup |
74 $ hg histedit --continue | 73 $ hg histedit --continue |
75 $ hg log -G | 74 $ hg log -G |
76 @ 9:273c1f3b8626 c | 75 @ 8:273c1f3b8626 c |
77 | | 76 | |
78 o 8:aba7da937030 b2 | 77 o 7:aba7da937030 b2 |
79 | | 78 | |
80 o 0:cb9a9f314b8b a | 79 o 0:cb9a9f314b8b a |
81 | 80 |
82 $ hg debugobsolete | 81 $ hg debugobsolete |
83 e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) | 82 e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) |
84 3e30a45cf2f719e96ab3922dfe039cfd047956ce 0 {e72d22b19f8ecf4150ab4f91d0973fd9955d3ddf} (*) {'user': 'test'} (glob) | |
85 1b2d564fad96311b45362f17c2aa855150efb35f 46abc7c4d8738e8563e577f7889e1b6db3da4199 0 (*) {'user': 'test'} (glob) | 83 1b2d564fad96311b45362f17c2aa855150efb35f 46abc7c4d8738e8563e577f7889e1b6db3da4199 0 (*) {'user': 'test'} (glob) |
86 114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) | 84 114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (*) {'user': 'test'} (glob) |
87 76f72745eac0643d16530e56e2f86e36e40631f1 2ca853e48edbd6453a0674dc0fe28a0974c51b9c 0 (*) {'user': 'test'} (glob) | 85 76f72745eac0643d16530e56e2f86e36e40631f1 2ca853e48edbd6453a0674dc0fe28a0974c51b9c 0 (*) {'user': 'test'} (glob) |
88 2ca853e48edbd6453a0674dc0fe28a0974c51b9c aba7da93703075eec9fb1dbaf143ff2bc1c49d46 0 (*) {'user': 'test'} (glob) | 86 2ca853e48edbd6453a0674dc0fe28a0974c51b9c aba7da93703075eec9fb1dbaf143ff2bc1c49d46 0 (*) {'user': 'test'} (glob) |
89 49d44ab2be1b67a79127568a67c9c99430633b48 273c1f3b86267ed3ec684bb13af1fa4d6ba56e02 0 (*) {'user': 'test'} (glob) | 87 49d44ab2be1b67a79127568a67c9c99430633b48 273c1f3b86267ed3ec684bb13af1fa4d6ba56e02 0 (*) {'user': 'test'} (glob) |