.hgignore
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
Mon, 30 Jun 2014 13:29:49 -0400
changeset 996 b98dd5d3065c
parent 557 41688ca951e7
child 1643 a7bad80b7700
child 1674 854421a48e0c
permissions -rw-r--r--
fold: overhaul handling of revisions with --rev (BC) The fold command parsed the revision arguments in a very peculiar and idiosyncratic fashion: if revisions were passed without a --rev argument, then they would all be extended to ".", but if they were passed with --rev, then no extension would happen. Passing revisions both with and without --rev would abort. This is inconsistent with the way all other hg commands parse revision arguments. We have several examples of command where several revisions are passed, and the --rev option is optional for specifying those revisions (update, strip, export). This patch alters the way in which fold parses its revision arguments. No distinction is made between revisions passed with or without the --rev argument. Regardless if a single or multiple revision is specified, all will be folded together into the parent of the working directory. If the --exact argument is passed, then the parent of the working directory is ignored and the specified revisions must be a single contiguous line. The docstring and tests are modified accordingly.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
149
03f314e32058 import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     1
syntax: re
03f314e32058 import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     2
/figures/[^/]+\.png$
161
4e3f25ba5401 More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 149
diff changeset
     3
^docs/build/
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents: 222
diff changeset
     4
^docs/html/
242
1fc4299ca8e2 [doc] change doc generation directory
Pierre-Yves.David@ens-lyon.org
parents: 233
diff changeset
     5
^html/
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
     6
\.pyc$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
     7
~$
391
92adb5b34a04 .hgignore: ignore vi swap files
Patrick Mezard <patrick@mezard.eu>
parents: 262
diff changeset
     8
\.swp$
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
     9
\.orig$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
    10
\.rej$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
    11
\.err$
422
cc8038e3bc23 hgignore: ignore the "common" tests/easy_run.sh file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 391
diff changeset
    12
^tests/easy_run.sh$
495
53ad6062f7cc Ignore build directory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 422
diff changeset
    13
^build/
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 495
diff changeset
    14
^MANIFEST$
526
6194f7ee85dd hgignore: ignore compiled tutorials
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 524
diff changeset
    15
^docs/tutorials/.*\.rst$
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 526
diff changeset
    16
\.ico$