hildenae@ick:~/tmp/wwsvntogit/WizardWars$ git rebase -i c2180
Stopped at be7755e... Comments
You can amend the commit now, with

	git commit --amend

Once you are satisfied with your changes, run

	git rebase --continue

hildenae@ick:~/tmp/wwsvntogit/WizardWars$ git reset HEAD^
Unstaged changes after reset:
M	parser/createSG/src/no/hig/rag/parser/BuildInitialSceneGraph.java
M	parser/createSG/src/no/hig/rag/parser/ColladaParse.java
M	parser/createSG/src/no/hig/rag/parser/GameObject.java
M	parser/createSG/src/no/hig/rag/parser/Main.java
M	parser/createSG/src/no/hig/rag/parser/MtlParse.java
M	parser/createSG/src/no/hig/rag/parser/ObjParse.java
hildenae@ick:~/tmp/wwsvntogit/WizardWars$ git commit -c be7755e -- parser/createSG/src/no/hig/rag/parser/MtlParse.java parser/createSG/src/no/hig/rag/parser/ObjParse.java
[detached HEAD 7b4ef13] Remove unused classes from createSG
 2 files changed, 0 insertions(+), 382 deletions(-)
 delete mode 100644 parser/createSG/src/no/hig/rag/parser/MtlParse.java
 delete mode 100644 parser/createSG/src/no/hig/rag/parser/ObjParse.java
hildenae@ick:~/tmp/wwsvntogit/WizardWars$ git commit -ac be7755e
[detached HEAD 1a6d313] Add javadoc comments and cleanup sourcecode
 4 files changed, 37 insertions(+), 48 deletions(-)
hildenae@ick:~/tmp/wwsvntogit/WizardWars$ git rebase --continue
Successfully rebased and updated refs/heads/master.

Referenses

• http://book.git-scm.com/4_interactive_rebasing.html
• http://manpages.ubuntu.com/manpages/maverick/man1/git-commit.1.html#contenttoc3

git clone git@github.com:Kagee/fixmystreet.git
Initialized empty Git repository in /home/hildenae/tmp/fixmystreet/.git/
remote: Counting objects: 10461, done.
remote: Compressing objects: 100% (3306/3306), done.
remote: Total 10461 (delta 6802), reused 10276 (delta 6713)
Receiving objects: 100% (10461/10461), 10.10 MiB | 497 KiB/s, done.
Resolving deltas: 100% (6802/6802), done.

cd fixmystreet/

ls
android  bin  commonlib  conf  db  iphone  LICENSE.txt  locale  notes  perllib  README.pod  t  templates  web  web-admin

ls android
Fix My Street  README.txt  Screenshots  TODO.txt

Do some magick

git filter-branch --subdirectory-filter android -- --all
Rewrite 33db13154330e9e7a33c0fb5c356eccb25a6edda (36/36)
Ref 'refs/heads/master' was rewritten
Ref 'refs/remotes/origin/master' was rewritten
Ref 'refs/remotes/origin/cities_release_1' was rewritten
WARNING: Ref 'refs/remotes/origin/master' is unchanged
Ref 'refs/remotes/origin/migrate_from_osgb36_to_wgs84' was rewritten
Ref 'refs/remotes/origin/migrate_to_catalyst' was rewritten
Ref 'refs/remotes/origin/reportemptyhomes' was rewritten

ls
Fix My Street  README.txt  Screenshots  TODO.txt

Change origin

git remote -v

origin	git@github.com:Kagee/fixmystreet.git (fetch)
origin	git@github.com:Kagee/fixmystreet.git (push)

git remote set-url origin git@github.com:Kagee/fiksgatami.git git@github.com:Kagee/fixmystreet.git

git remote -v

origin	git@github.com:Kagee/fiksgatami.git (fetch)
origin	git@github.com:Kagee/fiksgatami.git (push)

Push

hildenae@hildenae-laptop:~/tmp/fixmystreet$ git push origin master
Counting objects: 464, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (243/243), done.
Writing objects: 100% (464/464), 1.44 MiB, done.
Total 464 (delta 159), reused 428 (delta 158)
To git@github.com:Kagee/fiksgatami.git
 * [new branch]      master -> master

# display number, assuming 0
display=0

# get the machine-id
read -r machineid < /var/lib/dbus/machine-id

# source the right file under .dbus to set the needed variables
. "$HOME/.dbus/session-bus/$machineid-$display"

# export the variables sourced from that file
export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID DBUS_SESSION_BUS_WINDOWID

# Run gconftool-2:

# enable desktop sharing
gconftool-2 -s -t bool /desktop/gnome/remote_access/enabled true

# disable "You must confirm each access to this machine"
gconftool-2 -s -t bool /desktop/gnome/remote_access/prompt_enabled false

# enable "Allow other users to control your desktop"
gconftool-2 -s -t bool /desktop/gnome/remote_access/view_only false

Remeber to set a password after you log in (afaik you can’t set this from cli)

I use the propiatary ATI drivers, and because of a bug i have to disable desktop effects, else the VNC windows will only show me a static desktop and no updates:

# disable desktop effects (if your desktop
gconftool -s -t string /desktop/gnome/applications/window_manager/current /usr/bin/metacity
gconftool -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity

sudo reboot

Sources

https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/353126
http://ubuntuforums.org/showthread.php?t=1518231

Update: Added @hr@ for inline-ranges.

The second codeblock is inside a shortcode similar to this:

1

All the highlighting is done by @hr@-tags on line 740 and 761. Lines 747, 751 and 754 are prefixed with @h@ to show that single lines inside a (possibly) large highlighted range can be excluded. Both marker tags are removed and do not appear when displayed or in code-view.

        // Automatically enable "htmlscript" for certain brushes
        //if ( false === $atts['html-script'] && in_array( $lang, apply_filters( 'syntaxhighlighter_htmlscriptbrushes', array( 'php' ) ) ) )
        //  $atts['html-script'] = 'true';

@hr@        // Detect and add inline highlights (@h@) and ranges (@hr@)
        $codelines = explode("n", $code);
        $h_marker = '@h@'; $h_marker_length = strlen($h_marker);
        $h_range = '@hr@';
        $atts['firstline'] = (int) $atts['firstline']; // sanitize firstline as we need it
        $hra = false; $h = false;
        foreach($codelines as $linenum => $line) { // could have used &$line, but that is php5-only
@h@            if($h_marker == substr($line, 0, $h_marker_length)) {
                // could have used "$line =" in php
                $codelines[$linenum] = substr($line,$h_marker_length, (strlen($line) - $h_marker_length));
                $h = true;
@h@            } else if($h_range == substr($line, 0, 4)) {
                $hra = !$hra; // we swap on/of ever time we detect the tag
                $codelines[$linenum] = substr($line,4); //, (strlen($line) - 4));
@h@            }
            if($h xor $hra) { // we use xor so we can use a @h@ to escape a active $hra
                $atts['highlight'] = ($atts['highlight'] == false) ?
                    ($linenum  + $atts['firstline'] -1 ) :
                    $atts['highlight'] . ',' . ($linenum  + $atts['firstline'] -1 );
            }
            $h = false;
        }
@hr@        $code = implode("n",$codelines);

        // Sanitize row highlights
        if ( false != $atts['highlight'] ) {

New syntaxhighlighter.php with the inline-highlight-code based on SyntaxHighlighter Evolved version 2.3.8

New syntaxhighlighter.php with the inline-highlight and highlight-range-code based on SyntaxHighlighter Evolved version 2.3.8

One of the first plugins i installed for this brand new WordPress was SyntaxHighlighter Evolved. I love to code, and knew i would find a use for it. To test it i used a large C++ file from cpp.snippets.org and began testing.

Highlight worked fine, but i i didn’t support highlighting a range of lines. This might not be so useful, as you usually want to highlight small sections, but i rewrote syntaxhighlighter.php to support ranges.

1

This expandes into

<pre class="brush: php; auto-links: false; first-line: 740; gutter: true;
highlight: [765,748,749,750,751,752,753,754,755,756,757,758,759,760,761];
html-script: false; light: false; pad-line-numbers: false;
smart-tabs: true; tab-size: 4; toolbar: true; wrap-lines: true;">

after beeing parsed by my (highlighted) changes

// Sanitize row highlights
if ( false != $atts['highlight'] ) {
@h@        if ( false === strpos( $atts['highlight'], ',' ) && false === strpos( $atts['highlight'], '-' ) ) {
                $atts['highlight'] = (int) $atts['highlight'];
        } else {
                $highlights = explode( ',', $atts['highlight'] );

                foreach ( $highlights as $key => $highlight ) {
                        // if this value is a range
                        if (FALSE !== strpos($highlight, '-',1)) {
                                // we require 1 digit before the dash,
                                // if not we ignore it and pass it on
                                $range = explode('-', $highlight);
                                // Around here we should probably try to cast
                                // to int and if-check to sanitize the values
                                // loop over the range and add it to highlights
                                for(;$range[0] <= $range[1]; $range[0]++){
                                        $highlights[] = $range[0];
                                }
                                // unset the current (range-type) highlight
                                unset($highlights[$key]);
                        } else {
                                $highlights[$key] = (int) $highlight;
                                if ( empty($highlights[$key]) )
                                        unset($highlights[$key]);
                        }
                }

                $atts['highlight'] = implode( ',', $highlights );
        }
}

New syntaxhighlighter.php with highlight-range-code based on SyntaxHighlighter Evolved version 2.3.8

See also Syntaxhighlighter Evolved with inline-highlight

In Ubuntu 10.04 (and probably onwards) OpenJDK Java and the Icedtea java plugin are the standard Java toolkit. BankID works with OpenJDK (just try installing Opera 10.10. Opera pre 10.5 use OpenJDK directly, without Icedtea), Icedtea is the troublemaker.

Sun Java has been pushed all the way into the Canonocal partner repository, that is not enabled as default. The following lines are a quick way to enable it and install java, even if the same is possible with lengthy GUI “click-here-then-there” tutorials.

sudo add-apt-repository "deb http://archive.canonical.com/ lucid partner"
sudo apt-get update
sudo apt-get install sun-java6-plugin

Line one adds the Canonical Partner repository to you software sources. There should be no complications if it is already enabled. Line two updates the list of avalible packages, so that line three can find and install the package sun-java6-plugin and it’s dependencies.

Sun Java should be the standard after this, if not, try to force it to be default with this line. And remember to restart you browser (or possibly restart your system)

sudo update-java-alternatives -s java-6-sun