upstream/mercurial-mirror Files · tests/test-mailmap.t

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Yuya Nishihara - - Load All Authors

File last commit:

r37277:8e57c3b0 default


                r41198:0101a35d

default

Download file

             test-mailmap.t
        
                    72 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mailmap.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Create a repo and add some commits

        $ hg init mm

        $ cd mm

        $ echo "Test content" > testfile1

        $ hg add testfile1

        $ hg commit -m "First commit" -u "Proper <commit@m.c>"

        $ echo "Test content 2" > testfile2

        $ hg add testfile2

        $ hg commit -m "Second commit" -u "Commit Name 2 <commit2@m.c>"

        $ echo "Test content 3" > testfile3

        $ hg add testfile3

        $ hg commit -m "Third commit" -u "Commit Name 3 <commit3@m.c>"

        $ echo "Test content 4" > testfile4

        $ hg add testfile4

        $ hg commit -m "Fourth commit" -u "Commit Name 4 <commit4@m.c>"

      Add a .mailmap file with each possible entry type plus comments

        $ cat > .mailmap << EOF

        > # Comment shouldn't break anything

        > <proper@m.c> <commit@m.c> # Should update email only

        > Proper Name 2 <commit2@m.c> # Should update name only

        > Proper Name 3 <proper@m.c> <commit3@m.c> # Should update name, email due to email

        > Proper Name 4 <proper@m.c> Commit Name 4 <commit4@m.c> # Should update name, email due to name, email

        > EOF

        $ hg add .mailmap

        $ hg commit -m "Add mailmap file" -u "Testuser <test123@m.c>"

      Output of commits should be normal without filter

        $ hg log -T "{author}\n" -r "all()"

        Proper <commit@m.c>

        Commit Name 2 <commit2@m.c>

        Commit Name 3 <commit3@m.c>

        Commit Name 4 <commit4@m.c>

        Testuser <test123@m.c>

      Output of commits with filter shows their mailmap values

        $ hg log -T "{mailmap(author)}\n" -r "all()"

        Proper <proper@m.c>

        Proper Name 2 <commit2@m.c>

        Proper Name 3 <proper@m.c>

        Proper Name 4 <proper@m.c>

        Testuser <test123@m.c>

      Add new mailmap entry for testuser

        $ cat >> .mailmap << EOF

        > <newmmentry@m.c> <test123@m.c>

        > EOF

      Output of commits with filter shows their updated mailmap values

        $ hg log -T "{mailmap(author)}\n" -r "all()"

        Proper <proper@m.c>

        Proper Name 2 <commit2@m.c>

        Proper Name 3 <proper@m.c>

        Proper Name 4 <proper@m.c>

        Testuser <newmmentry@m.c>

      A commit with improperly formatted user field should not break the filter

        $ echo "some more test content" > testfile1

        $ hg commit -m "Commit with improper user field" -u "Improper user"

        $ hg log -T "{mailmap(author)}\n" -r "all()"

        Proper <proper@m.c>

        Proper Name 2 <commit2@m.c>

        Proper Name 3 <proper@m.c>

        Proper Name 4 <proper@m.c>

        Testuser <newmmentry@m.c>

        Improper user

      No TypeError beacause of invalid input

        $ hg log -T '{mailmap(termwidth)}\n' -r0

        80

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				Create a repo and add some commits

				$ hg init mm
				$ cd mm
				$ echo "Test content" > testfile1
				$ hg add testfile1
				$ hg commit -m "First commit" -u "Proper <commit@m.c>"
				$ echo "Test content 2" > testfile2
				$ hg add testfile2
				$ hg commit -m "Second commit" -u "Commit Name 2 <commit2@m.c>"
				$ echo "Test content 3" > testfile3
				$ hg add testfile3
				$ hg commit -m "Third commit" -u "Commit Name 3 <commit3@m.c>"
				$ echo "Test content 4" > testfile4
				$ hg add testfile4
				$ hg commit -m "Fourth commit" -u "Commit Name 4 <commit4@m.c>"

				Add a .mailmap file with each possible entry type plus comments
				$ cat > .mailmap << EOF
				> # Comment shouldn't break anything
				> <proper@m.c> <commit@m.c> # Should update email only
				> Proper Name 2 <commit2@m.c> # Should update name only
				> Proper Name 3 <proper@m.c> <commit3@m.c> # Should update name, email due to email
				> Proper Name 4 <proper@m.c> Commit Name 4 <commit4@m.c> # Should update name, email due to name, email
				> EOF
				$ hg add .mailmap
				$ hg commit -m "Add mailmap file" -u "Testuser <test123@m.c>"

				Output of commits should be normal without filter
				$ hg log -T "{author}\n" -r "all()"
				Proper <commit@m.c>
				Commit Name 2 <commit2@m.c>
				Commit Name 3 <commit3@m.c>
				Commit Name 4 <commit4@m.c>
				Testuser <test123@m.c>

				Output of commits with filter shows their mailmap values
				$ hg log -T "{mailmap(author)}\n" -r "all()"
				Proper <proper@m.c>
				Proper Name 2 <commit2@m.c>
				Proper Name 3 <proper@m.c>
				Proper Name 4 <proper@m.c>
				Testuser <test123@m.c>

				Add new mailmap entry for testuser
				$ cat >> .mailmap << EOF
				> <newmmentry@m.c> <test123@m.c>
				> EOF

				Output of commits with filter shows their updated mailmap values
				$ hg log -T "{mailmap(author)}\n" -r "all()"
				Proper <proper@m.c>
				Proper Name 2 <commit2@m.c>
				Proper Name 3 <proper@m.c>
				Proper Name 4 <proper@m.c>
				Testuser <newmmentry@m.c>

				A commit with improperly formatted user field should not break the filter
				$ echo "some more test content" > testfile1
				$ hg commit -m "Commit with improper user field" -u "Improper user"
				$ hg log -T "{mailmap(author)}\n" -r "all()"
				Proper <proper@m.c>
				Proper Name 2 <commit2@m.c>
				Proper Name 3 <proper@m.c>
				Proper Name 4 <proper@m.c>
				Testuser <newmmentry@m.c>
				Improper user

				No TypeError beacause of invalid input

				$ hg log -T '{mailmap(termwidth)}\n' -r0
				80