hg.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Tue, 23 Feb 2010 21:07:45 +0200
changeset 306 2fc238f4a157
parent 295 d3f8534dadf9
child 310 4af75f7ab947
permissions -rw-r--r--
About lpi.
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
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     3
* Manage patches with MQ.
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     4
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     5
First enable MQ, add following to your ~/.hgrc:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     6
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     7
  [extensions]
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     8
  hgext.mq =
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     9
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    10
Second get unpatched sources and put it to hg repository:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    11
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    12
  $ tar zxf proj-x.y.z.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    13
  $ mv proj-x.y.z proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    14
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    15
  $ hg init
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    16
  $ hg ci -m "Added x.y.z version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    17
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    18
Init MQ and take name for first patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    19
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    20
  $ hg qinit
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    21
  $ hg qnew first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    22
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    23
Next make changes by editing source and save it to patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    24
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    25
  $ $EDITOR file.c
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    26
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    27
  $ hg diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    28
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    29
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    30
  $ hg diff      # <-- have zero diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    31
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    32
You can make second patch by applying existing one:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    33
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    34
  $ hg qnew second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    35
  $ patch -p1 <bugfix.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    36
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    37
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    38
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
    39
qpop/qpush command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    40
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    41
  $ hg qseries   # <-- what patches have
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    42
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    43
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    44
  $ hg qapplied  # <-- what patches applied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    45
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    46
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    47
  $ hg qpop
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    48
  $ hg qseries
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    49
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    50
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    51
  $ hg qapplied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    52
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    53
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    54
You can revert or apply all patches by single command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    55
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    56
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    57
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    58
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    59
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
    60
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    61
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    62
  $ hg qdelete first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    63
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    64
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
    65
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
    66
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    67
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    68
  $ rm *       # .hg dir not deleted because its name start with dot
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    69
  $ cd ..
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    70
  $ tar zxf proj-a.b.c.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    71
  $ cp -R proj-a.b.c/* proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    72
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    73
  $ hg addremove -s 70
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    74
  $ hg ci -m "Added a.b.c version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    75
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    76
295
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
    77
To apply series of already done patches use:
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
    78
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
    79
  $ ls /path/to/bugfixes/*.patch | xargs hg qimport