Mercurial Howto

[KingPin]

Windows :

Install tortoisehg from http://tortoisehg.bitbucket.org/


Right click anywhere shows u the HG context menu.


click on clone repo


Fill in the repo and a location you want it to be setup in. (the folder must not exist on your local system)
Repo : https://bitbucket.org/KingPin/trinitycore


Click close once its done.


look in the folder and you will see something very similar to svn.


you can do various things with HG once the sources are downloaded
in order highlighted in above picture :

• you can update to a specific revision from the sources. use trac to get rev number/hash
• you can merge a specific revision into your sources.
• You can view the changelog.
• you can search repo.
• Your local Repo can be synchronized with the master repo.
• You can create a Clone from your local repo.

one thing I didnt mention in the above list is the webserver option. It allows u to create a great looking repo page for your local repo o any port of your choosing. pictures below.




for 64bit windows : http://stackoverflow.com/questions/3...e-context-menu


click on commit

Remember this is a local commit and isnt going to master. this is a change to your local repo. (so u can maintain your own repo and even share with others :) )



clicking outgoing will show u the changes that will be made. clicking push will push them to master (if u have permission) clicking email will email the patch to whomever u want to email it to.



use the view changelog window to compare/check/view source changes. and also here uc an make patches via right clicking a rev. show me one person who doesnt think this is a better patching method than svn and I will show u one person who cant see.






how to setup gmail as your smtp server so u can use it to email patches?

Server name: smtp.gmail.com
Port: 587
Enable TLS : true
username : yourname@gmail.com
pass : yourpass

Below section Added 11/21/08




Win32 line endings

Goto c:\Program Files\TortoiseHg and edit Mercurial.ini and remove ; from in front of the following. add any lines that dont exist :

hgext.win32text=

[encode]

** = cleverencode:

[decode]

** = cleverdecode:

[patch]
eol = crlf

[hooks]
pretxncommit.crlf = python:hgext.win32text.forbidcrlf

this will make sure you get windows line endings when u checkout. this isn't perfect but its better than mix and match.

[KingPin]

type above command once to clone a repo



type hg pull anytime u need to update to latest rev.





If you are windows user, please change the settings otherwise there will be some eol issues:
Mercurial.ini
hgext.win32text =
** = cleverencode:
** = cleverdecode:
Three lines, that is all.

[Paradox]

One problem I see so far, that I hope you plan on rectifying at some point, the HG repository you have set up is basically from /trunk, meaning no branches, tags, etc.

Edit: I also see no option for applying (or even creating) patches.... There is an option "Visual Diff" but, it doesn't even run when I click on it.

Edit2: It seems HG has the same diff command as git (obviously) and I imagine I'm expected to use patch to apply the patches, not a big deal, but, why can't the damn GUI tools for these damn SCMs do the diff and patch stuff without forcing people who can barely handle point and click (not speaking of myself, but, I know some of my users very well....) to use the command line?

Edit3: HG diff is doing the same damn thing git diff did for me at first, it's counting the line endings as differences and creating a patch that basically replaces all of the EOLs in your repo (linux) with the EOLs in my local repo (windows).... Maybe you need to set something equivalent to SVN:eolstyle - native or whatever.....

[neo0608]

It would be interesting how you create Patch/Diff files... and how you can commit it ^^

[Wartai]

Visual Diff just displays the changes to the files that were made, but doesnt show the files that were added, doesnt create the patch files either.
I just right clicked a patch file selected Apply Patch and then chose the directory to apply it (thats using TortoiseSVN), that works fine, but from what i have been reading, you will have to use command line to create patches, using Export commands ?
So im expecting the same problems you are having keeping your patches updated with Mangos GIT, will be the same with Mercurial..
http://www.selenic.com/mercurial/wik...TutorialExport

[KingPin]

wartai u are looking at mercurial's own wiki it *DOESNT* account for tortoise client.

[Paradox]

Originally Posted by KingPin

wartai u are looking at mercurial's own wiki it *DOESNT* account for tortoise client.

Well, the tortoise client doesn't contain anything related to applying or creating patches, unlike the SVN version of tortoise....

[neo0608]

mhh... first diff with TortoiseHG:

# HG changeset patch
# User neo0608
# Date 1226502081 -3600
# Node ID 2cccb0a9d8d19912e8da3214b0e9112938d98f21
# Parent  727b3a5aa8425dbd5c65a9c03b7d7f4f117f491e
* only testing ;)
diff -r 727b3a5aa842 -r 2cccb0a9d8d1 src/game/AccountMgr.cpp
--- a/src/game/AccountMgr.cpp Mon Nov 10 22:05:21 2008 -0600
+++ b/src/game/AccountMgr.cpp Wed Nov 12 16:01:21 2008 +0100
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "MyTestDiff.test"
 #include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectAccessor.h"

complicated ^^

[KingPin]

Originally Posted by Paradox

Well, the tortoise client doesn't contain anything related to applying or creating patches, unlike the SVN version of tortoise....

(looked for you on irc but u didnt respond so)
maybe you just havent looked in the right places ;)

tortoisehg > view changelog > right click any chageset and export log locally or email it. I have tested both and they work great. it allows mercurial style, git style, and plain patches.

[Paradox]

Originally Posted by KingPin

(looked for you on irc but u didnt respond so)
maybe you just havent looked in the right places ;)

tortoisehg > view changelog > right click any chageset and export log locally or email it. I have tested both and they work great. it allows mercurial style, git style, and plain patches.

My AHBot patch is not yet part of the repository, so, how does this help me exactly?