Up to Discussions in PhpStorm / WebStorm

This Question is Possibly Answered

1 "correct" answer available (4 pts)
9 Replies Last post: Feb 6, 2013 4:15 PM by Kirill Likhodedov  
Kevin Burton Newbie
Kevin Burton
52 posts since
Jan 30, 2013
Currently Being Moderated

Feb 2, 2013 9:58 AM

Check out from Version Control

I have two machines. One at home and one at work. The source files that comprise my web project are in a GIT repository that was created when I created the Azure web site which I did from home. Now I would like to fire up WebStorm and pull the files from the GIT repository and work on and possibly deploy from there also. The closest option that I see is 'Check out from Version Control' . When I select that I am presented with some options I select Git. Then I get a dialog asking me for the GIT repository URL. I enter the URL that was listed on the Azure Portal as the 'GIT CLONE URL'. When I enter this the web site is automatically filled in. When I select 'Test' I get a dialog that goes on forever. If I cancel it (after about 5 minutes) I get a message that the connection to the repository failed and the 'Clone' button is disabled. How do I get the files from the GIT repository?

Tags: git, webstorm
Kirill Likhodedov JetBrains
Kirill Likhodedov
238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 4, 2013 2:49 PM in response to: Kevin Burton
Re: Check out from Version Control

Does it help if you clone without pressing "Test"?

Report Abuse
Kevin Burton Newbie
Kevin Burton
52 posts since
Jan 30, 2013
Currently Being Moderated
Feb 4, 2013 7:01 PM in response to: Kirill Likhodedov
Re: Check out from Version Control

At least it works now. though I am prompted for a password twice. What is the second password used for?

Report Abuse
Kirill Likhodedov JetBrains
Kirill Likhodedov
238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 4, 2013 7:52 PM in response to: Kevin Burton
Re: Check out from Version Control

It is actually the same password (passphrase to access your private key or password to the resource). It is queried both by Clone and Test because of a bug, which was fixed recently.

Report Abuse
Kevin Burton Newbie
Kevin Burton
52 posts since
Jan 30, 2013
Currently Being Moderated
Feb 5, 2013 12:49 AM in response to: Kirill Likhodedov
Re: Check out from Version Control

Now when I execute 'git push azure master' from this "checked out" code (after I have worked on it and successfully executed 'git commit -a -m "<my comment>"') I get the error:

 

     fatal: 'azure' does not appear to be a git repository

     fatal: Could not read from remote repository.

     Please make sure you have the correct access rights and the repository exists.

 

In addition it would be better if I could do all of this from WebStorm.

 

By the way I checked for updates and I apparently have the latest version as no updates are available. When will this bug fix be available?

Report Abuse
Kirill Likhodedov JetBrains
Kirill Likhodedov
238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 5, 2013 1:58 PM in response to: Kevin Burton
Re: Check out from Version Control

Does git push work from the command line?

Could you please share your .git/config file?

 

By the way I checked for updates and I apparently have the latest version as no updates are available. When will this bug fix be available?

The fix will be available in WebStorm 6.0.

Report Abuse
Kevin Burton Newbie
Kevin Burton
52 posts since
Jan 30, 2013
Currently Being Moderated
Feb 5, 2013 8:47 PM in response to: Kirill Likhodedov
Re: Check out from Version Control

Let me start at the beginning. First I clone from the remote source repository that was set up when I created the Azure Web Site.

clone.jpg

This clones the directory (other than asking for my password twice) without error. The rest of the commands are staight from GIT as I am not sure how to do them from WebStorm.

 

git status

 

# On branch master

# Your branch is ahead of 'origin/master' by 1 commit.

#

nothing to commit, working directory clean

 

Then if I try to push any changes

 

git push azure master

 

fatal: 'azure' does not appear to be a git repository

fatal: Could not read from remote repository.

 

Please make sure you have the correct access rights

and the repository exists.

 

The .git/config looks like:

 

[core]

        repositoryformatversion = 0

        filemode = false

        logallrefupdates = true

        autocrlf = false

[remote "origin"]

        url = https://KevinWebSite@bsiwebsite.scm.azurewebsites.net/bsiwebsite.g//KevinWebSite@bsiwebsite.scm.azurewebsites.net/bsiwebsite.g

it

        fetch = +refs/heads/*:refs/remotes/origin/*

[branch "master"]

        remote = origin

        merge = refs/heads/master

Report Abuse
Kirill Likhodedov JetBrains
Kirill Likhodedov
238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 5, 2013 9:26 PM in response to: Kevin Burton
Re: Check out from Version Control

The rest of the commands are staight from GIT as I am not sure how to do them from WebStorm.

 

git status

git push azure master

 

Status of files can be seen in the Changes tool window. It is calculated automatically, but you can force the refresh.

 

Push can be invoked via VCS | Git | Push (sorry for being obvious).

 

Why do you push the "azure" remote? As stated in the .git/config, the remote name is "origin" (which is default name). The error correctly mentions, that there is no "azure" remote defined in .git/config.

Report Abuse
Kevin Burton Newbie
Kevin Burton
52 posts since
Jan 30, 2013
Currently Being Moderated
Feb 5, 2013 11:17 PM in response to: Kirill Likhodedov
Re: Check out from Version Control

I see the "Changes"

Changes.jpg

When I execute "push" it says it was successful:

 

 

8:37:59 AM Already opened

11:43:45 AM Push successful: master: pushed 1 commit (show balloon)

But when I look on the Azure web site nothing has changed so I don't think it really was pushed.
I pushed to azure because that is what the instructions on the Azure documentation indicate I should do.That might be my problem. How do I add azure? It was there once as I have deployed from GIT a number of times using 'get push azure master' also the changes still seem to be there even after a refresh.
changes1.jpg

 

If I "pull" to get the latest I get an error:

 

1:12:47 PM Error pulling origin: error: Your local changes to the following files would be overwritten by merge:

 

No files are listed. Did this error stop the whole update or just the file it could not overwrite? How do I prevent such errors?

 

Report Abuse
Kirill Likhodedov JetBrains
Kirill Likhodedov
238 posts since
Jun 11, 2010
Currently Being Moderated
Feb 6, 2013 4:15 PM in response to: Kevin Burton
Re: Check out from Version Control

I would recommend you to carefully follow the instructions you refer to, from the very beginning, and perform all the steps as written there in the command line (because CLI is mentioned in the steps).

Once you set it up in the command line, you may switch to the IDE and check if everything works there.

Report Abuse

More Like This

  • Retrieving data ...