Commit d846174

committed

[wip] support multiple remotes

1 parent 9782eb7 commit d846174Copy full SHA for d846174

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ pub use merge::{`
`71`	`71`	`};`
`72`	`72`	`pub use rebase::rebase_branch;`
`73`	`73`	`pub use remotes::{`
`74`		`- get_default_remote, get_remotes, push::AsyncProgress,`
`75`		`- tags::PushTagsProgress,`
	`74`	`+ get_default_remote, get_remotes, has_default_remote,`
	`75`	`+ push::AsyncProgress,tags::PushTagsProgress,`
`76`	`76`	`};`
`77`	`77`	`pub(crate) use repository::repo;`
`78`	`78`	`pub use repository::{RepoPath, RepoPathRef};`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,14 @@ pub(crate) fn get_default_remote_in_repo(`
`85`	`85`	`Err(Error::NoDefaultRemoteFound)`
`86`	`86`	`}`
`87`	`87`
	`88`	+/// returns true based on result of `get_default_remote_in_repo` being anything but `NoDefaultRemoteFound`
	`89`	`+pub fn has_default_remote(repo: &Repository) -> bool {`
	`90`	`+ !matches!(`
	`91`	`+ get_default_remote_in_repo(repo),`
	`92`	`+ Err(Error::NoDefaultRemoteFound)`
	`93`	`+ )`
	`94`	`+}`
	`95`	`+`
`88`	`96`	`///`
`89`	`97`	`fn fetch_from_remote(`
`90`	`98`	`repo_path: &RepoPath,`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ impl PushComponent {`
`109`	`109`	`(false, false) => PushComponentModifier::None,`
`110`	`110`	`};`
`111`	`111`
	`112`	`+ //TODO: check if branch is tracked on a remote or if we find a default remote if not go into a remote selection popup`
	`113`	`+`
`112`	`114`	`self.show()?;`
`113`	`115`
`114`	`116`	`if need_username_password(&self.repo.borrow())? {`

Comments

(0)