New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error when save a page after change the markup #2

Closed
mgaitan opened this Issue Sep 30, 2014 · 0 comments

Comments

Projects
None yet
1 participant
@mgaitan
Owner

mgaitan commented Sep 30, 2014

I went to an existent page and change the markup. Then click save:

repo status

(waliki)17:03 ~/waliki_data (master)$ git status
# HEAD detached at b810a1e
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add <file>..." to mark resolution)
#
# both modified: test.rst
#
no changes added to commit (use "git add" and/or "git commit -a")
(waliki)17:05 ~/waliki_data ((detached from b810a1e))$ 

traceback

Environment:


Request Method: POST
Request URL: https://waliki.pythonanywhere.com/page/edit

Django Version: 1.7
Python Version: 3.3.2
Installed Applications:
('django.contrib.admin',
 'django.contrib.auth',
 'django.contrib.contenttypes',
 'django.contrib.sessions',
 'django.contrib.messages',
 'django.contrib.staticfiles',
 'django.contrib.sites',
 'waliki',
 'waliki.git',
 'waliki.pdf',
 'allauth',
 'allauth.account',
 'allauth.socialaccount',
 'allauth.socialaccount.providers.github',
 'allauth.socialaccount.providers.twitter')
Installed Middleware:
('django.contrib.sessions.middleware.SessionMiddleware',
 'django.middleware.common.CommonMiddleware',
 'django.middleware.csrf.CsrfViewMiddleware',
 'django.contrib.auth.middleware.AuthenticationMiddleware',
 'django.contrib.messages.middleware.MessageMiddleware',
 'django.middleware.clickjacking.XFrameOptionsMiddleware')


Traceback:
File "/home/waliki/.virtualenvs/waliki/lib/python3.3/site-packages/django/core/handlers/base.py" in get_response
  111.                     response = wrapped_callback(request, *callback_args, **callback_kwargs)
File "/home/waliki/waliki/waliki/decorators.py" in _wrapped_view
  57.                 return view_func(request, *args, **kwargs)
File "/home/waliki/waliki/waliki/views.py" in edit
  54.                                                   form_extra_data=json.loads(form.cleaned_data["extra_data"] or "{}"))
File "/home/waliki/.virtualenvs/waliki/lib/python3.3/site-packages/django/dispatch/dispatcher.py" in send
  198.             response = receiver(signal=self, sender=sender, **named)
File "/home/waliki/waliki/waliki/git/models.py" in commit
  11.                                            parent=parent)
File "/home/waliki/waliki/waliki/git/__init__.py" in commit
  53.             git.commit(path, allow_empty_message=True, m=message, **kwargs)
File "/home/waliki/.virtualenvs/waliki/lib/python3.3/site-packages/sh.py" in __call__
  769.         return RunningCommand(cmd, call_args, stdin, stdout, stderr)
File "/home/waliki/.virtualenvs/waliki/lib/python3.3/site-packages/sh.py" in __init__
  330.                 self.wait()
File "/home/waliki/.virtualenvs/waliki/lib/python3.3/site-packages/sh.py" in wait
  334.         self._handle_exit_code(self.process.wait())
File "/home/waliki/.virtualenvs/waliki/lib/python3.3/site-packages/sh.py" in _handle_exit_code
  348.                 self.process.stderr

Exception Type: ErrorReturnCode_1 at /page/edit
Exception Value: 

  RAN: '/usr/bin/git --no-pager commit page.rst --author=Martín Gaitán <> -m  --allow-empty-message'

  STDOUT:
test.rst: needs merge
# �[31mHEAD detached at �[m17f9003
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   �[31mmodified:   test.rst�[m
#
no changes added to commit (use "git add" and/or "git commit -a")


  STDERR:

@mgaitan mgaitan referenced this issue Oct 2, 2014

Closed

Move page view #6

@mgaitan mgaitan added the bug label Oct 2, 2014

@mgaitan mgaitan closed this in 16eea49 Apr 11, 2015

mgaitan added a commit that referenced this issue Apr 11, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment