hg.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Fri, 26 Feb 2010 23:54:32 +0200
changeset 313 7cc6dcfa284e
parent 312 f2fafacd39e6
child 425 8b7a3f47dac1
permissions -rw-r--r--
Useful customization.
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
313
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
     5
Put to your ~/.hgrc:
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
     6
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
     7
  [ui]
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
     8
  ; Editor for editing commit message.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
     9
  editor = gvim
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    10
  ; Who commit.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    11
  username = Oleksandr Gavenko <gavenkoa@gmail.com>
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    12
  ; Use internal merge algorithm, which mark conflict like <<<<<< ====== >>>>>>.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    13
  ; 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
    14
  ; resolved by running 'hg resolve -m <file>'.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    15
  merge = internal:merge
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    16
  [web]
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    17
  ; Default encoding for file hosted by 'hg serv'.
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    18
  encoding = utf-8
7cc6dcfa284e Useful customization.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 312
diff changeset
    19
312
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    20
** Useful extension.
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    21
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    22
Put to your ~/.hgrc:
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    23
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    24
  [extensions]
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    25
  ; To allow fetch command.
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    26
  fetch =
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    27
  ; To allow Mercurial Queues.
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    28
  hgext.mq =
f2fafacd39e6 Useful extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 311
diff changeset
    29
310
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    30
** Multiline log message for log command.
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    31
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    32
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
    33
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    34
  $ hg log -v
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    35
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    36
or put into ~/.hgrc:
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    37
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    38
  [defaults]
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    39
  log = -v
4af75f7ab947 Multiline log message for log command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 295
diff changeset
    40
311
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    41
** Follow history ever when file copied.
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    42
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    43
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
    44
before copying run:
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    45
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    46
  $ hg log -f
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
or put into ~/.hgrc:
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    49
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    50
  [defaults]
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    51
  log = -f
e3d3fd4c128b Follow history ever when file copied.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 310
diff changeset
    52
294
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    53
* Manage patches with MQ.
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    54
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    55
First enable MQ, add following to your ~/.hgrc:
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
  [extensions]
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    58
  hgext.mq =
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    59
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    60
Second get unpatched sources and put it to hg repository:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    61
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    62
  $ tar zxf proj-x.y.z.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    63
  $ mv proj-x.y.z proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    64
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    65
  $ hg init
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    66
  $ hg ci -m "Added x.y.z version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    67
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    68
Init MQ and take name for first patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    69
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    70
  $ hg qinit
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    71
  $ hg qnew first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    72
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    73
Next make changes by editing source and save it to patch:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    74
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    75
  $ $EDITOR file.c
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    76
  ...
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    77
  $ hg diff
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
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    80
  $ hg diff      # <-- have zero diff
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    81
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    82
You can make second patch by applying existing one:
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
  $ hg qnew second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    85
  $ patch -p1 <bugfix.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    86
  $ hg qrefresh
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    87
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    88
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
    89
qpop/qpush command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    90
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    91
  $ hg qseries   # <-- what patches have
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    92
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    93
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    94
  $ hg qapplied  # <-- what patches applied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    95
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    96
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    97
  $ hg qpop
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    98
  $ hg qseries
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    99
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   100
  second.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   101
  $ hg qapplied
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   102
  first.patch
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   103
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   104
You can revert or apply all patches by single command:
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   105
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   106
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   107
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   108
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   109
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
   110
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   111
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   112
  $ hg qdelete first.patch
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
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
   115
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
   116
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   117
  $ hg qpop -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   118
  $ rm *       # .hg dir not deleted because its name start with dot
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   119
  $ cd ..
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   120
  $ tar zxf proj-a.b.c.tar.gz
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   121
  $ cp -R proj-a.b.c/* proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   122
  $ cd proj
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   123
  $ hg addremove -s 70
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   124
  $ hg ci -m "Added a.b.c version of proj."
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   125
  $ hg qpush -a
07d8d2e527df Manage patches with MQ.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
   126
295
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   127
To apply series of already done patches use:
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   128
d3f8534dadf9 Applying series of patches.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 294
diff changeset
   129
  $ ls /path/to/bugfixes/*.patch | xargs hg qimport