Commit Graph

526 Commits

Author SHA1 Message Date
Henrik Stuart
ac61fc4db1 mq: fix naming issues for qqueue directories 2010-06-02 19:39:45 +02:00
Martin Geisler
4644ff1a96 mq: mention qqueue in module docstring 2010-05-30 23:24:10 +02:00
Ronny Pfannschmidt
4362059a98 make transactions work on non-refcounted python implementations 2010-05-27 17:47:40 +02:00
Henrik Stuart
9ec8c20547 mq: support multiple patch queues using qqueue 2010-05-29 20:32:39 +02:00
Martin Geisler
b457854adf mq: remove unneeded local variable in delete 2010-05-24 00:55:42 +02:00
Sune Foldager
f9f5488566 push: add --new-branch option to allow intial push of new branches
Compare this to --force which allows anything to be pushed. With --new-branch,
only changesets to named branches not present on the and changesets not
introducing additional heads on existing branches are allowed.

Developed by
  Henrik Stuart <henrik.stuart@edlund.dk>
  Sune Foldager <cryo@cyanite.org>
2010-05-21 15:22:29 +02:00
Matt Mackall
a5aceec057 strip: drop deprecated -b from synopsis 2010-05-19 20:20:16 -05:00
Martin Geisler
efb4a38a04 Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
2010-05-18 16:31:10 +02:00
Eric Eisner
21d3c16701 mq: make use of output labeling for summary 2010-05-07 16:51:45 -04:00
Martin Geisler
f93965f673 mq: mark error message for translation 2010-05-07 23:31:49 +02:00
Martin Geisler
0133c2f995 mq: mark string for translation 2010-05-07 23:28:07 +02:00
Matt Mackall
7a237857b0 mq: add a line to hg summary 2010-05-05 20:53:45 -05:00
Matt Mackall
7f6aa6252c Merge with stable 2010-05-01 15:15:35 -05:00
Faheem Mitha
5fe5a6e7b6 mq: rewrite strip docstrings
This patch is joint work with ilowe.
2010-05-01 23:04:49 +05:30
Mads Kiilerich
ee95467b21 mq: qpush --move, reorder patch series and apply only the patch
This makes it less necessary to edit .hg/patches/series manually.
2010-04-30 15:05:51 +02:00
Yuya Nishihara
e1d422d1b5 commands: refactor diff --stat and qdiff --stat
`opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.
2010-04-07 00:45:20 +09:00
Yuya Nishihara
a3e35890c8 mq: fix opts['unified'] = '0' to take effect when qdiff --stat
`opts['unified'] = '0'` tries to reduce the number of lines to be
processed by patch.diffstat, but here it does not affect diffopts,
thus it does not make sense.

Instead, we can change `diffopts.context` directly.

Added test case for qdiff --stat.
2010-04-07 00:10:54 +09:00
Martin Geisler
f1853c5e82 Use hg role in help strings 2010-04-22 10:24:49 +02:00
Matt Mackall
399ebe1c0f Merge with stable 2010-04-19 17:00:02 -05:00
Dan Villiom Podlaski Christiansen
3b0b530a9d mq: only highlight/label patch name for qseries.
Restore the behaviour introduced in 6805fe267fe5, which was
accidentally removed when labelling was introduced in af5046e50cc6.
2010-04-15 18:12:28 +02:00
Matt Mackall
e4c06cc26b mq: promote qnew, demote qinit in short help 2010-04-11 14:25:02 -05:00
Steve Borho
c7ec998a7b localrepo: add desc parameter to transaction
All callers to localrepo.transaction() must supply a transaction description.
The description and the existing repository tip are then stored
(transactionally) into .hg/undo.desc; where rollback can later find it.
2010-04-09 17:23:35 -05:00
Matt Mackall
b0e809f105 Merge with stable 2010-04-07 14:44:51 -05:00
Henrik Stuart
c77aceb840 mq: use util.unlink instead of os.unlink and os.removedirs
If, on Windows, your repository and working copy are in a reparse point and you
use os.removedirs, you will remove non-empty reparse points, disabling the
reparse point. See @6b1369445b7b.
2010-04-07 16:55:01 +02:00
Brodie Rao
e46074c7b3 color: colorize based on output labels instead of parsing output
By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(),
the color extension can avoid parsing command output and simply colorize
output based on labels.

As before, the color extension provides a list of default colors for
core commands/labels. Other extensions can provide their own defaults by
specifying a colortable dict (similar to cmdtable).

In this process, --color is promoted to a global option and the deprecated
--no-color option is removed.
2010-04-02 15:22:17 -05:00
Brodie Rao
9422709db6 qseries: make use of output labeling 2010-04-02 15:22:14 -05:00
Brodie Rao
a7217d1b38 qdiff: make use of output labeling 2010-04-02 15:22:11 -05:00
Brodie Rao
28173d35ba qguard: make use of output labeling 2010-04-02 15:22:12 -05:00
Matt Mackall
0726edad79 Merge with stable 2010-04-01 17:51:59 -05:00
Matt Mackall
d287a71ee7 Merge with i18n 2010-04-01 17:40:47 -05:00
Wagner Bruna
0d7a0676a9 mq: remove reference for deprecated -f option
-f is the default behaviour since a4e731b2164f
2010-04-01 19:32:08 -03:00
Brendan Cully
3f85d60b3e Merge with stable 2010-03-31 15:09:59 -07:00
Michael Glassford
268693c3a0 Add missing --mq option to hg log.
Since norepo is a string, not a list, the norepo check was matching
command names against any substring in norepo. This fix splits norepo
into a list of commands.
2010-03-31 10:59:00 -04:00
Sune Foldager
8d7f484a9b merge with stable 2010-03-26 17:09:56 +01:00
Sune Foldager
7c4049acf8 localrepo: change _updatebranchcache to use a context generator 2010-03-26 17:02:23 +01:00
Patrick Mezard
3a9ceece66 Merge with crew-stable 2010-03-23 22:59:31 +01:00
Patrick Mezard
ff276d3f72 mq: fix qcommit documentation wrt --mq option 2010-03-23 10:18:46 +01:00
Benoit Boissinot
40a289572d mq: allow lines starting with '--- ' in patch messages 2010-03-18 19:26:56 +01:00
Brendan Cully
791f92f6bd Merge with stable 2010-03-18 14:36:24 -07:00
Benoit Boissinot
f39aa4fcb7 mq: do not try to delete non-existent files (regression from 5f2a56be1e3e) 2010-03-14 22:17:10 +01:00
Martin Geisler
4936f759eb Merge with stable 2010-03-14 22:21:48 +01:00
Benoit Boissinot
5337e0f1bd mq: don't use regexp when not necessary 2010-03-14 19:09:55 +01:00
Cédric Duval
5526bbffdb mq: fix init with nonexistent or non-local repository 2010-03-14 18:46:38 +01:00
Cédric Duval
f7452aeef3 mq: no longer refer to deprecated qinit -c command 2010-03-14 19:21:24 +01:00
Cédric Duval
b91592cdc4 mq: don't mention qinit as a "common task"
Without -c, it is a no-op (the queue is implicitly initialized by all
relevant commands if needed), and queue repositories with -c are an
advanced usage of mq, and not otherwise required.
2010-03-14 19:17:06 +01:00
Benoit Boissinot
79921b5a72 mq: use xrange/enumerate instead of += 1 2010-03-14 14:53:20 +01:00
Benoit Boissinot
9be5c5ce37 mq: don't use len(list) unless necessary 2010-03-14 14:45:01 +01:00
Benoit Boissinot
8b8c0315c4 mq: find_series() simplify and don't use regexps 2010-03-14 12:08:14 +01:00
Benoit Boissinot
4f9affc968 mq: fix coding style (missing space) 2010-03-14 11:12:51 +01:00
Benoit Boissinot
cea219ac52 mq: qsave creates entries with the left part empty (':patchname') 2010-03-14 11:12:07 +01:00