Mercurial usage in Creator 2.2 beta1

[hsfougaris]

[EDIT: this is the Creator/Mercurial specific part of "this forum thread":http://developer.qt.nokia.com/forums/viewthread/4873/, Volker]

Well I've been trying to set this up, and I'm not getting anywhere.
I'm trying very hard to avoid the command line, as I would rather handle it from within QtCreator (if possible)...

I've tried both Mercurial and Git - I have a Windows PC and a MacBook Pro.
I would like the MacBook Pro to be the master.
Is this never going to work just by using QtCreator? All I see is 'Create repository', no option to open from repository... I can't seem to find any documentation for this common setup (apart from http://doc.qt.nokia.com/qtcreator-snapshot/creator-version-control.html)

The shared folder option isnt' looking that bad at the moment :(

[goetz]

Download Qt Creator 2.2 beta1, it just arrived last week. This version has an option for checking out a new project from a SCM for sure. Just select File / New and then "Project from version control system" (the exact wording might differ, I have a German version here). Then select a mercurial repos on the right side.

Although 2.2 is a beta, the quality is regularly very good for daily production use, so you do not have to worry about this. I use these versions for my daily work as soon as they are out.

Ah, and where the "master" repos lives, does not matter. They are equally treated in mercurial (and git and bazaar too).

PS: For Windows I'd really recommend having a look at TortoiseHg, it has a very nice repository explorer. You can use the mercurial tools of Tortoise and Creator simultaneously, so no need to worry here.

[hsfougaris]

Ok, I downloaded QtCreator 2.1 b1 on my Windows PC.
I run hg serve in the mac.
File/New / Project from version control on the PC - give the url and local dir, all is good
I make changes to a dialog - I go Mercurial / (file) status
it reports
10:16 Executing in C:\Users\harry\src: C:\Program Files\TortoiseHg\hg.exe status Helpers/dbconnect.ui
M Helpers\dbconnect.ui

How do I push this back to the sever? I've tried Push/Commit/Update with no luck, and status always displays the same ('M')

[goetz]

You first must check in the change:

Extras / Mercurial / Check In
Then enter a log message.

Once you're done, you can push the changes to the other repos:

Extras / Mercurial / Push

Or serve the repo and pull from the other repo.

[hsfougaris]

There is no 'Extras' only 'Tools'.
And there is no 'Check in' option, there is only annotate, diff, log, status.

(I'm always talking about QtCreator)

[goetz]

Sorry, it's not "check in" but "commit" (those terms are used synonymously) and the menu is "Tools".

[hsfougaris]

I'ts not working for me.
This is the output I get:
After making a change:
@
11:04 Executing in C:\Users\harry\Desktop\QtERP\src: C:\Program Files\TortoiseHg\hg.exe status Helpers/dbconnect.ui
M Helpers\dbconnect.ui
@

After commit (selecting the file and writing a description):
@
11:04 Executing in C:\Users\harry\Desktop\QtERP\src: C:\Program Files\TortoiseHg\hg.exe status

11:04 Executing in C:\Users\harry\Desktop\QtERP\src: C:\Program Files\TortoiseHg\hg.exe branch

11:05 Executing in C:\Users\harry\Desktop\QtERP\src: C:\Program Files\TortoiseHg\hg.exe commit --noninteractive -u harry@win -l C:/Users/HARRY/AppData/Local/Temp/qtcreator-hg-zL6648.msg src\Helpers\dbconnect.ui
@

Running status again:
@
11:06 Executing in C:\Users\harry\Desktop\QtERP\src: C:\Program Files\TortoiseHg\hg.exe status Helpers/dbconnect.ui
M Helpers\dbconnect.ui
@

Shouldn't the 'M' status be 'A'?

[goetz]

There should be no output at all since the file was committed to the repos, and it's not modified. Or did you change it in the mean time?

[hsfougaris]

No, I just ran the mentioned commands in order.

[goetz]

Strange. The file should be checked in then. I just tested it with a local file and it works for me (but I'm on a Mac, not a Windows box).

I split out the Mercurial problem into a separate thread an move that to the Tools forum, as it's more a Creator issue. Maybe someone else can help here.