# HG changeset patch
# User Chris Cannam
# Date 1313681847 -3600
# Node ID 41a156d439d0efc012142e9569dbd6d5eca0516a
# Parent 75ebcacd3f75427a77557d169cce2557f38865ac
Start adding Help
diff -r 75ebcacd3f75 -r 41a156d439d0 .hgignore
--- a/.hgignore Thu Aug 18 16:37:11 2011 +0100
+++ b/.hgignore Thu Aug 18 16:37:27 2011 +0100
@@ -1,29 +1,28 @@
-syntax: glob
-*.core
-*.o
-*~
-*.exe
-*.dll
-*.pyc
-*.orig
-*.user
-moc_*
-qrc_*
-o/*
-core
-easyhg
-debug/*
-release/*
-Makefile
-Makefile.Debug
-Makefile.Release
-*.app/*
-.DS_Store
-*.pdb
-
-re:^EasyMercurial$
-re:^kdiff3$
-re:^_UpgradeReport_Files/
+syntax: glob
+*.core
+*.o
+*~
+*.exe
+*.dll
+*.pyc
+*.orig
+*.user
+moc_*
+qrc_*
+o/*
+core
+easyhg
+debug/*
+release/*
+Makefile
+Makefile.Debug
+Makefile.Release
+*.app/*
+.DS_Store
+*.pdb
+re:^EasyMercurial$
+re:^kdiff3$
+re:^_UpgradeReport_Files/
*.dmg
*.xcodeproj
*.bak
diff -r 75ebcacd3f75 -r 41a156d439d0 easyhg.qrc
--- a/easyhg.qrc Thu Aug 18 16:37:11 2011 +0100
+++ b/easyhg.qrc Thu Aug 18 16:37:27 2011 +0100
@@ -24,6 +24,11 @@
When you use a version control system to keep track of your changes to +a set of files, there are two different concepts you're dealing with: +a working copy and a repository.
+ +A working copy is just a folder with your project's files in it. It +contains the versions of the files that you are working with now. +
A repository is a record of the entire history of your project. When +change something in the working copy, you can then commit it to the +repository and your change gets added to the history. +
You can also go back and grab an older version from the repository if +you find you need it. (If you do this, then the working copy will be +updated so as to contain that older version rather than the most +recent one.)
+ +Older centralised version control systems use a separate database for +the repository. But with a distributed version control system such as +Mercurial, the repository – the entire history of your project files +– is stowed into a special folder inside the working copy on your +hard drive. Every change you commit gets added to the history in that +hidden folder. (The history is compressed, so it doesn't take as much +space as you might imagine.)
+ +The term remote repository simply refers to a repository related to +your local one, but stored on another computer somewhere else. Often +this may be a “master copy” of your project stored on a server +elsewhere, which you and your collaborators can use to keep up with +each other's work, or which you can use to make your work public, or +simply use as a private backup.
+ +A Mercurial repository location is usually described by a URL, like +that of a website.
+ +For example, the URL for the repository containing the source code for
+EasyMercurial itself is https://bitbucket.org/cannam/easyhg
.
To get a copy of the files in a repository, you need to clone the +repository from the remote URL into a folder on your own computer. To +do this,
+ +1. click the Open toolbar button or use File -> Open
+ +2. select “Remote Repository” as the thing you want to open
+ +3. enter the repository URL into the URL field
+ +4. give the name of a folder on your local computer to clone into – + this folder will be created for you, so it shouldn't be one that already + exists
+ +5. click OK
+ +If the remote repository has restricted access, you may be asked to +provide a username and password to log in to the server it is hosted +on. If the repository is large, you may have to wait a while for all the +data to be transferred.
+ +Provided the clone has been successful, you should now have a local +repository to work in.
+ +$1/gs; +s/^\n*([^<\n])/\n
$1/gs; +s/^\n*(<[^p])/\n
$1/gs;
+s/([^\n])\n\n/$1<\/p>\n\n/gs;
+s/([^>\n])\n*$/$1<\/p>\n\n/gs;
+s/\[\[([^\|]*)\|([^\]]*)\]\]/$2<\/a>/gs;
+s/\[\[([^\|\]]*)\]\]/$1<\/a>/gs;
+s/\b_([^_]+)_\b/$1<\/i>/gs;
+s/\*(\w[^\*]+)\*/$1<\/b>/gs;
+s/@(\w[^@]+)@/ |" | sed 's/<\/h2>/<\/a><\/p>/' >> topics.html
+
+done
+
diff -r 75ebcacd3f75 -r 41a156d439d0 help/help.css
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/help.css Thu Aug 18 16:37:27 2011 +0100
@@ -0,0 +1,59 @@
+
+body {
+ background: #fdfaf0;
+ color: #3e442c;
+ margin: 0;
+ padding: 0;
+ margin-bottom: 40px;
+ font-family: sans-serif;
+}
+
+h1, h2, h3, h4 {
+ margin-left: 10px;
+ margin-bottom: 0.4em;
+}
+
+h2 {
+ font-size: 1.3em;
+ margin-top: 0;
+}
+
+h3 {
+ font-size: 1.2em;
+}
+
+h4 {
+ font-size: 1.1em;
+}
+
+ol, ul, ol li, ul li {
+ margin-left: 0;
+ color: #808080;
+ font-style: italic;
+}
+
+p, pre {
+ margin-left: 20px;
+ margin-bottom: 0.5em;
+ margin-right: 10px;
+ margin-top: 0;
+}
+
+blockquote {
+ margin-left: 70px;
+}
+
+table {
+ padding-top: 0;
+}
+
+a {
+ color: #be5700;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+
diff -r 75ebcacd3f75 -r 41a156d439d0 help/images/openremote.png
Binary file help/images/openremote.png has changed
diff -r 75ebcacd3f75 -r 41a156d439d0 help/images/openremote50.png
Binary file help/images/openremote50.png has changed
diff -r 75ebcacd3f75 -r 41a156d439d0 help/intro.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/intro.html Thu Aug 18 16:37:27 2011 +0100
@@ -0,0 +1,4 @@
+
+ Someone gave me a repository URL and asked me to clone it$1<\/code>/gs;
+s/---/—/gs;
+s/--/–/gs;
+s/
/
/gs;
+s/<\/h2><\/p>/<\/h2>/gs;
+print;
+' >> "$out"
+
+ echo "
$backlink" >> "$out"
+
+ category=`grep '^{.*}$' "$x" | sed 's/[{}]//g'`
+
+ if [ "$category" != "$pcat" ]; then
+ echo "$category
" >> topics.html
+ fi
+
+ grep '' "$out" | sed "s|
|
Quick Topics
+
+
diff -r 75ebcacd3f75 -r 41a156d439d0 help/topics.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/topics.html Thu Aug 18 16:37:27 2011 +0100
@@ -0,0 +1,9 @@
+
+
+Quick Topics
+
+
+Terminology
+
+Opening and initialising things
+