Matt Mackall
e564d351f3
extensions: use new wrapper functions
2008-10-22 17:34:52 -05:00
Matt Mackall
bebeb261d5
findcmd: have dispatch look up strict flag
2008-10-22 17:34:08 -05:00
Dirkjan Ochtman
f5ea74b223
clean up trailing spaces, leading spaces in C
2008-10-20 14:57:04 +02:00
Mads Kiilerich
905ce16584
mq: Fix --qrefresh --short to work with --exclude and --include
...
pmezard expects
hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before c302ef4372b2. That change seemed sensible, but it
wasn't...
mpm says
(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
(17:22:54) pmezard_: kiilerix1: and --include too
(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch
This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.
2008-10-19 16:31:24 +02:00
Brendan Cully
428ac5338a
mq: heavy rearrangement of qnew to make it recover reliably from errors.
...
Closes issue1269.
2008-10-18 21:52:22 -07:00
Brendan Cully
c935fe6e01
mq: abort qnew -f if any file in an explicit list cannot be read
2008-10-18 20:45:53 -07:00
Brendan Cully
eeb6237595
mq: make qimport -f work properly. Closes issue1255.
...
From Bernhard Leiner.
2008-10-18 17:29:45 -07:00
Brendan Cully
08cb02aa5a
mq: let qimport read patches from URLs
2008-10-18 16:40:01 -07:00
Brendan Cully
cc98fdf26c
mq: do not invoke editor until just before patch creation. Closes issue1346.
2008-10-18 16:33:10 -07:00
Brendan Cully
203e3723e8
Prevent import over an applied patch (closes issue795)
2008-10-18 13:22:29 -07:00
Mads Kiilerich
552c248fa5
mq: Allow qrefresh --silent to take parameters
...
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.
This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.
FIXME: Why do mq refresh have two matchers if we only need one?
2008-10-17 21:26:39 +02:00
Martin Geisler
ce59efd5c2
i18n, mq: mark command line options for translation
2008-09-06 17:44:03 +02:00
Martin Geisler
7b25ee5700
i18n: mark strings for translation in mq extension
2008-08-31 16:12:03 +02:00
Martin Geisler
73f6ec8db1
qimport: report filename in case of IOError
...
The old behaviour was to say "abort: unable to read" since the
patchname variable was always None.
2008-08-26 00:04:18 +02:00
Martin Geisler
5a059d9863
qfinish: document --applied instead of --all
2008-08-25 01:26:08 +02:00
Dirkjan Ochtman
b2e25d7f06
merge with crew-stable
2008-08-20 11:09:53 +02:00
Peter Arrenbrecht
889ece79c4
mq: fix docs for qrefresh -D (issue1234)
2008-08-20 10:30:53 +02:00
Patrick Mezard
42c2e73f4f
mq: fix qrefresh losing copy information (issue 1134)
2008-07-07 09:16:09 +02:00
Weijun Wang
e8e489c8fa
mq: handle added patch renaming correctly
2008-06-06 18:23:31 +02:00
Dirkjan Ochtman
ff7fe64e1f
mq: don't update the working copy on strip if parents aren't stripped
...
* * *
2008-06-03 12:10:14 +02:00
Adrian Buehlmann
e5236a2fe5
mq: qimport: explain insertion point in doc string
2008-06-03 09:31:36 +02:00
teki321@gmail.com
c3b9e36959
mq: qpush -n fix
2008-05-08 14:02:42 +10:00
Dirkjan Ochtman
5df4fbf180
mq: lose the trailing whitespace
2008-05-22 13:28:34 +02:00
Dirkjan Ochtman
b5e8a11a67
mq: add correct documentation for qpop
2008-05-19 10:22:15 +02:00
Dirkjan Ochtman
0ff45b15b7
Backed out changeset ea75f74dfd4f (fixes wrong documentation)
2008-05-19 10:19:59 +02:00
Jeff Walden
9f966af0c3
Slight improvement to qpop arguments help
2008-05-19 03:52:26 -04:00
Patrick Mezard
77b17b8e99
mq: make qselect fail properly on an empty guard
2008-05-18 17:01:24 +02:00
Dirkjan Ochtman
d221e641d5
mq: expand help text for qdiff
...
Thanks to Waldo for thinking about this and formulating some text.
2008-05-17 09:11:14 +02:00
Jason Orendorff
661f6f86d7
mq: fix qdiff -U (it apparently never really worked)
2008-04-18 17:25:10 +02:00
Dirkjan Ochtman
7863711fa6
mq: don't commit local changes on pushing empty patch (issue1087)
2008-04-16 16:04:07 +02:00
Dirkjan Ochtman
06d8e99e57
remove trailing spaces
2008-04-16 12:09:16 +02:00
Dirkjan Ochtman
f6315d4d81
mq: add a little documentation on qpush -f
2008-04-16 09:35:43 +02:00
Patrick Mezard
9cb9c8c81f
Merge with crew-stable
2008-07-07 09:31:32 +02:00
Matt Mackall
a65ef7bc5d
util: add sort helper
2008-06-27 18:28:45 -05:00
Matt Mackall
d4ab55a92b
status: clean up all users for unknown files
2008-06-27 13:43:29 -05:00
Matt Mackall
bc715be859
add __len__ and __iter__ methods to repo and revlog
2008-06-26 14:35:50 -05:00
Matt Mackall
fbb5127472
use repo[changeid] to get a changectx
2008-06-26 14:35:46 -05:00
Jason Orendorff
1b4f863a3f
mq: qdiff: support all diffopts
2008-06-12 07:38:15 -05:00
Patrick Mezard
e8f9e548cb
Merge with crew-stable
2008-06-06 18:31:57 +02:00
Dirkjan Ochtman
466179d35f
mq: introduce the qfinish command
2008-06-03 09:34:14 +02:00
Dirkjan Ochtman
2cac185fe4
merge from crew-stable
2008-06-03 12:27:48 +02:00
Patrick Mezard
1c417db0b5
Merge with crew-stable
2008-05-24 18:23:13 +02:00
Dirkjan Ochtman
73d767a6a2
merge from crew-stable
2008-05-22 13:29:47 +02:00
Dirkjan Ochtman
69ef26e75a
merge from crew-stable
2008-05-19 10:23:47 +02:00
Dirkjan Ochtman
be3d22505e
merge from crew-stable
2008-05-19 10:02:28 +02:00
Patrick Mezard
49ab85e83f
Merge with crew-stable
2008-05-18 23:49:33 +02:00
Dirkjan Ochtman
184d4d6d16
merge from crew-stable
2008-05-17 09:12:49 +02:00
Matt Mackall
fb88571d19
match: remove files arg from repo.status and friends
2008-05-12 11:37:08 -05:00
Matt Mackall
081e89551b
match: remove files argument from patch.diff
2008-05-12 11:37:08 -05:00
Matt Mackall
5213203b64
match: use match.files() for patch.diff
2008-05-12 11:37:08 -05:00
