Announcement

Collapse
No announcement yet.

BC4 with Tortoise HG 3.0.1

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • BC4 with Tortoise HG 3.0.1

    Hello,
    I've tried recommended setting, but diff from UI is not working. BC started but no comparison is displayed. I am using Tortoise Mercurial from here: https://bitbucket.org/tortoisehg/thg...mment-10649957

    Any ideas?

  • #2
    Hello,

    Could you confirm the recommended setup you have configured? Do you have the Beyond Compare menu -> Install Command Line Tools, and using "/usr/local/bin/bcomp" and not the Beyond Compare.app?

    Can you verify the command line used to call to "bcomp" from your version control? To do this, launch a new Terminal window, then call:
    ps -A | grep “bcomp"
    while the BC4 window is still open.
    Aaron P Scooter Software

    Comment


    • #3
      Here is my current configuration file:
      Code:
      # Generated by TortoiseHg settings dialog
      
      [ui]
      username = Vadim
      merge = bcomp
      
      [extensions]
      extdiff =
      
      [extdiff]
      cmd.bcomp = /usr/local/bcomp
      #cmd.bcomp = /Applications/Beyond Compare.app/Contents/MacOS/BCompare
      #opts.bcomp = -ro
      
      [merge-tools]
      bcomp.executable = /usr/local/bin/bcomp
      bcomp.args = $local $other $base $output
      bcomp.priority = 1
      bcomp.premerge = True
      bcomp.gui = True
      
      [tortoisehg]
      vdiff = bcomp
      Do you have the Beyond Compare menu -> Install Command Line Tools, and using "/usr/local/bin/bcomp" and not the Beyond Compare.app?
      Yes I did it.

      Output from ps -A | grep “bcomp" is
      Code:
      3834 ??         0:00.03 /usr/local/bin/bcomp

      Comment


      • #4
        Hello,

        If you remove the vdiff = bcomp line and section, does this get it working for you? That would more closely mirror the Mercurial directions here:
        http://www.scootersoftware.com/vbull...ad.php?t=11677

        In the graphical interface of this specific version, in the Settings, if you select Visual Diff Tool is "beyondcompare3" an option here? If so, please try this option, then restart. If this works for Diff, it is also an option in the Three-way Merge Tool.
        Aaron P Scooter Software

        Comment


        • #5
          Nope that not works.
          I made original settings based on 2.4.2 config from your tread.

          Actually vdiff = bcomp section came to settings after I select bcomp from list of available vdiff tools. Without it its just dont start at all, with it starts, but not show any comparisons

          Comment


          • #6
            Please help

            Any more ideas, trial mode is almost finished, but i can't test it...

            Thank you an advance.

            Comment


            • #7
              Hello,

              Installing from your link, I was able to get this working using:

              The TortoiseHG Settings, clicked to the tortoisehgRepoName repository settings tab, and then Edit File:

              Code:
              [extensions]
              extdiff =
              
              [extdiff]
              cmd.bcomp = /usr/local/bin/bcomp
              opts.bcomp = -ro
              
              [tortoisehg]
              vdiff = bcomp
              I then didn't notice the Reload button, so I shut down and restarted the app, and was able to use BC4 as the diff tool (using for Diff to Local specifically).

              Does this work for you?
              Aaron P Scooter Software

              Comment


              • #8
                Thanks a lot!

                Now it works, thank you!

                Comment


                • #9
                  same problem but sol'n not working for me...

                  I'm having the same issue as the OP so I thought I would revive this thread...
                  Here are some of the specifics:
                  Beyond Compare (and have run command line install): Version 4.0 beta (build 18746)
                  TortoiseHG: 3.1
                  Platform: OSX 10.9.4

                  Error description:
                  Right click on a file that has been changed. Select 'Diff to Parent'. Expected result is to have BeyondCompare open and load the two versions of the file, highlighting the differences. Actual result is that BeyondCompare opens to the 'Home' screen without seeding the two files at all. In the left frame is the 'Sessions' droplist and in the main section is the selector to compare Folders, Merge, Sync, etc.

                  I have tried numerous different configuration setups in Tortoise but none seem to work. My current file is based on the suggestions contained in this thread, which mirror those in the consolidated thread as well.

                  The pertinent sections of the .hgrc file are as follows:
                  Code:
                  [ui]
                  username = <<redacted>>
                  verbose = True
                  merge = bcomp
                  editor = /Applications/TextWrangler.app/Contents/MacOS/TextWrangler
                   
                  [tortoisehg]
                  vdiff = bcomp
                  
                  [extensions]
                  extdiff =
                  fetch =
                  strip =
                  rebase =
                  reviewboard = <<redacted>>
                  
                  [extdiff]
                  cmd.bcomp = /usr/local/bin/bcomp
                  opts.bcomp = -ro
                  
                  
                  [merge-tools]
                  bcomp.executable = /usr/local/bin/bcomp
                  bcomp.args = $local $other $base $output
                  bcomp.priority = 1
                  bcomp.premerge = True
                  bcomp.gui = True
                  I have tried commenting out opts.bcomp, changing the path to the App, removing the [merge-tools] section (I was desperate), etc. None of these made much of a difference.

                  Ideas?

                  Thanks!

                  Comment


                  • #10
                    Try placing the [brackets] in the same order as in my example. I've found some versions of the application were picky about this.

                    Also, be sure that after you make edits to the config that you fully shut down the process and restart it. If you are unsure, I'd recommend a quick reboot just to be certain.
                    Aaron P Scooter Software

                    Comment


                    • #11
                      Hi Aaron,
                      The block of code provided in post #7 is missing the [merge-tools] block so I wasn't sure where to put it. However, using the other "how to get BC to work" thread as a basis, I placed [merge-tools] both before and after the [tortoisehg] block. However, neither case changes the net result of being unable to compare two versions of a file.

                      After saving my config file changes, I reloaded the changes and then closed TorgoiseHG. I verified this closure by ensuring that the application disappeared from the 'Force Quit' menu. I also verified that bcomp was not running with 'ps -A | grep "bcomp"' (I actually didn't think of this for Tortoise, but the validation through the Force Quite menu should be sufficient).

                      There is another person in my group that is bringing up a Mac and has downloaded the trial version of BC. Oddly, he is getting erratic results with his configuration (which looks very much like mine). Sometimes it works and sometimes it doesn't. Needless to say, this is all very strange. :-(

                      Best regards,
                      Alan

                      Comment


                      • #12
                        Hello,

                        Interesting. I was specifically referring to the order of:
                        [extensions]
                        [extdiff]
                        [tortoisehg]

                        without merge for now, to make sure diff is up and working. I think we should try to troubleshoot the diff first, as a simpler case, and then move to Merge.

                        Also, while making sure bcomp is closed is a good step, I was actually saying that TortoiseHG should be fully shut down. I found that it did not accept edits to the configuration until I had done so.
                        Aaron P Scooter Software

                        Comment


                        • #13
                          Interesting... When I removed the merge-tools then it works fine! So, that is great news as a diagnostic step. However, now that this works, can you give a suggestion on how I get the merge tools to point to BC4? Truthfully, that is the whole reason I *bought* BC4 in the first place.

                          Thanks.

                          Comment


                          • #14
                            Hello,

                            With the latest release of TortoiseHG (3.1.1) , 'beyondcompare4' is now a menu item you can select and use. Does selecting it in the Workbench, Options get it working for you?

                            And, are you using BC4 Pro? The Text Merge (3-way merge) does require a pro license.
                            Aaron P Scooter Software

                            Comment


                            • #15
                              Unfortunately, the 3.1.1 version for the Mac is not yet up on the site it looks like, so I can't see the option you are talking about. However, to address your license question, yes, I have a Pro License for the product.

                              I'll wait a few days and see if the Mac version pops up.

                              Comment

                              Working...
                              X