upstream/mercurial-mirror Files · contrib/automation/hgautomation/__init__.py

copies: choose target directory based on longest match...

copies: choose target directory based on longest match If one side of a merge renames `dir1/` to `dir2/` and the subdirectory `dir1/subdir1/` to `dir2/subdir2/`, and the other side of the merge adds a file in `dir1/subdir1/`, we should clearly move that into `dir2/subdir2/`. We already detect the directories correctly before this patch, but we iterate over them in arbitrary order. That results in the new file sometimes ending up in `dir2/subdir1/` instead. This patch fixes it by iterating over the source directories by visiting subdirectories first. That's achieved by simply iterating over them in reverse lexicographical order. Without the fix, the test case still passes on Python 2 but fails on Python 3. It depends on the iteration order of the dict. I did not look into how it's built up and why it behaved differently before the fix. I could probably have gotten it to fail on Python 2 as well by choosing different directory names. Differential Revision: https://phab.mercurial-scm.org/D10115

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r47379:ad30b29b

default

Download file

             __init__.py
        
                    57 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / automation / hgautomation / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # __init__.py - High-level automation interfaces

      #

      # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      # no-check-code because Python 3 native.

      import pathlib

      import secrets

      from .aws import AWSConnection

      class HGAutomation:

          """High-level interface for Mercurial automation.

          Holds global state, provides access to other primitives, etc.

          """

          def __init__(self, state_path: pathlib.Path):

              self.state_path = state_path

              state_path.mkdir(exist_ok=True)

          def default_password(self):

              """Obtain the default password to use for remote machines.

              A new password will be generated if one is not stored.

              """

              p = self.state_path / 'default-password'

              try:

                  with p.open('r', encoding='ascii') as fh:

                      data = fh.read().strip()

                      if data:

                          return data

              except FileNotFoundError:

                  pass

              password = secrets.token_urlsafe(24)

              with p.open('w', encoding='ascii') as fh:

                  fh.write(password)

                  fh.write('\n')

              p.chmod(0o0600)

              return password

          def aws_connection(self, region: str, ensure_ec2_state: bool = True):

              """Obtain an AWSConnection instance bound to a specific region."""

              return AWSConnection(self, region, ensure_ec2_state=ensure_ec2_state)

	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

				# __init__.py - High-level automation interfaces
				#
				# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				# no-check-code because Python 3 native.

				import pathlib
				import secrets

				from .aws import AWSConnection


				class HGAutomation:
				"""High-level interface for Mercurial automation.

				Holds global state, provides access to other primitives, etc.
				"""

				def __init__(self, state_path: pathlib.Path):
				self.state_path = state_path

				state_path.mkdir(exist_ok=True)

				def default_password(self):
				"""Obtain the default password to use for remote machines.

				A new password will be generated if one is not stored.
				"""
				p = self.state_path / 'default-password'

				try:
				with p.open('r', encoding='ascii') as fh:
				data = fh.read().strip()

				if data:
				return data

				except FileNotFoundError:
				pass

				password = secrets.token_urlsafe(24)

				with p.open('w', encoding='ascii') as fh:
				fh.write(password)
				fh.write('\n')

				p.chmod(0o0600)

				return password

				def aws_connection(self, region: str, ensure_ec2_state: bool = True):
				"""Obtain an AWSConnection instance bound to a specific region."""

				return AWSConnection(self, region, ensure_ec2_state=ensure_ec2_state)