Commit Graph

93 Commits

Author SHA1 Message Date
Dan Villiom Podlaski Christiansen
d5e8634932 qseries: don't truncate the patch name (issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
2009-11-17 22:16:41 +01:00
Brendan Cully
1ce45ec1c3 Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
2009-11-16 11:31:08 -08:00
Dirkjan Ochtman
91d7a1e376 help: don't show extension list on extension help 2009-11-12 13:43:36 +01:00
Adrian Buehlmann
a482b04850 hg.clone: report branch name on update 2009-10-16 23:57:34 +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
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
Martin Geisler
4986571bd9 help: use field lists for lists of extensions 2009-08-03 00:01:50 +02:00
Martin Geisler
65b64640d1 minirst: indent literal blocks with two spaces
The vast majority* of them are formatted like this in the source, so
this basically reverts the output to how it looked before we got the
minirst parser.

*: the help on templating use four spaces for some examples and will
   now shown with an indentation of just two spaces.
2009-08-02 17:17:17 +02:00
Greg Ward
da8b780a58 tags: support 'instant' tag retrieval (issue548)
- modify _readtagcache() and _writetagcache() to read/write tag->node
  mapping for global tags
- if (and only if) tip unchanged, use that cached mapping to avoid
  reading any revisions of .hgtags
- change so tag names are UTF-8 in memory in tags.py, and converted to
  local encoding as late as possible (in localrepository._findtags())
2009-07-16 10:41:19 -04:00
Greg Ward
81e6782a86 tags: implement persistent tag caching (issue548).
- rename findglobaltags() to findglobaltags1() (so the "no cache"
  implementation is still there if we need it)
- add findglobaltags2() and make findglobaltags() an alias for it
  (disabling tag caching is a one-line patch)
- factor out tagcache class with methods readcache() and writecache();
  the expensive part of tag finding (iterate over heads and find
  .hgtags filenode) is now in tagcache.readcache()
2009-07-16 10:39:42 -04: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
Dirkjan Ochtman
1c6c4a9bc7 extensions: fix up description lines some more 2009-06-24 12:25:56 +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
Benoit Boissinot
fc43ae9519 update --clean: do not unlink added files (issue575) 2009-05-19 03:59:58 +02:00
Dirkjan Ochtman
1e9b20dc8f mq: qpush shouldn't complain if working dir is at a non-tip head 2009-05-15 15:21:17 +02:00
Martin Geisler
42fa3800bd expand "rev" to "revision" in help texts 2009-04-07 23:06:50 +02:00
Martin Geisler
04b0d911a3 Change double spaces to single spaces in help texts. 2009-04-04 21:09:43 +02:00
Matt Mackall
1a2d87e4e1 mq: handle empty patches more gracefully (issue1501) 2009-02-16 17:37:23 -06:00
Martin Geisler
dc4fd3bf46 mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
2009-01-03 17:15:21 +01:00
Dirkjan Ochtman
aabce1d60c mq: allow qpop if popped revisions are not working dir parents 2009-01-12 09:07:02 +01:00
Martin Geisler
23608038bf lowercase help output
Changes docstrings to begin with a lowercase word. Only docstrings
used in help output is changed.

Scripts are not expected to grep the output of 'hg help' so this
change should pose no problem with regard to the compatibility rules.
2009-01-03 17:15:15 +01:00
Brendan Cully
63fa2faa43 mq: gracefully abort qpush/qgoto to guarded patch (issue1186) 2008-11-23 00:44:31 -08:00
Brendan Cully
636630e1d2 mq: put qnew tests into own file, fold in qnew-twice 2008-10-30 12:31:24 -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
203e3723e8 Prevent import over an applied patch (closes issue795) 2008-10-18 13:22:29 -07:00
Dirkjan Ochtman
fc7fc528ad show enabled extensions in hg help 2008-10-18 16:50:03 +02:00
Benoit Boissinot
66c79ea6b0 merge with -stable 2008-09-22 14:47:21 +02:00
Mads Kiilerich
b80093e190 tests: fix reported patch tool name in test-mq
Strip any path of the patch executable, which it might return on failure.
2008-09-18 13:45:36 +02:00
Martin Geisler
897f1ddab8 i18n: avoid naive plural tricks 2008-08-31 16:12:02 +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
Patrick Mezard
ae8e8e5874 test-mq: update qdiff summary output 2008-05-18 20:54: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
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
49ab85e83f Merge with crew-stable 2008-05-18 23:49:33 +02:00
Matt Mackall
fb88571d19 match: remove files arg from repo.status and friends 2008-05-12 11:37:08 -05:00
Dirkjan Ochtman
f70807073f merge from crew-stable 2008-04-16 16:07:15 +02:00
Dirkjan Ochtman
ea3191d104 mq: add --force option to strip 2008-04-04 17:44:31 +02:00
Matt Mackall
dc1cdafff7 mq: warn when applying a patch to somewhere other than tip 2008-03-21 15:44:11 -05:00
Adrian Buehlmann
153675561e clone: print "updating working directory" status message
With this change, "hg clone" looks like this:

% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved

So the user sees

% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory

while Mercurial is writing to disk to populate the working directory

With this change, "hg clone" looks like this:

% hg clone big big-work
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 14:52:24 +01:00
Dirkjan Ochtman
3e3b0d62eb warn about new heads on commit (issue842) 2008-03-21 11:06:02 +01:00
Patrick Mezard
107a228e2f patch: check filename is /dev/null for creation or deletion (issue 1033)
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
2008-03-16 00:35:12 +01:00
Alexis S. L. Carvalho
8b9b7ae9bd Merge with crew-stable 2008-02-08 18:31:55 -02:00
Alexis S. L. Carvalho
0a6e6532aa qinit -c: add ^\.hg and ^\.mq to .hgignore 2008-02-08 18:07:55 -02:00
Alexis S. L. Carvalho
56322c7a24 mq: don't allow patches with some reserved names
The current list of reserved names includes only mq control files.

Also, reserve names starting with ".hg" (to avoid troubles with
e.g. .hgignore and .hgtags), and with ".mq" (to allow future
extensions).

This should fix issue841.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
d4fc1890f0 mqrepo: don't abort if the status file has an unknown node 2008-02-03 21:03:46 -02:00