1. Mercurial (Hg) is a distributed version control system that allows developers to work on local repositories and exchange changes through patches. 2. The document discusses Hg commands like add, commit, push, pull, diff, log and tools like TortoiseHg and hgtk. It also covers common workflows like branching, merging, resolving conflicts. 3. The document walks through an example of multiple developers - DevA, DevB and DevC - collaborating on a project hosted on Bitbucket using a release/develop model with Hg. It demonstrates tasks like cloning, branching, committing, pushing, pulling and merging changes.

1. 42qu.com , 找到给你答案的人
42qu.com

2. 42qu.com , 找到给你答案的人
Python 网站开发 入门班
基于 新浪 SAE 和 Python Torando 的搭建短网址应用
第三课 Hg 的用法
郭浩川
• wooparadog.42qu.com
• guohaochuan@gmail.com

3. 42qu.com , 找到给你答案的人
Mercurial(Hg)
• BitKeeper, stopped free version.
• Linux kernel needed an alternative.
• Linus Torvalds made git.
• Mackall built Mercurial

4. 42qu.com , 找到给你答案的人
Who is using
• Python
• Vim
• W3C
• RabbitMQ
• OpenJDK
• Go Programing language
• Mozilla
• 豆瓣

5. 42qu.com , 找到给你答案的人
Host servives
• Bitbucket
• Google Code
• SourceForge
• CodePlex

6. 42qu.com , 找到给你答案的人
So what is Hg

7. 42qu.com , 找到给你答案的人
The svn model:
Central Version Control System(CVS) or client – server
• Everything is on one server.
• Devs commit to that server.
• Need network connection.
• Work flow:
copy trunk -> dev in branch -> copy
another trunk -> merge your branch ->
merge to trunk

8. 42qu.com , 找到给你答案的人
The hg model:
Distributed Version Control System(DVCS) peer to peer
• Many Repositories.
• Devs commit to his local repo
• Exchange patches.
• Many development models.
Develop/Release:
Fork/branch release  develop in branch
 [Merge trunk  trunk merge branch |
trunk merge branch]

9. 42qu.com , 找到给你答案的人
Usage
• Command line tool
– Hg <command> <params>
• Common commands:
– clone commit push pull diff branches branch
merge update rm forget help

10. 42qu.com , 找到给你答案的人
Gui Tools
• Windows:
– Tortoisehg:
http://tortoisehg.bitbucket.org/
• Linux:
– hgtk

11. 42qu.com , 找到给你答案的人
Configuration ( 工欲善其事 , 必先利其器 )
• .hgrc
– [ui]
• username = wooparadog <guohaochuan@gmial.com>
• Ssh = ssh –i ~/.ssh/id_rsa -C
• Ignore = ~/.hgignore
– [Extensions]
• Hgext.fetch =
• Color =
– [Alias]
• blame = annotate --user --number

12. 42qu.com , 找到给你答案的人

13. 42qu.com , 找到给你答案的人

14. 42qu.com , 找到给你答案的人
So let’s do a walk through
• Use bitbucket as project hoster
• 3 people involved.
• Use release/develop model
• Include:
– Build reop
– Build branches
– Resolve conficts

15. 42qu.com , 找到给你答案的人
Release/develop model:
• First commit to default branch. This is our
release branch.
• All other features/bugfixes etc. will be in
another branch.
• When they are ready(for production),
merge them to default(release branch)

16. 42qu.com , 找到给你答案的人
Make a repo in bitbucket

17. 42qu.com , 找到给你答案的人
Clone it down.
hg clone ssh://hg@bitbucket.org/wooparadog/42qu-test
.hg exists and exists only in repo root , in contrast to svn

18. 42qu.com , 找到给你答案的人
Add files ( This is done by DevA)
After some coding…
3.Check what’s changed
4.Add new file. (or add all files)
5.Check status again.
Code is not committed at this
stage.

19. 42qu.com , 找到给你答案的人
Commit and push

20. 42qu.com , 找到给你答案的人
DevB wants to work.
• Clone it down from bitbucket.
• Make a branch.
What branches are there?
Make a new branch, commit after braching, check current branch

21. 42qu.com , 找到给你答案的人
DevB does some work…
He decides some folders were badly named.
So he uses hg mv to rename them
And some files can be deleted.
So he uses hg rm to remove them
Now repo looks like this.
Then he rages at a block of code.
He wants to know who wrote them
hg blame shows it was all DevA’s work.

22. 42qu.com , 找到给你答案的人
Then DevB’s work is done.
• He uses hg status to see what’s changed
• Then reviews his changes with hg diff
before committing to his branch.
– Push should be: hg push --new-branch

23. 42qu.com , 找到给你答案的人
DevC
• Boss thinks DevB’s progress is too slow.
DevC comes to save the day.
• He cloned the repo, switch to DevB’s
branch by
hg update wooparadog_20120310_new_feature
• Then he starts doing stuff…With DevB
doing his on his computer….

24. 42qu.com , 找到给你答案的人
Conflicts
• When devC wants to push.
• Branch at bitbucket has changed. He
needs to pull.

25. 42qu.com , 找到给你答案的人
Resolving conflicts
• hg resolve -l
• Use ack to find conflicts.
• And resolve it ( hg resolve -m)
Don‘t forget to commit and push it..

26. 42qu.com , 找到给你答案的人
Revert
• DevB pulls new version, after some time,
he hates what devC has done.
• Check log.
– hg log -b <branch>
– hg log -b .
• Revert to version 5.
• hg revert –r 5

27. 42qu.com , 找到给你答案的人
Merge to release
• DevA now thinks it’s ready to make this
feature online. But first, he needs to
review all the changes.
hg diff –r <revision>:<revision>
• What we would do:
hg update default
hg merge <branch>
hg diff

28. 42qu.com , 找到给你答案的人
Conclusion:
• Add • Merge
• Commit • Resolve
• Push • Status
• Pull • Rm
• Update • Mv
• Diff
• Log
‘commit’ can be ‘com’, yeah, git, beat thath.

29. 42qu.com , 找到给你答案的人
Last,
• Hggit
– hg clone git://github.com/schacon/munger.git
• Hgsvn/hgsubversion

30. 42qu.com , 找到给你答案的人
Naming revision
• hg tag
– hg tag –r <revision> <name>
• hg tags
• Update:
– hg update <tag_name>

31. 42qu.com , 找到给你答案的人

32. 42qu.com , 找到给你答案的人
References:
• http://book.42qu.com/tool/hg.html
– Hg 工作流介绍
– Pythonic Hg 使用
– 了解分布式版本管理系统
– Mercurial CheatSheet
– Mercurial 权威指南
– Mercurial: The Definitive Guide
– Hg Init: a Mercurial tutorial
– Hg Git
– Hg Svn
– Hg 小技巧
– Hg & Git 口水战文章
• Git 和 Hg 面对面
• Git 和 Hg 面對面之我見 - Willie Wu