Coder Social home page Coder Social logo

mergeinator's People

Contributors

dgentry avatar

Stargazers

avatar avatar

Watchers

avatar avatar

mergeinator's Issues

Don't crash on sockets

File "/Users/gentry/.virtualenv/v/lib/python3.7/site-packages/mergeinator/mergeinator.py", line 292, in move
shutil.move(src, dest)
File "/Users/gentry/.virtualenv/v/lib/python3.7/shutil.py", line 574, in move
symlinks=True)
File "/Users/gentry/.virtualenv/v/lib/python3.7/shutil.py", line 365, in copytree
raise Error(errors)
shutil.Error: [('Library/Developer/Xcode/GPUToolsAgent.sock', '/Volumes/thai/gentry/Library/Developer/Xcode/GPUToolsAgent.sock', "[Errno 102] Operation not supported on socket: 'Library/Developer/Xcode/GPUToolsAgent.sock'")]

Don't crash when we hit a Permission Error

Diff /Volumes/boof/Users/gentry/Library/Google...
ret 2, output bytearray(b'Only in Library/Google/GoogleSoftwareUpdate/Actives: com.google.Chrome\nOnly in Library/Google/GoogleSoftwareUpdate/Actives: com.google.GoogleDrive\nFiles /Volumes/boof/Users/gentry/Library/Google/GoogleSoftwareUpdate/CountingMetrics.plist and Library/Google/GoogleSoftwareUpdate/CountingMetrics.plist differ\nFiles /Volumes/boof/Users/gentry/Library/Google/GoogleSoftwareUpdate/TicketStore/Keystone.ticketstore and Library/Google/GoogleSoftwareUpdate/TicketStore/Keystone.ticketstore differ\n')
Diff returned an unexpected error..
While running "/usr/local/bin/diff -r --no-dereference -q /Volumes/boof/Users/gentry/Library/Google Library/Google", error was:
diff: Library/Google/GoogleSoftwareUpdate/Stats/Keystone.stats: Permission denied
.

Gracefully handle file deleted out from under running merge 

/Volumes/boof/Users/gentry/myDotfiles/emacs.d/elpy/rpc-venv/lib/python2.7/site-packages/jedi/inference/sys_path.pyc ?--> ./. . .  Identical.  Delete? [Y/n] y
Traceback (most recent call last):
  File "/Users/gentry/.virtualenv/3/bin/merge", line 8, in <module>
    sys.exit(cli())
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/click/core.py", line 829, in __call__
    return self.main(*args, **kwargs)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/click/core.py", line 782, in main
    rv = self.invoke(ctx)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/click/core.py", line 1066, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/click/core.py", line 610, in invoke
    return callback(*args, **kwargs)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/merge.py", line 27, in cli
    mergeinator.do_merge(source, destination, 0, yes_flag=yes, dry_run_flag=dryrun)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/mergeinator.py", line 333, in do_merge
    walk(src, dest_dir, level)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/mergeinator.py", line 433, in walk
    walk(abs_f, dest_file, level + 1)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/mergeinator.py", line 433, in walk
    walk(abs_f, dest_file, level + 1)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/mergeinator.py", line 433, in walk
    walk(abs_f, dest_file, level + 1)
  [Previous line repeated 6 more times]
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/mergeinator.py", line 367, in walk
    remove(abs_f)
  File "/Users/gentry/.virtualenv/3/lib/python3.8/site-packages/mergeinator/mergeinator.py", line 276, in remove
    deleter(path)
FileNotFoundError: [Errno 2] No such file or directory: '/Volumes/boof/Users/gentry/myDotfiles/emacs.d/elpy/rpc-venv/lib/python2.7/site-packages/jedi/inference/sys_path.pyc'

Don't crash on named pipes.

File "/Users/gentry/.virtualenv/v/lib/python3.7/site-packages/mergeinator/mergeinator.py", line 292, in move
shutil.move(src, dest)
File "/Users/gentry/.virtualenv/v/lib/python3.7/shutil.py", line 577, in move
copy_function(src, real_dst)
File "/Users/gentry/.virtualenv/v/lib/python3.7/shutil.py", line 263, in copy2
copyfile(src, dst, follow_symlinks=follow_symlinks)
File "/Users/gentry/.virtualenv/v/lib/python3.7/shutil.py", line 115, in copyfile
raise SpecialFileError("%s is a named pipe" % fn)
shutil.SpecialFileError: Library/Application Support/HSTracker/hstracker.realm.management/access_control.new_commit.cv is a named pipe

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.