Merging Three Git Repositories Into One Repository Without Losing File History

October 10, 2018 Denis Kutlubaev Leave a comment

Let’s assume that we have three separate git repos named uremont-client, uremont-service, uremont-sdk. We want to create a new repo, named uremont-ios, that contains all those repos in separate folders to have one single repo.

Why do we want to do this? In my case I had two apps and one sdk for them, and it was inconvenient for me to push changes to three separate repos while I was working with these projects and sdk at the same time.

Let’s start.

Terminal setup to allow git to move all folders except one. We will need this later.

$ shopt -s extglob

1	$ shopt -s extglob

Create a new folder uremont-ios and initialize git repo:

$ mkdir uremont-ios 
$ cd uremont-ios
$ git init

$ mkdir uremont-ios

$ cd uremont-ios

$ git init

Add remote of first old project uremont-client that we want to merge to the new git repo and fetch it:

$ git remote add -f uremont-client git@bitbucket.org:wzbozon/uremont.git

1	$ git remote add -f uremont-client git@bitbucket.org:wzbozon/uremont.git

Merge first old project uremont-client to the new repo:

$ git merge uremont-client/master --allow-unrelated-histories

1	$ git merge uremont-client/master --allow-unrelated-histories

Move all folders and files of that old project to the separate folder inside of our new project:

$ mkdir uremont-client
$ git mv ./!(uremont-client) ./uremont-client

1 2	$ mkdir uremont-client $ git mv ./!(uremont-client) ./uremont-client

Commit changes:

$ git commit -m 'Move uremont-client files into subdir'

1	$ git commit -m 'Move uremont-client files into subdir'

Similarly merge second old project uremont-service to the new repo:

$ git remote add -f uremont-service git@bitbucket.org:wzbozon/uremontservice.git
$ git merge uremont-service/master --allow-unrelated-histories
$ mkdir uremont-service
$ git mv ./!(uremont-client|uremont-service) ./uremont-service
$ git commit -m 'Move uremont-service files into subdir'

$ git remote add -f uremont-service git@bitbucket.org:wzbozon/uremontservice.git

$ git merge uremont-service/master --allow-unrelated-histories

$ mkdir uremont-service

$ git mv ./!(uremont-client|uremont-service) ./uremont-service

$ git commit -m 'Move uremont-service files into subdir'

And third:

$ git remote add -f uremont-sdk git@bitbucket.org:wzbozon/uremont-sdk.git
$ git merge uremont-sdk/master --allow-unrelated-histories
$ mkdir uremont-sdk
$ git mv ./!(uremont-client|uremont-service|uremont-sdk) ./uremont-sdk
$ git commit -m 'Move uremont-sdk files into subdir'

$ git remote add -f uremont-sdk git@bitbucket.org:wzbozon/uremont-sdk.git

$ git merge uremont-sdk/master --allow-unrelated-histories

$ mkdir uremont-sdk

$ git mv ./!(uremont-client|uremont-service|uremont-sdk) ./uremont-sdk

$ git commit -m 'Move uremont-sdk files into subdir'

Finally, add a new remote to our new repo and push it:

$ git remote add origin git@bitbucket.org:wzbozon/uremont-ios.git
$ git push -u origin master

1 2	$ git remote add origin git@bitbucket.org:wzbozon/uremont-ios.git $ git push -u origin master

iOS

Chaining example on RxSwift

October 5, 2018 Denis Kutlubaev Leave a comment

This is one of the reasons I love RxSwift. It allows to chain requests beautifully.

Here I authorize user by getting auth token, then I request userInfo, then I request profile.

func loadUserInfoAndProfile(login: String, password: String) {
    UserManager.shared.auth(login: login, password: password)
        .flatMap { _ in
            return UserManager.shared.info()
        }
        .map { (result: APIResult<UserInfo>) -> UserInfo? in
            switch result {
            case .success(let value):
                UserManager.shared.userInfo = value
                return value
            case .failure(let error):
                print(error)
                return nil
            }
        }
        .flatMap { userInfo in
            return ServiceManager.shared.profileView()
        }
        .map { (result: APIResult<ServiceProfile>) -> ServiceProfile? in
            switch result {
            case .success(let value):
                ServiceManager.shared.profile.value = value
                return value
            case .failure(let error):
                print(error)
                return nil
            }
        }
        .subscribe(onNext: { _ in
            self.showTabs()
        }, onError: { error in
            self.showTutorialViewController()
        })
        .disposed(by: disposeBag)
}

func loadUserInfoAndProfile(login: String, password: String) {

UserManager.shared.auth(login: login, password: password)

.flatMap { _ in

return UserManager.shared.info()

}

.map { (result: APIResult<UserInfo>) -> UserInfo? in

switch result {

case .success(let value):

UserManager.shared.userInfo = value

return value

case .failure(let error):

print(error)

return nil

}

.flatMap { userInfo in

return ServiceManager.shared.profileView()

}

.map { (result: APIResult<ServiceProfile>) -> ServiceProfile? in

switch result {

case .success(let value):

ServiceManager.shared.profile.value = value

return value

case .failure(let error):

print(error)

return nil

}

.subscribe(onNext: { _ in

self.showTabs()

}, onError: { error in

self.showTutorialViewController()

})

.disposed(by: disposeBag)

}

Other

Good coding principles

October 3, 2018 Denis Kutlubaev Leave a comment

iOS

Что нового в iOS 12

October 2, 2018 Denis Kutlubaev Leave a comment

ARKit 2
Multiuser and Persistent AR. – сохранение данных из AR сессии в приложении, многопользовательский режим AR.
Object Detection. – распознавание объектов реального мира и добавление их в AR приложения.

Siri Shortcuts
Siri предсказывает быстрый доступ (shortcuts) для действий в приложении.

Health Records
Доступ к информации о здоровье в приложениях.

Effects
Показ стикеров и сообщений в iMessage в виде эффектов.

Interactive Controls in Notifications
Полная кастомизация уведомлений.

Authentication Services
Позволяет шарить логин-сессию между Safari и приложением, чтобы логинить пользователя проще.

CarPlay for Navigation Apps

Network Framework
Доступ к протоколам TLS, TCP, UDP.
URLSession, работающий с HTTP, построен поверх этого фреймворка.

Natural Language
Получение метаданных из текста.

Deprecation of OpenGL ES
OpenGL ES deprecated, необходимо использовать только Metal.

Alwawee

Monthly Archives: October 2018

Merging Three Git Repositories Into One Repository Without Losing File History

Chaining example on RxSwift

Good coding principles

Что нового в iOS 12

iOS Development