seyz / baboon Goto Github PK

View Code? Open in Web Editor NEW

120.0 120.0 9.0 327 KB

Detect source code merge conflicts in realtime. Simply get rid of merge hells.

Home Page: http://baboon-project.org

Python 100.00%

baboon's People

Contributors

Stargazers

Watchers

Forkers

raphdg piwhy jplana kryskool pierrezurek rhunter seibert superalex tom-mi

baboon's Issues

Don't forget to add the enable option to 1 when creating a new project

Hidden files need to be ignore by default

During the initialization (or when you create a new file in the watched directory), the hidden files need to be ignore by default. The user can remove the ignore "flag" to watch the files he wants.

Shelve stacktrace ?

2012/09/28 18:10:52 INFO  Bye ! (MainThread/sigint_handler:166)
Exception TypeError: "'NoneType' object is not callable" in <bound method DbfilenameShelf.__del__ of {'db/migrate/20111011195702_share_anything.rb': 1348848651.511066, 'app/assets/images/branding/asterisk_white.png': 1348848651.511066, 'spec/shared_behaviors/stream.rb': 1348848651.511066, 'app/assets/images/buttons/[email protected]': 1348848651.511066, 'features/step_definitions/uri-step.rb': 1348848651.511066, 'app/views/conversations/_conversation.haml': 1348848651.511066, 'app/models/relayable_retraction.rb': 1348848651.511066, 'app/controllers/services_controller.rb': 1348848651.511066, 'app/assets/templates/flow_tpl.jst.hbs': 1348848651.511066, 'spec/helper_methods.rb': 1348848651.511066, 'app/views/notifier/comment_on_post.markerb': 1348848651.511066, 'app/assets/images/social_media_logos/tumblr-48x48.png': 1348848651.511066, 'config/locales/diaspora/lt.yml': 1348848651.511066, 'db/migrate/20110603212633_likes_dependent_delete.rb': 1348848651.511066, 'app/assets/javascripts/app/views/post-viewer/new_comment.js': 1348848651.511066, 'config/initializers/cors.rb': 1348848651.511066, 'app/assets/images/img/glyphicons-halflings-red.png': 1348848651.511066, 'spec/lib/stream/person_spec.rb': 1348848651.511066, 'app/models/notifications/comment_on_post.rb': 1348848651.511066, 'features/conversations.feature': 1348848651.511066, 'app/presenters/post_presenter.rb': 1348848651.511066, 'app/assets/images/static-loader.png': 1348848651.511066, 'config/locales/diaspora/nb.yml': 1348848651.511066, 'app/assets/images/icons/search_grey.png': 1348848651.511066, 'lib/salmon/salmon.rb': 1348848651.511066, 'config/locales/devise/devise.fr.yml': 1348848651.511066, 'app/views/comments/index.mobile.haml': 1348848651.511066, 'app/assets/javascripts/app/views.js': 1348848651.511066, 'app/models/user/querying.rb': 1348848651.511066,

Verification of node permission during the rsync.

During the first stanza sent for the rsync task, the node is given according to the config entry in the configuration file without any server-side verification (if the user is a subscriber on this node). It means that if the user changes the
value of the config entry to any node, the user will write the change in the directory of the chosen project.

Create method generate the following error.

~/projects/internal/baboon (master *) $ python bin/baboon create techta --path /tmp
Creation in progress...
Traceback (most recent call last):
  File "bin/baboon", line 7, in <module>
    Main()
  File "/home/raph/projects/internal/baboon/baboon/main.py", line 30, in __init__
    getattr(commands, self.which)()
  File "/home/raph/projects/internal/baboon/baboon/commands/commands.py", line 84, in create
    with AdminTransport(logger_enabled=False) as transport:
  File "/home/raph/projects/internal/baboon/baboon/transport.py", line 53, in __enter__
    self.open()
  File "/home/raph/projects/internal/baboon/baboon/transport.py", line 69, in open
    self.process(block=block)
  File "/home/raph/projects/external/SleekXMPP/sleekxmpp/basexmpp.py", line 191, in process
    self.plugin[name].post_init()
  File "/home/raph/projects/external/SleekXMPP/sleekxmpp/plugins/xep_0004/dataforms.py", line 50, in post_init
    self.xmpp.plugin['xep_0030'].add_feature('jabber:x:data')
KeyError: 'xep_0030'

Deal with pending subscription

We need to deal with pending subscription.

How to notify a project owner there's an new pending subscription ?
How to retrieve the list (xep 0050 normally) ?
etc.

Conflit detected on non-existent file

Set CDATA sections to stanzas for diffs

Deleting a project should delete the tree server side and the project's .baboon folder

File not deleted during the startup rsync.

Sync aaa.txt
Stop baboon.
Delete aaa.txt
Start baboon.
aaa.txt is not deleted server-side.

What about add/remove spaces ?

What about detection conflict when you add/remove some spaces (e.g. at the end of the line) ?
Need a trim or not ?
Consider spaces like another letters or not ?

Logging with dictConfig won't work with python 2.6

Windows support

We need to test if baboon works on Windows.

Baboon uses watchdog but it seems the windows support is not very good. Is it enough for our use cases ?

SIGINT support

Baboon needs to handle the sigint signal for a clean close.

Avoid direct message to warn there's a conflict or not

Use a pubsub message to warn if there's a conflict or not.
The stanza will be something like that :

<type>conflict</type>
<from>[email protected]</from>
<to>[email protected]</to>
<diff>..................</diff>

The diff can be useful later. The type can be useful to detect if it's a regular diff message (type diff ?) or a conflict message.

Sometimes an rsync begins before self.sid is initialized in WatchTransport.

It causes baboon to crash.
Threading sync issue.

Need to catch when the rsync is not correctly configured.

For example, when the ssh key is not present (without passphrase).

The not yet initialized message should not be inside quotes

$ baboon start
'The project synapse-agent is not yet initialized. Please, run baboon init synapse-agent <git-url>.'

Deal with large stanza size

Split stanza ?

Create a setup.json

Create a setup.json in order to install easily baboon and all its dependencies.

Detection of new file

When a new file is created on the watch project :

Add it to the watched directory

Create a Subversion plugin

Git and Hg is currently supported. It will be cool to have a Svn support too.

Deal with project init server side

How to manage the first rsync ?

Deal with IQ timeout and IQ Error.

Add a option in the parser to avoid to modify the configuration file of the user

IqTimeout when trying to create a project without any account configured. Need to have a beautiful error message.

No --path error message when create a new project with the --nosave option

What do you think about that @raphdg ?

Use the xmpp presence

Print a log message (or something other later) when a user is connected. Same thing when the user is disconnected.

The xmpp presence can be useful for this task.

Make CTRL+C work again

Avoid to detect a conflict when it's the same change

Avoid to detect a conflict when it's the same change. Verify that git/mercurial/svn/cvs/... don't detect a conflict in this case.

KeyError Exception during project deletion

I create a project foo with --nosave option.

So, my configuration file has no foo entry. Great.

I delete my foo project and I have this stacktrace:

Deletion in progress...
The project foo is successfuly deleted.
Traceback (most recent call last):
  File "bin/baboon", line 9, in <module>
    Main()
  File "/home/seyz/workspace/external/baboon/baboon/main.py", line 29, in __init__
    getattr(commands, self.which)()
  File "/home/seyz/workspace/external/baboon/baboon/commands/commands.py", line 125, in delete
    del config['projects'][project]
KeyError: 'foo'

signal.pause() does not work on Windows

Need to find an equivalent.

Color logs

It will be cool to have some colors in the console logs.

cannot apply binary patch to *** without full index line

Fixed error like that:

Conflict detected with [email protected].
> error: cannot apply binary patch to 'public/apple-touch-icon.png' without full index line

To reproduce the bug, remove a binary file.

[server]
max_stanza_size = 65535
pubsub = pubsub.baboon-project.org
streamer = streamer.baboon-project.org
server = [email protected]/baboond

[user]
passwd = secret
jid = [email protected]

[cortex-web]
scm = git
path = /home/seyz/workspace/internal/cortex-web

# Example of project definition
#[awesome_project]      # The project name on the baboon server
#path = /pathto/project # The project path of your system
#scm = git              # The source code manager you use for this project
#enable = 1             # You want baboon to actually watch this project

I replaced 'server' entry by 'master' for testing and:

(baboon)seyz@dogwood ~/workspace/external/baboon (master) $ python bin/baboon register marci --nosave
Password: 
Confirm password: 

Registration in progress...
Traceback (most recent call last):
  File "bin/baboon", line 9, in <module>
    Main()
  File "/home/seyz/workspace/external/baboon/baboon/main.py", line 29, in __init__
    getattr(commands, self.which)()
  File "/home/seyz/workspace/external/baboon/baboon/commands/commands.py", line 43, in register
    transport = RegisterTransport(callback=_on_action_finished)
  File "/home/seyz/workspace/external/baboon/baboon/transport.py", line 426, in __init__
    super(RegisterTransport, self).__init__()
  File "/home/seyz/workspace/external/baboon/baboon/transport.py", line 45, in __init__
    self.server_addr = config['server']['master']
KeyError: 'master'

seyz / baboon Goto Github PK

baboon's People

Contributors

Stargazers

Watchers

Forkers

baboon's Issues

Recommend Projects

Recommend Topics

Recommend Org

Jobs