upstream/mercurial-mirror Files · tests/test-duplicateoptions.py

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:

r40760:c93d046d default


                r41198:0101a35d

default

Download file

             test-duplicateoptions.py
        
                    48 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-duplicateoptions.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, print_function

      import os

      from mercurial import (

          commands,

          extensions,

          ui as uimod,

      )

      ignore = {b'highlight', b'win32text', b'factotum', b'beautifygraph'}

      try:

          import sqlite3

          del sqlite3 # unused, just checking that import works

      except ImportError:

          ignore.add(b'sqlitestore')

      if os.name != 'nt':

          ignore.add(b'win32mbcs')

      disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore]

      hgrc = open(os.environ["HGRCPATH"], 'wb')

      hgrc.write(b'[extensions]\n')

      for ext in disabled:

          hgrc.write(ext + b'=\n')

      hgrc.close()

      u = uimod.ui.load()

      extensions.loadall(u)

      extensions.populateui(u)

      globalshort = set()

      globallong = set()

      for option in commands.globalopts:

          option[0] and globalshort.add(option[0])

          option[1] and globallong.add(option[1])

      for cmd, entry in commands.table.items():

          seenshort = globalshort.copy()

          seenlong = globallong.copy()

          for option in entry[1]:

              if (option[0] and option[0] in seenshort) or \

                 (option[1] and option[1] in seenlong):

                  print("command '" + cmd + "' has duplicate option " + str(option))

              seenshort.add(option[0])

              seenlong.add(option[1])

	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

				from __future__ import absolute_import, print_function
				import os
				from mercurial import (
				commands,
				extensions,
				ui as uimod,
				)

				ignore = {b'highlight', b'win32text', b'factotum', b'beautifygraph'}

				try:
				import sqlite3
				del sqlite3 # unused, just checking that import works
				except ImportError:
				ignore.add(b'sqlitestore')

				if os.name != 'nt':
				ignore.add(b'win32mbcs')

				disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore]

				hgrc = open(os.environ["HGRCPATH"], 'wb')
				hgrc.write(b'[extensions]\n')

				for ext in disabled:
				hgrc.write(ext + b'=\n')

				hgrc.close()

				u = uimod.ui.load()
				extensions.loadall(u)
				extensions.populateui(u)

				globalshort = set()
				globallong = set()
				for option in commands.globalopts:
				option[0] and globalshort.add(option[0])
				option[1] and globallong.add(option[1])

				for cmd, entry in commands.table.items():
				seenshort = globalshort.copy()
				seenlong = globallong.copy()
				for option in entry[1]:
				if (option[0] and option[0] in seenshort) or \
				(option[1] and option[1] in seenlong):
				print("command '" + cmd + "' has duplicate option " + str(option))
				seenshort.add(option[0])
				seenlong.add(option[1])