hg.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Mon, 08 Nov 2010 00:17:12 +0200
changeset 676 e7632a1fdeca
parent 675 47d4ad70738f
child 677 09283c165bfc
permissions -rw-r--r--
Publishing repo.
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
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    58
* Publishing repo.
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    59
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    60
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
    61
.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
    62
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    63
  $ hg clone http://example.com/project
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    64
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    65
  http://mercurial.selenic.com/wiki/hgserve
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    66
  http://mercurial.selenic.com/wiki/HgWebDirStepByStep
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    67
  http://mercurial.selenic.com/wiki/StaticHTTP
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    68
676
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    69
** hgweb.config.
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    70
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    71
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
    72
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    73
  [paths]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    74
  myproject = /home/user/hg/myproject
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    75
  otherproject = /home/user/hg/otherproject
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    76
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    77
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
    78
recursively:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    79
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    80
  [paths]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    81
  myproject = /home/user/hg/my/*
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    82
  otherproject = /home/user/hg/other/**
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    83
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    84
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
    85
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
    86
paths to each repository):
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    87
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    88
  [collections]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    89
  /home/user/hg = /home/user/hg
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    90
  /home/another/hg = /home/another/hg
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    91
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    92
Allow archive downloads:
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
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    95
  allow_archive = gz, zip, bz2
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    96
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    97
Make web page look nice:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    98
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
    99
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   100
  style = gitweb
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   101
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   102
Set another settings:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   103
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   104
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   105
  encoding = UTF-8
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
  maxchanges = 100
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   108
  maxfiles = 100
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   109
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   110
In each $proj/.hg/hgrc put:
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   111
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   112
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   113
  contact = ADMIN <admin@example.com>
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   114
  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
   115
  # 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
   116
  # name = $proj
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   117
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   118
To allow push in 'hg serv':
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
  [web]
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   121
  allow_push = *
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   122
  push_ssl = false
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   123
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   124
  http://mercurial.selenic.com/wiki/PublishingRepositories
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   125
                Publishing Mercurial Repositories
e7632a1fdeca Publishing repo.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 675
diff changeset
   126
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   127
** init.d script.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   128
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   129
  #!/bin/sh
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   130
  CMD=/usr/bin/hg
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   131
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   132
  PORT=7878
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   133
  SRC=/srv/hg
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   134
  CONGIG=/srv/hg/hgweb.config
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   135
  PIDFILE=/var/run/hg.pid
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   136
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   137
  case "$1" in
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   138
  start)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   139
    echo "Mecurial Server service starting."
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   140
    (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE")
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   141
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   142
  stop)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   143
    if [ -f "$PIDFILE" ]; then
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   144
      PID=`cat "$PIDFILE"`
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   145
      if [ "$PID" -gt 1 ]; then
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   146
        kill -TERM $PID
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   147
        echo "Stopping the Mercurial service PID=$PID."
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   148
      else
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   149
        echo Bad PID for Mercurial -- \"$PID\".
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   150
        echo You may remove \"$PIDFILE\" manually.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   151
      fi
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   152
    else
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   153
      echo No PID file recorded for mercurial.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   154
    fi
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   155
    ;;
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
    echo "$0 {start|stop}"
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   158
    exit 1
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   159
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   160
  esac
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
  http://mercurial.selenic.com/wiki/hgserve
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   163
294
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   164
* Manage patches with MQ.
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   165
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   166
First enable MQ, add following to your ~/.hgrc:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   167
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   168
  [extensions]
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   169
  hgext.mq =
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   170
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   171
Second get unpatched sources and put it to hg repository:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   172
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   173
  $ tar zxf proj-x.y.z.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   174
  $ mv proj-x.y.z proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   175
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   176
  $ hg init
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   177
  $ hg ci -m "Added x.y.z version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   178
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   179
Init MQ and take name for first patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   180
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   181
  $ hg qinit
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   182
  $ hg qnew first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   183
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   184
Next make changes by editing source and save it to patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   185
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   186
  $ $EDITOR file.c
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   187
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   188
  $ hg diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   189
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   190
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   191
  $ hg diff      # <-- have zero diff
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
You can make second patch by applying existing one:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   194
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   195
  $ hg qnew second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   196
  $ patch -p1 <bugfix.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   197
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   198
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   199
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
   200
qpop/qpush command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   201
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   202
  $ hg qseries   # <-- what patches have
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   203
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   204
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   205
  $ hg qapplied  # <-- what patches applied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   206
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   207
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   208
  $ hg qpop
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   209
  $ hg qseries
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   210
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   211
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   212
  $ hg qapplied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   213
  first.patch
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
You can revert or apply all patches by single command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   216
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   217
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   218
  $ hg qpush -a
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
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
   221
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   222
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   223
  $ hg qdelete first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   224
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   225
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
   226
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
   227
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   228
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   229
  $ rm *       # .hg dir not deleted because its name start with dot
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   230
  $ cd ..
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   231
  $ tar zxf proj-a.b.c.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   232
  $ cp -R proj-a.b.c/* proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   233
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   234
  $ hg addremove -s 70
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   235
  $ hg ci -m "Added a.b.c version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   236
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   237
295
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   238
To apply series of already done patches use:
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   239
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   240
  $ ls /path/to/bugfixes/*.patch | xargs hg qimport
425
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   241
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   242
* Proxy.
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   243
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   244
  $ hg clone --config http_proxy.host=$host:$port \
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   245
    --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
   246
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   247
* Free Mercurial hosting.
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   248
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   249
  http://mercurial.selenic.com/wiki/MercurialHosting
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   250
                Free Hosting of Mercurial Repositories