Code Monkey home page Code Monkey logo

git-meld-index's People

Contributors

glacios avatar jjlee avatar

Stargazers

 avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar

Watchers

 avatar  avatar  avatar  avatar  avatar

git-meld-index's Issues

Can't install from master

(translate)[11:25:27] adys@alloy ~/src % pip install https://github.com/jjlee/git-meld-index/archive/master.zip
DEPRECATION: --download-cache has been deprecated and will be removed in the future. Pip now automatically uses and configures its cache.
Collecting https://github.com/jjlee/git-meld-index/archive/master.zip
  Downloading https://github.com/jjlee/git-meld-index/archive/master.zip
     \ 40kB 100kB/s
Installing collected packages: git-meld-index
  Running setup.py install for git-meld-index
    Complete output from command /home/adys/.local/share/virtualenvs/translate/bin/python2 -c "import setuptools, tokenize;__file__='/tmp/pip-uRjzmD-build/setup.py';exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" install --record /tmp/pip-BXemrf-record/install-record.txt --single-version-externally-managed --compile --install-headers /home/adys/.local/share/virtualenvs/translate/include/site/python2.7/git-meld-index:
    /home/adys/.local/share/virtualenvs/translate/lib/python2.7/site-packages/setuptools/dist.py:294: UserWarning: The version specified ('unreleased_version') is an invalid version, this may not work as expected with newer versions of setuptools, pip, and PyPI. Please see PEP 440 for more details.
      "details." % self.metadata.version
    running install
    running build
    running build_py
    creating build
    creating build/lib
    copying src/git_meld_index.py -> build/lib
    running build_scripts
    creating build/scripts-2.7
    copying bin/git-meld-index-run-merge-tool -> build/scripts-2.7
    running install_lib
    copying build/lib/git_meld_index.py -> /home/adys/.local/share/virtualenvs/translate/lib/python2.7/site-packages
    byte-compiling /home/adys/.local/share/virtualenvs/translate/lib/python2.7/site-packages/git_meld_index.py to git_meld_index.pyc
    running install_data
    error: can't copy 'doc/git-meld-index.1': doesn't exist or not a regular file

Error when executing git-meld-index

git: 2.35.1
meld: 3.18.0

after installing git-meld-index and running it either with git meld-index or directly with git-meld-index it throws the following error:

/home/lprobsth/.local/bin/git-meld-index-run-merge-tool: 282: /home/lprobsth/.local/bin/git-meld-index-run-merge-tool: diff_cmd: not found

Problem with Git Submodules

When using git-meld-index v0.2.3 in repositories with git submodules the following error is thrown:

Traceback (most recent call last):
  File "/home/lprobsth/.local/bin/git-meld-index", line 8, in <module>
    sys.exit(main())
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 622, in main
    status = _main(sys.argv[0], sys.argv[1:])
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 616, in _main
    work_area.meld(left_view, right_view, tool, arguments.extcmd)
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 214, in meld
    right_dir = self._write(right_view)
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 195, in _write
    dir_ = view.write(self._env, suggested_dir)
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 408, in write
    self.check_out_head(repo_env, path, dest_path)
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 373, in check_out_head
    repo_env.cmd(["sh", "-c", shell_cmd])
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 84, in cmd
    return self._env.cmd(args, input, tty)
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 145, in cmd
    return self._env.cmd(self._prefix_cmd + args, input, tty)
  File "/home/lprobsth/.local/lib/python3.10/site-packages/git_meld_index.py", line 127, in cmd
    raise CalledProcessError(retcode, args, output, stderr_output)
git_meld_index.CalledProcessError: Command ['sh', '-c', 'cd "$1" && shift && exec "$@"', 'inline_cd', '/home/lprobsth/temp/combine_test/io_core_horizon', 'sh', '-c', 'git cat-file blob fe3ebc6130533fa50c2b209b4afed70f96693fec > /tmp/tmp-git_meld_index-r589hyr0/index/Applications/FRoST_Endeffector'] returned non-zero exit status 128:
stdout:
b''
stderr:
b'fatal: git cat-file fe3ebc6130533fa50c2b209b4afed70f96693fec: bad file\n'

The commit id from the error is only part of one of the submodules. It seems that git-meld-index is using the wrong repository when submodules are present.

returned non-zero exit status 1: 'cp: -r not specified; omitting directory

I tried to execute meld-index on a git repository:

git meld-index

Got the following error:

Traceback (most recent call last):
  File "/home/user/.local/bin/git-meld-index", line 8, in <module>
    sys.exit(main())
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 619, in main
    status = _main(sys.argv[0], sys.argv[1:])
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 613, in _main
    work_area.meld(left_view, right_view, tool, arguments.extcmd)
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 205, in meld
    left_dir = self._write(left_view)
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 187, in _write
    dir_ = view.write(self._env, suggested_dir)
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 306, in write
    dest_env.cmd([
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 113, in cmd
    return self._env.cmd(args, input, tty)
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 137, in cmd
    return self._env.cmd(self._prefix_cmd + args, input, tty)
  File "/home/user/.local/lib/python3.9/site-packages/git_meld_index.py", line 87, in cmd
    raise CalledProcessError(retcode, args, output, stderr_output)
git_meld_index.CalledProcessError: Command ['sh', '-c', 'cd "$1" && shift && exec "$@"', 'inline_cd', '/tmp/tmp-git_meld_index-2xkgx23o/working_tree', 'cp', '-Pp', '/home/user/Projects/api-cluster-init/docker_devbox/environments/test-kristinehamn-api-cluster-dev/', 'docker_devbox/environments/test-kristinehamn-api-cluster-dev/'] returned non-zero exit status 1:
stdout:
b''
stderr:
b"cp: -r not specified; omitting directory '/home/user/Projects/api-cluster-init/docker_devbox/environments/test-kristinehamn-api-cluster-dev/'\n"

The git status for that directory is that it is a new directory not added yet:

$ git status -s docker_devbox/
?? docker_devbox/

A peek inside the directory docker_devbox:

$ tree -L 3 docker_devbox
docker_devbox
└── environments
    └── test-kristinehamn-api-cluster-dev
        ├── README.md
        ├── ansible.cfg
        ├── ansible_plugins
        ├── bin
        └── lock

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.