Commit Graph

420 Commits

Author SHA1 Message Date
Martin Geisler
48349e3ff0 Merge with crew-stable 2009-10-16 00:45:18 +02:00
Benoit Allard
f444222eca mq: fix traceback for qpush inexistant-patch with no patch applied 2009-10-16 00:09:18 +02:00
Stephen Rasku
15c682540c mq: changed help for qpop -f to reflect actual behaviour 2009-10-14 21:21:09 -07:00
Martin Geisler
9f1896c083 do not attempt to translate ui.debug output 2009-09-19 01:15:38 +02:00
Matt Mackall
921ef4d657 Merge qprev/qnext backout 2009-09-14 17:29:47 -05:00
Matt Mackall
77949f88d1 Backed out premature qprev/qnext removal 2009-09-14 16:39:24 -05:00
Thomas Arendsen Hein
9df07442ce Add new flag [-1] to synopsis of qapplied/qunapplied 2009-09-11 16:58:19 +02:00
Dirkjan Ochtman
4fc1177ba0 mq: get rid of qnext, qprev and qtop 2009-08-19 12:51:07 +02:00
Dirkjan Ochtman
d825977cb1 mq: add options to qapplied/qunapplied to act like qprev/qnext 2009-08-19 12:50:46 +02:00
Martin Geisler
476e39b88f mq: don't mention qtop in module doc string
(qtop was removed in 5b1bcf3885fe)
2009-08-21 16:58:30 +02:00
David Soria Parra
7af1039389 mq: Parse commit message after we find start of changeset patch
patch.extract extracts just the message below HG changeset patch. So to not
parse comments above the patch, we reset the message if we find a changeset
patch as we know the commit message comes after the changeset patch data.
This is similar to the behavior of patch.extract.

The drawback of this approach, after a qref -e the comment above HG changeset
patch is gone. Without this patch the message would become part of the commit
message in the HG changset patch part.
2009-07-28 15:36:28 +02:00
Yann E. MORIN
e5e948735c mq: re-phrase the qrefresh help about the user and date options 2009-08-12 10:57:18 +02:00
Yann E. MORIN
b58fccf06d mq: add the date with qrefresh, even if missing (issue1768)
When setting the date with qrefresh (-d|-D), and the patch does have
neither a 'Date:' nor a '# Date' header, add the date field as such:

- if the patch has a 'From:' header, add a 'Date:' header
- otherwise, upgrade to Mercurial extended patch format and add '# Date'
2009-08-12 10:57:27 +02:00
Yann E. MORIN
ac0ee93ebf mq: upgrade the patch to HG format when adding the author name with qrefresh
When setting the author field with qrefresh (-u|-U), and the patch does have
neither a 'From:' nor a '# User' header, add the author name as such:

- if the patch has a 'Date:' header, add a 'From:' header
- otherwise, upgrade to Mercurial extended patch format and add # From
2009-08-12 10:48:18 +02:00
Yann E. MORIN
171901b514 mq: add function to check if a header exists in a patch 2009-08-12 10:46:16 +02:00
Yann E. MORIN
95c7683f34 mq: fix coding style in qrefresh 2009-08-12 10:46:03 +02:00
Martin Geisler
d1c63312f6 Merge with crew-stable 2009-08-01 00:36:22 +02:00
Martin Geisler
827c92ac3e mq: wrap docstrings at 70 characters 2009-07-26 01:53:49 +02:00
Martin Geisler
ae0794fd45 coding style: use a space after comma
I left a cases like 'lambda x,y:' alone -- the lack of a space does
not bother me as much when the variables are single letters.
2009-07-22 23:12:54 +02:00
Brendan Cully
09920a4acd Merge with hg 2009-07-16 21:05:24 -07:00
Martin Geisler
3951831e0b commands: use minirst parser when displaying help 2009-07-16 23:25:26 +02:00
Greg Ward
b0c72fe36d localrepo: factor _findtags() out of tags() (issue548).
This makes in-memory caching the sole responsibility of localrepo,
eliminating some localrepo code that was duplicated in mq and
bookmarks.
2009-07-16 10:39:41 -04:00
Martin Geisler
88a6656cb1 mq: use ui.status when pushing and popping patches 2009-07-10 23:24:35 +02:00
Mads Kiilerich
b3ac6d2456 mq: qpop now tells which patches are popped
When navigating through a patch series by qpushing and qpopping it was easy to
get lost because qpop was silent. I found myself often running qnext after qpop
to see which patch I just dropped - especially if I was about to qrm it. This
patch makes qpop more symmetric to qpush by showing which patches are
applied/"unapplied".

I think it is a good change even though it changes output by adding a new line
of output.
2009-07-09 23:59:03 +02:00
Martin Geisler
3571ef287c mq: wrapped docstrings at 78 characters 2009-07-07 23:54:42 +02:00
Alejandro Santos
1ef2fb42a7 compat: use 'key' argument instead of 'cmp' when sorting a list 2009-07-05 11:02:00 +02:00
Dan Villiom Podlaski Christiansen
1d4adbe287 mq: align columns in verbose qseries output. 2009-06-27 15:28:44 +02:00
Martin Geisler
d8c14d7c74 mq: standardize qfinish cmdline help string 2009-06-27 12:13:40 +02:00
Dirkjan Ochtman
1c6c4a9bc7 extensions: fix up description lines some more 2009-06-24 12:25:56 +02:00
Dirkjan Ochtman
501eaa4cfb mq: compact & rewrap documentation for qdelete command 2009-06-24 12:03:13 +02:00
Cédric Duval
8a280aa6dc mq: no longer mention the deprecated qdelete's --revision option
The option will no longer show up in the list, unless --verbose is used.

'qdel -r' has been deprecated in favor of qfinish since the 1.1 release.
It is still fully functional, but new users need not learn about it.
2009-06-23 22:20:25 +02:00
Cédric Duval
dbcec5595d extensions: improve the consistency of synopses
Trying as much as possible to consistently:
 - use a present tense predicate followed by a direct object
 - verb referring directly to the functionality provided
   (ie. not "add command that does this" but simple "do that")
 - keep simple and to the point, leaving details for the long help
   (width is tight, possibly even more so for translations)

Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom
Podlaski Christiansen and others for the helpful suggestions.
2009-06-22 15:48:08 +02:00
Dirkjan Ochtman
9685cd7ac9 mq: fix error message for qpush inexistent-patch (issue1702) 2009-06-21 17:34:33 +02:00
Dirkjan Ochtman
12ed4dc982 mq: unify code for qdel -r and qfin 2009-06-19 13:58:22 +02:00
Dirkjan Ochtman
d6eb9e3f55 mq: warn about finalizing patches without cset message 2009-06-19 12:37:29 +02:00
Patrick Mezard
7039de96dc Make mq, record and transplant honor patch.eol 2009-06-15 00:03:27 +02:00
Adrian Buehlmann
d4fe84d762 mq: eliminate warning on qpush with empty series
Warning was "DeprecationWarning: use lock.release instead of del lock"
2009-06-08 20:02:44 +02:00
Benoit Boissinot
125a85ec87 use new style classes 2009-06-10 15:10:21 +02:00
timeless
fb33de67af Generally replace "file name" with "filename" in help and comments. 2009-06-09 09:25:17 -04:00
timeless
3ccbc308d0 Spell Mercurial as a proper noun 2009-06-09 09:25:31 -04:00
Matt Mackall
19bea6fdda mq: fix commit prototype 2009-06-03 17:07:41 -05:00
Matt Mackall
c1213eaf9d commit: drop the now-unused files parameter 2009-06-01 14:11:32 -05:00
Matt Mackall
e12da484f7 mq: drop unneeded files args for commit 2009-06-01 13:51:21 -05:00
Cédric Duval
dc685aa920 mq: rename setheader to updateheader and fix comment 2009-05-30 19:37:01 +02:00
Cédric Duval
ee45037723 mq: initializing patchheader class directly from patch content
The patch header needs only be read in order to instantiate the class,
and as such it makes more sense to do it within the class.
2009-05-30 19:18:29 +02:00
Martin Geisler
5b4e5428df replace "i in range(len(xs))" with "i, x in enumerate(xs)"
The remaining occurrences should be the ones where "xs" is mutated or
where "i" is used for index arithmetic.
2009-05-26 22:59:52 +02:00
Martin Geisler
4176f5b789 replace xrange(0, n) with xrange(n) 2009-05-25 23:06:11 +02:00
Martin Geisler
0a365d5ca2 use 'x is None' instead of 'x == None'
The built-in None object is a singleton and it is therefore safe to
compare memory addresses with is. It is also faster, how much depends
on the object being compared. For a simple type like str I get:

            | s = "foo" | s = None
  ----------+-----------+----------
  s == None | 0.25 usec | 0.21 usec
  s is None | 0.17 usec | 0.17 usec
2009-05-20 00:52:46 +02:00
Simon Heimberg
478d2c2e22 mq: new method invalidate
Introduce method invalidate (similar to dirstate and repo).
2009-05-05 10:29:34 +02:00
Simon Heimberg
ed59692bba mq: only read files when needed
use util.propertycache as in dirstate
2009-05-04 03:35:42 +02:00