llvm dev - Jun 2016 - Switching to git (Windows experience) (was re:[cfe-dev] GitHub anyone?)

On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at linaro.org>
wrote:
> I think we should start two other threads: one about git tooling on Windows
> and one about infrastructure problems migrating to git.
Some developers on Windows prefer to use GUI tools like TortoiseSVN to
command line tools for version control. The last time I tried
TortoiseGit on Windows (which was over a year ago), it did not feel
ready for production use on a complex project to me (I had crashes on
simple operations, and it seems I was not alone in seeing flaky
behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and
https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).

Are there suitable GUI tools for git on Windows for projects as
complex as LLVM? I believe MSVC has some integration, but I've not
used it before. Perhaps other tools exist that match the integration
and stability that TortoiseSVN has with Explorer?

I bring this up as a possible minor concern because asking people to
switch from one set of command line commands to another set of command
line commands is a different beast than asking people to switch from
Explorer-integrated menus and dialogs to the command line (that's a
drastically different workflow to achieve the same end result of
source code version control).

~Aaron

The GitHub app is ok.  Not great, but ok.  I guess this is one point in 
favor of GitHub vs. other git providers.  As a maintainer on a different 
project, I still had to jump out to the command line pretty frequently, 
as we had a squashed pull-request work flow.

I did not have much success with git plugins for Visual Studio. They 
seemed to be tuned towards in-tree builds.  I didn't spend enough time 
to figure out how to get them to work with out-of-tree builds.  More 
specifically, I recall that Visual Studio really expected the project 
and solution to be in source control, and in the same directory 
hierarchy as the source.  It's been a year since I've messed with them 
though, so things might have gotten better.

On 6/2/2016 7:43 AM, Aaron Ballman via llvm-dev wrote:
> On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at
linaro.org> wrote:
>> I think we should start two other threads: one about git tooling on
Windows
>> and one about infrastructure problems migrating to git.
> Some developers on Windows prefer to use GUI tools like TortoiseSVN to
> command line tools for version control. The last time I tried
> TortoiseGit on Windows (which was over a year ago), it did not feel
> ready for production use on a complex project to me (I had crashes on
> simple operations, and it seems I was not alone in seeing flaky
> behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and
> https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).
>
> Are there suitable GUI tools for git on Windows for projects as
> complex as LLVM? I believe MSVC has some integration, but I've not
> used it before. Perhaps other tools exist that match the integration
> and stability that TortoiseSVN has with Explorer?
>
> I bring this up as a possible minor concern because asking people to
> switch from one set of command line commands to another set of command
> line commands is a different beast than asking people to switch from
> Explorer-integrated menus and dialogs to the command line (that's a
> drastically different workflow to achieve the same end result of
> source code version control).
>
> ~Aaron
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
-- 
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux
Foundation Collaborative Project

-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20160602/6675f6f2/attachment.html>

You could try Git GUI [1]. I don't know if it's any good, I've only
used Git BASH on Windows (never had any problems with it).

Diana

[1] https://git-for-windows.github.io/

On 2 June 2016 at 15:43, Aaron Ballman via cfe-dev
<cfe-dev at lists.llvm.org> wrote:
> On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at
linaro.org> wrote:
>> I think we should start two other threads: one about git tooling on
Windows
>> and one about infrastructure problems migrating to git.
>
> Some developers on Windows prefer to use GUI tools like TortoiseSVN to
> command line tools for version control. The last time I tried
> TortoiseGit on Windows (which was over a year ago), it did not feel
> ready for production use on a complex project to me (I had crashes on
> simple operations, and it seems I was not alone in seeing flaky
> behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and
> https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).
>
> Are there suitable GUI tools for git on Windows for projects as
> complex as LLVM? I believe MSVC has some integration, but I've not
> used it before. Perhaps other tools exist that match the integration
> and stability that TortoiseSVN has with Explorer?
>
> I bring this up as a possible minor concern because asking people to
> switch from one set of command line commands to another set of command
> line commands is a different beast than asking people to switch from
> Explorer-integrated menus and dialogs to the command line (that's a
> drastically different workflow to achieve the same end result of
> source code version control).
>
> ~Aaron
> _______________________________________________
> cfe-dev mailing list
> cfe-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev

On 2 June 2016 at 13:43, Aaron Ballman via lldb-dev
<lldb-dev at lists.llvm.org> wrote:
> Are there suitable GUI tools for git on Windows for projects as
> complex as LLVM? I believe MSVC has some integration, but I've not
> used it before. Perhaps other tools exist that match the integration
> and stability that TortoiseSVN has with Explorer?
Have you tried any of these?

https://git-scm.com/downloads/guis

I've tried git-cola and gitg on Linux, and neither I nor my son liked
it enough to move from command line to a GUI. But we're not GUI folks,
so it could be that. We also tried some Android clients, and they are
crude.

Though, that GitHub app looks really nice!

cheers,
--renato

Sourcetree is pretty good on windows, and I hear ok things about Git Extensions.
I have not used the GitHub app though.

I typically use Sourcetree to view the logs, and command line for everything
else.

From: llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org] On Behalf Of Craig,
Ben via llvm-dev
Sent: Thursday, June 02, 2016 10:01 AM
To: llvm-dev at lists.llvm.org
Subject: Re: [llvm-dev] Switching to git (Windows experience) (was re:[cfe-dev]
GitHub anyone?)


The GitHub app is ok.  Not great, but ok.  I guess this is one point in favor of
GitHub vs. other git providers.  As a maintainer on a different project, I still
had to jump out to the command line pretty frequently, as we had a squashed
pull-request work flow.

I did not have much success with git plugins for Visual Studio.  They seemed to
be tuned towards in-tree builds.  I didn't spend enough time to figure out
how to get them to work with out-of-tree builds.  More specifically, I recall
that Visual Studio really expected the project and solution to be in source
control, and in the same directory hierarchy as the source.  It's been a
year since I've messed with them though, so things might have gotten better.
On 6/2/2016 7:43 AM, Aaron Ballman via llvm-dev wrote:

On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at
linaro.org><mailto:renato.golin at linaro.org> wrote:

I think we should start two other threads: one about git tooling on Windows

and one about infrastructure problems migrating to git.



Some developers on Windows prefer to use GUI tools like TortoiseSVN to

command line tools for version control. The last time I tried

TortoiseGit on Windows (which was over a year ago), it did not feel

ready for production use on a complex project to me (I had crashes on

simple operations, and it seems I was not alone in seeing flaky

behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and

https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).



Are there suitable GUI tools for git on Windows for projects as

complex as LLVM? I believe MSVC has some integration, but I've not

used it before. Perhaps other tools exist that match the integration

and stability that TortoiseSVN has with Explorer?



I bring this up as a possible minor concern because asking people to

switch from one set of command line commands to another set of command

line commands is a different beast than asking people to switch from

Explorer-integrated menus and dialogs to the command line (that's a

drastically different workflow to achieve the same end result of

source code version control).



~Aaron

_______________________________________________

LLVM Developers mailing list

llvm-dev at lists.llvm.org<mailto:llvm-dev at lists.llvm.org>

http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev



--

Employee of Qualcomm Innovation Center, Inc.

Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux
Foundation Collaborative Project
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20160602/4d613a7e/attachment.html>

On Thu, Jun 2, 2016 at 5:43 AM, Aaron Ballman via lldb-dev
<lldb-dev at lists.llvm.org> wrote:
> Some developers on Windows prefer to use GUI tools like TortoiseSVN to
> command line tools for version control. The last time I tried
> TortoiseGit on Windows (which was over a year ago), it did not feel
> ready for production use on a complex project to me (I had crashes on
> simple operations, and it seems I was not alone in seeing flaky
> behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and
> https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).
>
> Are there suitable GUI tools for git on Windows for projects as
> complex as LLVM? I believe MSVC has some integration, but I've not
> used it before. Perhaps other tools exist that match the integration
> and stability that TortoiseSVN has with Explorer?
>
> I bring this up as a possible minor concern because asking people to
> switch from one set of command line commands to another set of command
> line commands is a different beast than asking people to switch from
> Explorer-integrated menus and dialogs to the command line (that's a
> drastically different workflow to achieve the same end result of
> source code version control).
>
> ~Aaron
I'm primarily a Windows user and have been using git for llvm for a
long time now. I use a combination of:

* SourceTree: log viewing and committing
* kdiff3: merging conflicts
* gitk: amending (SourceTree cannot yet handle unstaging chunks).
* command line: branching, svn dcommit, rebase, pull, merging,
applying patches, etc...

The only thing I actually have to use the command line for is rebase
-i, however I find the command line interface much better for the
things I use it for. It's also much faster for commits that aren't in
the past few days.

MSVS git integration is terrible and not worth touching at the moment.

- Michael Spencer

On Thu, Jun 2, 2016 at 2:43 PM, Aaron Ballman via cfe-dev 
wrote:
>
> Some developers on Windows prefer to use GUI tools like TortoiseSVN to
> command line tools for version control.
(snip)
> Are there suitable GUI tools for git on Windows for projects as
> complex as LLVM? I believe MSVC has some integration, but I've not
> used it before. Perhaps other tools exist that match the integration
> and stability that TortoiseSVN has with Explorer?
Eclipse has a git plugin (included by default in "Eclipse IDE for C++
developers"), although using Eclipse only for git operations seems a
bit heavy.

I haven't used it for anything beyond "git pull".

Csaba
-- 
GCS a+ e++ d- C++ ULS$ L+$ !E- W++ P+++$ w++$ tv+ b++ DI D++ 5++
The Tao of math: The numbers you can count are not the real numbers.
Life is complex, with real and imaginary parts.
"Ok, it boots. Which means it must be bug-free and perfect. " -- Linus
Torvalds
"People disagree with me. I just ignore them." -- Linus Torvalds

> On Jun 2, 2016, at 7:00 AM, Craig, Ben via llvm-dev <llvm-dev at
lists.llvm.org> wrote:
> 
> The GitHub app is ok.  Not great, but ok.  I guess this is one point in
favor of GitHub vs. other git providers.  As a maintainer on a different
project, I still had to jump out to the command line pretty frequently, as we
had a squashed pull-request work flow.
FYI, GitHub recently (last month or two?) added support to autosquash when
merging a pull request, so you don’t have to do it manually anymore.

-Chris


-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20160603/f352c6c0/attachment.html>