ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-05-09 06:19:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix applying git diff on new added file

Browse Source
This commit is contained in:
allegroai 2021-01-24 08:46:42 +02:00
parent 0462af6a3d
commit 5d8bbde434
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clearml_agent/helper/repo.py
View File

@ -4,7 +4,7 @@ import shutil
import subprocess import subprocess
from distutils.spawn import find_executable from distutils.spawn import find_executable
from hashlib import md5 from hashlib import md5
from os import environ, getenv from os import environ
from typing import Text, Sequence, Mapping, Iterable, TypeVar, Callable, Tuple, Optional from typing import Text, Sequence, Mapping, Iterable, TypeVar, Callable, Tuple, Optional
import attr import attr
@ -88,7 +88,7 @@ class VCS(object):
# additional environment variables for VCS commands # additional environment variables for VCS commands
COMMAND_ENV = {} COMMAND_ENV = {}
PATCH_ADDED_FILE_RE = re.compile(r"^\+\+\+ b/(?P<path>.*)") PATCH_ADDED_FILE_RE = re.compile(r"^--- a/(?P<path>.*)")
def __init__(self, session, url, location, revision): def __init__(self, session, url, location, revision):
# type: (Session, Text, PathLike, Text) -> () # type: (Session, Text, PathLike, Text) -> ()
@ -115,21 +115,21 @@ class VCS(object):
""" """
return self.add_auth(self.session.config, self.url) return self.add_auth(self.session.config, self.url)
@abc.abstractproperty @abc.abstractmethod
def executable_name(self): def executable_name(self):
""" """
Name of command executable Name of command executable
""" """
pass pass
@abc.abstractproperty @abc.abstractmethod
def main_branch(self): def main_branch(self):
""" """
Name of default/main branch Name of default/main branch
""" """
pass pass
@abc.abstractproperty @abc.abstractmethod
def checkout_flags(self): def checkout_flags(self):
# type: () -> Sequence[Text] # type: () -> Sequence[Text]
""" """
@ -137,7 +137,7 @@ class VCS(object):
""" """
pass pass
@abc.abstractproperty @abc.abstractmethod
def patch_base(self): def patch_base(self):
# type: () -> Sequence[Text] # type: () -> Sequence[Text]
""" """
@ -467,7 +467,7 @@ class VCS(object):
parsed_url.set(username=config_user, password=config_pass) parsed_url.set(username=config_user, password=config_pass)
return parsed_url.url return parsed_url.url
@abc.abstractproperty @abc.abstractmethod
def info_commands(self): def info_commands(self):
# type: () -> Mapping[Text, Argv] # type: () -> Mapping[Text, Argv]
""" """
@ -527,7 +527,7 @@ class Git(VCS):
self.call("checkout", self.revision, *self.checkout_flags, cwd=self.location) self.call("checkout", self.revision, *self.checkout_flags, cwd=self.location)
try: try:
self.call("submodule", "update", "--recursive", cwd=self.location) self.call("submodule", "update", "--recursive", cwd=self.location)
except: except: # noqa
pass pass
info_commands = dict( info_commands = dict(