hg.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Sun, 07 Nov 2010 23:17:10 +0200
changeset 675 47d4ad70738f
parent 674 6429d14cfc2a
child 676 e7632a1fdeca
permissions -rw-r--r--
init.d script.
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
674
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
    58
* Publishing config.
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
    59
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
    60
  http://mercurial.selenic.com/wiki/PublishingRepositories
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
    61
                Publishing Mercurial Repositories
6429d14cfc2a Some Projects that Use Mercurial
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 673
diff changeset
    62
675
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    63
* Publish repos.
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
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
    66
.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
    67
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    68
  $ hg clone http://example.com/project
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    69
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    70
  http://mercurial.selenic.com/wiki/hgserve
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    71
  http://mercurial.selenic.com/wiki/StaticHTTP
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    72
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    73
** init.d script.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    74
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    75
  #!/bin/sh
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    76
  CMD=/usr/bin/hg
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    77
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    78
  PORT=7878
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    79
  SRC=/srv/hg
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    80
  CONGIG=/srv/hg/hgweb.config
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    81
  PIDFILE=/var/run/hg.pid
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
  case "$1" in
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    84
  start)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    85
    echo "Mecurial Server service starting."
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    86
    (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE")
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
  stop)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    89
    if [ -f "$PIDFILE" ]; then
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    90
      PID=`cat "$PIDFILE"`
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    91
      if [ "$PID" -gt 1 ]; then
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    92
        kill -TERM $PID
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    93
        echo "Stopping the Mercurial service PID=$PID."
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    94
      else
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    95
        echo Bad PID for Mercurial -- \"$PID\".
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    96
        echo You may remove \"$PIDFILE\" manually.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    97
      fi
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    98
    else
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
    99
      echo No PID file recorded for mercurial.
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   100
    fi
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   101
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   102
  *)
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   103
    echo "$0 {start|stop}"
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   104
    exit 1
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   105
    ;;
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   106
  esac
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   107
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   108
  http://mercurial.selenic.com/wiki/hgserve
47d4ad70738f init.d script.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 674
diff changeset
   109
294
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   110
* Manage patches with MQ.
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   111
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   112
First enable MQ, add following to your ~/.hgrc:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   113
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   114
  [extensions]
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   115
  hgext.mq =
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   116
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   117
Second get unpatched sources and put it to hg repository:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   118
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   119
  $ tar zxf proj-x.y.z.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   120
  $ mv proj-x.y.z proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   121
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   122
  $ hg init
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   123
  $ hg ci -m "Added x.y.z version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   124
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   125
Init MQ and take name for first patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   126
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   127
  $ hg qinit
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   128
  $ hg qnew first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   129
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   130
Next make changes by editing source and save it to patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   131
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   132
  $ $EDITOR file.c
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   133
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   134
  $ hg diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   135
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   136
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   137
  $ hg diff      # <-- have zero diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   138
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   139
You can make second patch by applying existing one:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   140
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   141
  $ hg qnew second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   142
  $ patch -p1 <bugfix.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   143
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   144
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   145
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
   146
qpop/qpush command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   147
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   148
  $ hg qseries   # <-- what patches have
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   149
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   150
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   151
  $ hg qapplied  # <-- what patches applied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   152
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   153
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   154
  $ hg qpop
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   155
  $ hg qseries
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   156
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   157
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   158
  $ hg qapplied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   159
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   160
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   161
You can revert or apply all patches by single command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   162
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   163
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   164
  $ hg qpush -a
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
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
   167
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   168
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   169
  $ hg qdelete first.patch
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
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
   172
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
   173
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   174
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   175
  $ rm *       # .hg dir not deleted because its name start with dot
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   176
  $ cd ..
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   177
  $ tar zxf proj-a.b.c.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   178
  $ cp -R proj-a.b.c/* proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   179
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   180
  $ hg addremove -s 70
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   181
  $ hg ci -m "Added a.b.c version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   182
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   183
295
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   184
To apply series of already done patches use:
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   185
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   186
  $ ls /path/to/bugfixes/*.patch | xargs hg qimport
425
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   187
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   188
* Proxy.
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   189
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   190
  $ hg clone --config http_proxy.host=$host:$port \
8b7a3f47dac1 Proxy settings for hg.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 313
diff changeset
   191
    --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
   192
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   193
* Free Mercurial hosting.
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   194
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   195
  http://mercurial.selenic.com/wiki/MercurialHosting
faa365425ff0 Free Mercurial hosting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 425
diff changeset
   196
                Free Hosting of Mercurial Repositories