Page 1 of 2 12 LastLast
Results 1 to 10 of 18
  1. #1
    Join Date
    Jul 2014
    Posts
    5

    Default 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. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,953

    Default

    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

  3. #3
    Join Date
    Jul 2014
    Posts
    5

    Default

    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

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,953

    Default

    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

  5. #5
    Join Date
    Jul 2014
    Posts
    5

    Default

    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

  6. #6
    Join Date
    Jul 2014
    Posts
    5

    Default Please help

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

    Thank you an advance.

  7. #7
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,953

    Default

    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

  8. #8
    Join Date
    Jul 2014
    Posts
    5

    Default Thanks a lot!

    Now it works, thank you!

  9. #9
    Join Date
    Aug 2014
    Posts
    4

    Default 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!

  10. #10
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,953

    Default

    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

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •