hg.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Fri, 26 Feb 2010 23:45:14 +0200
changeset 311 e3d3fd4c128b
parent 310 4af75f7ab947
child 312 f2fafacd39e6
permissions -rw-r--r--
Follow history ever when file copied.
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
310
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     3
* Useful customization.
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     4
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     5
** Multiline log message for log command.
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     6
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     7
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
     8
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
     9
  $ hg log -v
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    10
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    11
or put into ~/.hgrc:
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    12
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    13
  [defaults]
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    14
  log = -v
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    15
311
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    16
** Follow history ever when file copied.
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    17
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    18
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
    19
before copying run:
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    20
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    21
  $ hg log -f
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    22
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    23
or put into ~/.hgrc:
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    24
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    25
  [defaults]
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    26
  log = -f
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    27
294
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    28
* Manage patches with MQ.
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    29
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    30
First enable MQ, add following to your ~/.hgrc:
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
  [extensions]
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    33
  hgext.mq =
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    34
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    35
Second get unpatched sources and put it to hg repository:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    36
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    37
  $ tar zxf proj-x.y.z.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    38
  $ mv proj-x.y.z proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    39
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    40
  $ hg init
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    41
  $ hg ci -m "Added x.y.z version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    42
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    43
Init MQ and take name for first patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    44
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    45
  $ hg qinit
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    46
  $ hg qnew first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    47
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    48
Next make changes by editing source and save it to patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    49
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    50
  $ $EDITOR file.c
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    51
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    52
  $ hg diff
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
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    55
  $ hg diff      # <-- have zero diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    56
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    57
You can make second patch by applying existing one:
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
  $ hg qnew second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    60
  $ patch -p1 <bugfix.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    61
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    62
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    63
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
    64
qpop/qpush command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    65
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    66
  $ hg qseries   # <-- what patches have
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    67
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    68
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    69
  $ hg qapplied  # <-- what patches applied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    70
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    71
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    72
  $ hg qpop
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    73
  $ hg qseries
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    74
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    75
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    76
  $ hg qapplied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    77
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    78
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    79
You can revert or apply all patches by single command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    80
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    81
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    82
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    83
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    84
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
    85
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    86
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    87
  $ hg qdelete first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    88
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    89
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
    90
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
    91
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    92
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    93
  $ rm *       # .hg dir not deleted because its name start with dot
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    94
  $ cd ..
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    95
  $ tar zxf proj-a.b.c.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    96
  $ cp -R proj-a.b.c/* proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    97
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    98
  $ hg addremove -s 70
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    99
  $ hg ci -m "Added a.b.c version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   100
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   101
295
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   102
To apply series of already done patches use:
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   103
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   104
  $ ls /path/to/bugfixes/*.patch | xargs hg qimport