hg.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Sat, 29 Jan 2011 17:24:48 +0200
changeset 793 7453db7e6f54
parent 766 0eb76fb9d948
child 815 4e8e511bd02e
permissions -rw-r--r--
Fix patch description message from command line.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
294
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     1
-*- mode: outline; coding: utf-8 -*-
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     2
674
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
     3
* About.
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
     4
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
     5
    http://mercurial.selenic.com/wiki/ProjectsUsingMercurial
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
     6
                Some Projects that Use Mercurial
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
     7
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
     8
* User config.
310
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     9
313
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    10
Put to your ~/.hgrc:
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    11
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    12
  [ui]
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    13
  ; Editor for editing commit message.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    14
  editor = gvim
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    15
  ; Who commit.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    16
  username = Oleksandr Gavenko <gavenkoa@gmail.com>
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    17
  ; Use internal merge algorithm, which mark conflict like <<<<<< ====== >>>>>>.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    18
  ; Save previous file version in '*.orig' file, after merge must be marked as
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    19
  ; resolved by running 'hg resolve -m <file>'.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    20
  merge = internal:merge
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    21
  [web]
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    22
  ; Default encoding for file hosted by 'hg serv'.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    23
  encoding = utf-8
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    24
312
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    25
** Useful extension.
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    26
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    27
Put to your ~/.hgrc:
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    28
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    29
  [extensions]
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    30
  ; To allow fetch command.
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    31
  fetch =
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    32
  ; To allow Mercurial Queues.
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    33
  hgext.mq =
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    34
310
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    35
** Multiline log message for log command.
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    36
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    37
By default 'hg log' show only first line of log message. To see all message run:
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    38
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    39
  $ hg log -v
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    40
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    41
or put into ~/.hgrc:
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    42
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    43
  [defaults]
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    44
  log = -v
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    45
311
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    46
** Follow history ever when file copied.
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    47
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    48
By default 'hg log' show only history after last file copy. To see log message
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    49
before copying run:
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    50
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    51
  $ hg log -f
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    52
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    53
or put into ~/.hgrc:
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    54
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    55
  [defaults]
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    56
  log = -f
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    57
766
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    58
* Remove/rename files history from repo.
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    59
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    60
  $ cat >filemap.txt <<EOF
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    61
exclude path/to/file-or-dir
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    62
rename path/to/source path/to/destination
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    63
...
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    64
EOF
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    65
  $ hg convert --filemap filemap.txt $repo_orig $repo_new
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    66
  $ hg -R $repo_new up
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    67
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    68
* Join history of two repos.
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    69
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    70
  $ cat >filemap1.txt <<EOF
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    71
rename . dir1
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    72
EOF
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    73
  $ cat >filemap2.txt <<EOF
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    74
rename . dir2
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    75
EOF
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    76
  $ hg convert --filemap filemap1.txt $repo1 $repo_new
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    77
  $ hg convert --filemap filemap2.txt $repo2 $repo_new
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    78
  $ hg -R $repo_new merge
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    79
  $ hg -R $repo_new ci -m "Join $repo1 and $repo2."
0eb76fb9d948 Join history of two repos.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 678
diff changeset
    80
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    81
* Publishing repo.
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    82
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    83
With static HTTP hosting you can copy via rsync, ftp, scp, etc., so long as all the files beneath
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    84
.hg are copied. Also since 1.1 pull protocol can detect static HTTP hosting:
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    85
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    86
  $ hg clone http://example.com/project
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    87
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    88
  http://mercurial.selenic.com/wiki/hgserve
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    89
  http://mercurial.selenic.com/wiki/HgWebDirStepByStep
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    90
  http://mercurial.selenic.com/wiki/StaticHTTP
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    91
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    92
** hgweb.config.
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    93
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    94
Set allowed project by specifying paths to they (keys are URL, values are fs paths):
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    95
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    96
  [paths]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    97
  myproject = /home/user/hg/myproject
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    98
  otherproject = /home/user/hg/otherproject
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    99
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   100
You can use single wildcard '*' to search current subdirs or double wildcard '**' to search subdirs
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   101
recursively:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   102
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   103
  [paths]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   104
  myproject = /home/user/hg/my/*
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   105
  otherproject = /home/user/hg/other/**
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   106
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   107
Alternatively you can set a collection of repos (keys and values are both filesystem paths, keys
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   108
should be prefixes of the values and are "subtracted" from the values in order to generate the URL
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   109
paths to each repository):
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   110
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   111
  [collections]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   112
  /home/user/hg = /home/user/hg
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   113
  /home/another/hg = /home/another/hg
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   114
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   115
Allow archive downloads:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   116
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   117
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   118
  allow_archive = gz, zip, bz2
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   119
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   120
Make web page look nice:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   121
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   122
  [web]
678
cd12d3519111 Some of styles.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 677
diff changeset
   123
  # Use 'cd /lib/python2.x/site-packages/mercurial/templates; find . -type d' to see available
cd12d3519111 Some of styles.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 677
diff changeset
   124
  # styles. Some interesting: gitweb, coal, monoblue.
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   125
  style = gitweb
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   126
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   127
Set another settings:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   128
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   129
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   130
  encoding = UTF-8
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   131
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   132
  maxchanges = 100
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   133
  maxfiles = 100
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   134
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   135
In each $proj/.hg/hgrc put:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   136
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   137
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   138
  contact = ADMIN <admin@example.com>
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   139
  description = <p style="color: red;">$proj</b> allow make a <a href="http://example.com">BIG Thing.</a>
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   140
  # Do not use name, in this case you see dir name where project lcated.
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   141
  # name = $proj
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   142
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   143
To allow push in 'hg serv':
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   144
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   145
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   146
  allow_push = *
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   147
  push_ssl = false
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   148
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   149
  http://mercurial.selenic.com/wiki/PublishingRepositories
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   150
                Publishing Mercurial Repositories
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   151
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   152
** init.d script.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   153
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   154
  #!/bin/sh
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   155
  CMD=/usr/bin/hg
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   156
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   157
  PORT=7878
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   158
  SRC=/srv/hg
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   159
  CONGIG=/srv/hg/hgweb.config
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   160
  PIDFILE=/var/run/hg.pid
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   161
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   162
  case "$1" in
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   163
  start)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   164
    echo "Mecurial Server service starting."
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   165
    (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE")
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   166
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   167
  stop)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   168
    if [ -f "$PIDFILE" ]; then
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   169
      PID=`cat "$PIDFILE"`
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   170
      if [ "$PID" -gt 1 ]; then
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   171
        kill -TERM $PID
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   172
        echo "Stopping the Mercurial service PID=$PID."
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   173
      else
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   174
        echo Bad PID for Mercurial -- \"$PID\".
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   175
        echo You may remove \"$PIDFILE\" manually.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   176
      fi
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   177
    else
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   178
      echo No PID file recorded for mercurial.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   179
    fi
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   180
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   181
  *)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   182
    echo "$0 {start|stop}"
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   183
    exit 1
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   184
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   185
  esac
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   186
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   187
  http://mercurial.selenic.com/wiki/hgserve
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   188
294
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   189
* Manage patches with MQ.
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   190
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   191
First enable MQ, add following to your ~/.hgrc:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   192
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   193
  [extensions]
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   194
  hgext.mq =
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   195
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   196
Second get unpatched sources and put it to hg repository:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   197
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   198
  $ tar zxf proj-x.y.z.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   199
  $ mv proj-x.y.z proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   200
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   201
  $ hg init
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   202
  $ hg ci -m "Added x.y.z version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   203
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   204
Init MQ and take name for first patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   205
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   206
  $ hg qinit
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   207
  $ hg qnew first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   208
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   209
Next make changes by editing source and save it to patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   210
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   211
  $ $EDITOR file.c
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   212
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   213
  $ hg diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   214
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   215
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   216
  $ hg diff      # <-- have zero diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   217
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   218
You can make second patch by applying existing one:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   219
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   220
  $ hg qnew second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   221
  $ patch -p1 <bugfix.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   222
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   223
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   224
You can take list of patches (from old to new) and revert or apply patches by
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   225
qpop/qpush command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   226
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   227
  $ hg qseries   # <-- what patches have
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   228
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   229
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   230
  $ hg qapplied  # <-- what patches applied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   231
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   232
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   233
  $ hg qpop
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   234
  $ hg qseries
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   235
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   236
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   237
  $ hg qapplied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   238
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   239
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   240
You can revert or apply all patches by single command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   241
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   242
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   243
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   244
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   245
You can delete patch from patch list (before that you need de-apply patch):
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   246
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   247
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   248
  $ hg qdelete first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   249
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   250
To add new version of source and fix patches for it first de apply patches,
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   251
then pull new changes and try apply patches on top of new sources:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   252
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   253
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   254
  $ rm *       # .hg dir not deleted because its name start with dot
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   255
  $ cd ..
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   256
  $ tar zxf proj-a.b.c.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   257
  $ cp -R proj-a.b.c/* proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   258
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   259
  $ hg addremove -s 70
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   260
  $ hg ci -m "Added a.b.c version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   261
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   262
295
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   263
To apply series of already done patches use:
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   264
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   265
  $ ls /path/to/bugfixes/*.patch | xargs hg qimport
425
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   266
793
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   267
You can fix patch description message from command line:
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   268
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   269
  $ hg qser -s
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   270
makefile-doc.patch:
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   271
  $ hg qpush
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   272
applying makefile-doc.patch
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   273
now at: makefile-doc.patch
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   274
  $ hg qref -m 'Add description about Makefile usage.'
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   275
  $ hg qser -s
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   276
makefile-doc.patch: Add description about Makefile usage.
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   277
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   278
or from editor by:
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   279
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   280
  $ hg qref -e
7453db7e6f54 Fix patch description message from command line.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 766
diff changeset
   281
425
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   282
* Proxy.
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   283
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   284
  $ hg clone --config http_proxy.host=$host:$port \
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   285
    --config http_proxy.user=$user --config http_proxy.passwd=$password  $addr
673
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   286
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   287
* Free Mercurial hosting.
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   288
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   289
  http://mercurial.selenic.com/wiki/MercurialHosting
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   290
                Free Hosting of Mercurial Repositories