Commit Graph

37 Commits

Author SHA1 Message Date
Brendan Cully
92a19d3a72 mq: fix regression in c5d80ff6828f
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
2007-09-10 15:00:05 -07:00
Patrick Mezard
55cd10d565 Test qnew --git 2007-07-28 20:15:54 +02:00
Bryan O'Sullivan
bbc8c72100 Update test output to reflect small changes in patch chattiness. 2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
3ab73cd145 mq: autodetect an existing git patch during qrefresh (issue 491) 2007-07-16 16:50:47 -07:00
Brendan Cully
98b8fae908 mq: improve qclone error handling when patch directory is not a repository. 2007-07-10 09:52:32 -07:00
Bryan O'Sullivan
fd12095b02 mq: add qgoto command. 2007-05-08 13:10:27 -07:00
Alexis S. L. Carvalho
047c4b002b Merge with crew-stable. 2007-04-07 04:45:27 -03:00
Alexis S. L. Carvalho
8e9491052e Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
This should make it easier to discover global options.

As a bonus, they are no longer displayed by something like a
hg -v help dates
2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
47cb22b5a2 Merge with crew-stable 2007-03-16 00:45:18 -03:00
Brendan Cully
c7cf8a52b7 mq: add qparent tag (first parent of qbase) 2007-03-14 10:45:18 -07:00
Brendan Cully
5641becd5a Merge with crew-stable 2007-03-10 17:45:32 -08:00
Alexis S. L. Carvalho
d3e0262e32 fix qrefresh'ing an empty patch
This is not superefficient (the commit will have to walk the whole tree),
but it works.
2007-03-10 22:03:23 -03:00
Alexis S. L. Carvalho
86353c5094 qclone: don't call reposetup manually 2007-02-15 08:44:08 -02:00
Alexis S. L. Carvalho
5357b68523 fix strip'ping the second parent of a merge 2007-02-06 15:54:58 -02:00
Alexis S. L. Carvalho
b380c48d7c add some tests for qpush/qpop error codes 2007-02-17 04:50:06 -02:00
Alexis S. L. Carvalho
d4de823a64 merge with crew-stable 2007-02-16 05:27:37 -02:00
Alexis S. L. Carvalho
d8dc29a091 mq: qinit -c creates a repo even after a regular qinit 2007-02-09 03:48:30 -02:00
Alexis S. L. Carvalho
f6e774dd91 qrefresh: fix handling of copies in the fast path 2006-11-20 19:32:43 -02:00
Alexis S. L. Carvalho
63b6839f96 qrefresh: fix handling of added files (including copies) in the slow path 2006-11-20 19:32:42 -02:00
Alexis S. L. Carvalho
b298d93260 add --git option to qdiff 2006-11-20 19:32:40 -02:00
Alexis S. L. Carvalho
3a2243d8f7 fix qseries -v when there are unapplied patches 2006-11-19 17:01:59 -02:00
Brendan Cully
65eede0479 mq: test case for issue399 2006-10-18 10:37:34 -07:00
Brendan Cully
1931dc410c Test case for bdiff on buffer objects 2006-10-11 12:02:06 -07:00
Thomas Arendsen Hein
1cff09d393 Added tests for qpush/qpop with index. 2006-09-12 17:26:20 +02:00
Brendan Cully
b733859249 Call patch.diff directly instead of printdiff - this also saves an
extra walk of the working directory.
2006-08-29 17:08:55 -07:00
Brendan Cully
16fb95a415 Teach mq about git patches 2006-08-16 19:49:45 -07:00
Thomas Arendsen Hein
f7a86f8d81 Adjusted test to changed help output. 2006-08-15 11:47:17 +02:00
Vadim Gelfer
c21702b07b fix test output 2006-08-10 17:37:57 -07:00
Vadim Gelfer
375ed90afa mq: do not allow to push from repo with patches applied 2006-08-10 16:10:59 -07:00
Vadim Gelfer
4bb52754b3 mq: test commit in repo with patches applied 2006-08-10 15:02:18 -07:00
Vadim Gelfer
594d062505 mq: drop qversion command 2006-08-08 17:11:36 -07:00
Vadim Gelfer
3ea890331f mq: new commands qselect, qguard
implement quilt-style guards for mq.

guards allow to control whether patch can be pushed.

if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed.  if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.

use qguard to set/list guards on patches.  use qselect to set/list
active guards.

also "qseries -v" prints guarded patches with "G" now.
2006-08-08 21:42:50 -07:00
Vadim Gelfer
fb083c6317 fix mq test output. 2006-08-01 15:40:54 -07:00
Brendan Cully
7750dbbb50 New self-explanatory command qrename. 2006-08-01 10:55:06 -07:00
Brendan Cully
7e5a1a4d6a New mq command qfold: Merge patches into the current patch.
Patches should be in the series file but not yet applied.
2006-07-31 20:33:56 -07:00
Brendan Cully
af61c60015 Add command qheader to display the header of a given patch. 2006-07-31 18:39:31 -07:00
Vadim Gelfer
8bbf3c06db mq: add basic tests 2006-07-29 11:14:32 -07:00