psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

use git-stash instead of fake commit

This commit is contained in:
psyc://psyced.org/~lynX 2010-02-24 09:02:54 +01:00
parent 1b4463b2a4
commit 19aab6b349
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGESTODO
View File

@ -378,6 +378,7 @@ ________________________________________________________________________
- parse.i erlaubt es den begrüßungspunkt wegzulassen wenn man - parse.i erlaubt es den begrüßungspunkt wegzulassen wenn man
stattdessen ne leerzeile liefert. aua -- egal, wir wechseln auf spyc stattdessen ne leerzeile liefert. aua -- egal, wir wechseln auf spyc
- auch derb, er akzeptiert ".xx" statt "."
- /silence conversation doesn't filter /action - /silence conversation doesn't filter /action
@ -3996,6 +3997,12 @@ person, user
usercmd usercmd
+ /forceenter only exists temporarily to circumvent a bug + /forceenter only exists temporarily to circumvent a bug
- immediately show presence of a newly acquired friend, thx tg - immediately show presence of a newly acquired friend, thx tg
http/fetch
+ POST support
new: http/oauth
userthreads, threads, accept etc userthreads, threads, accept etc
+ experimental microblogging on your web profile, thx tg + experimental microblogging on your web profile, thx tg
#define _flag_enable_module_microblogging #define _flag_enable_module_microblogging
+ twitter submit
+ signatures

14
bin/psyconf
View File

@ -459,11 +459,11 @@ then
# echo "and finally 'git merge -s resolve origin' instead" # echo "and finally 'git merge -s resolve origin' instead"
# exit 1 # exit 1
# echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" # echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)"
## (cd $sandbox/.. && cvs login && cvs -q update -dP && cvs logout) ## (cd $base && cvs login && cvs -q update -dP && cvs logout)
echo "" echo ""
echo "Fetching update from public git repository..." echo "Fetching update from public git repository..."
echo "" echo ""
(cd $sandbox/.. && git fetch origin) (cd $base && git fetch origin)
echo "" echo ""
echo "You can now read the changes using ${hi}\$0 -d${lo}" echo "You can now read the changes using ${hi}\$0 -d${lo}"
echo "or activate the changes using ${hi}\$0 -m${lo}" echo "or activate the changes using ${hi}\$0 -m${lo}"
@ -496,11 +496,15 @@ fi
if test "\$1" = "-m" if test "\$1" = "-m"
then then
# git is seriously unsuited for this job. we need to "check in" the changes # # git is seriously unsuited for this job. we need to "check in" the changes
# to file permissions etc or otherwise we can't update things at all... # # to file permissions etc or otherwise we can't update things at all...
(cd $base && git commit -a -m 'automatic by psyced -m') # (cd $base && git commit -a -m 'automatic by psyced -m')
# stash local changes
(cd $base && git stash)
# merging will of course fail.. sigh # merging will of course fail.. sigh
(cd $base && git merge -s resolve origin) (cd $base && git merge -s resolve origin)
# restore local changes
(cd $base && git stash apply)
exit exit
fi fi

2
world/net/twitter/client.c
View File

@ -1,6 +1,6 @@
/* twitter client /* twitter client
* *
* - register @ http://twitter.com/apps * - register @ https://twitter.com/apps
* - settings: * - settings:
* - app name: e.g. psyc://your.host/ * - app name: e.g. psyc://your.host/
* - app type: browser * - app type: browser