Vadim Gelfer
a1413b0539
mq: add qmv as alias for qrename
2006-08-01 10:57:28 -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
Brendan Cully
8d18dc1a62
Add option -e/--edit to qrefresh, to edit the existing header.
2006-07-31 17:55:43 -07:00
Brendan Cully
c05a6aafc0
Change patch header as well as commit message with qrefresh -m or -l.
2006-07-31 18:47:43 -07:00
Brendan Cully
0dab08cb0c
Remove pointless reposetup hook from hgk.py
2006-08-01 02:23:05 -07:00
Alexis S. L. Carvalho
eb9aa4b11b
mq: correct the use of super
...
The first argument passed to super is supposed to be the class where
it's being used, not self.__class__ - the two can be different when
there's inheritance involved.
2006-07-31 14:22:17 -03:00
Vadim Gelfer
c39398b49b
merge with mpm.
2006-07-30 22:52:34 -07:00
Matt Mackall
fb73e75b58
Kill ui.setconfig_remoteopts
...
This brought too much knowledge about command line particulars into
the ui code. Moved to commands.py.
2006-07-31 00:47:43 -05:00
Vadim Gelfer
8113ef1e80
mq: allow to apply patches in subdir of repo again
...
i broke it in d752547f000a.
2006-07-29 11:05:39 -07:00
Alexis S. L. Carvalho
0430d76b15
hbisect.py: don't rely on __del__ to write the current state.
...
This is yet another page of the "Thou shalt not do too much inside
__del__ methods" book, in the "demandload and __del__ don't go well
together" chapter.
The bisect extension is broken in 0.9.1:
$ hg bisect init
$ hg bisect bad
Fatal Python error: Interpreter not initialized (version mismatch?)
Aborted
(yes, I tripled checked my instalation to make sure the problem is not
there)
It's been broken since revision 35b6c1ed51fd moved the import of the
binascii module into a demandload.
(In details: the first time that "hg bisect bad" (or good) is called,
there are still no revisions saved in .hg/bisect/*, so bisect.__init__
doesn't call hg.bin on anything. So, when we reach __del__, the
binascii module still hasn't been imported and we get that "nice"
message above.)
2006-07-28 21:20:41 -03:00
Christian Ebert
4f7c14a605
patchbomb: do not write Bcc
2006-07-29 10:27:54 +02:00
Vadim Gelfer
090f26bfb5
mq: update to handle repomap not longer used
2006-07-28 14:31:20 -07:00
Brendan Cully
fa56cc4df5
mq: replace module-wide repo hash with a repo attribute
2006-07-28 13:08:25 -07:00
Brendan Cully
09698d36ee
mq: do not hold a reference to repo in tags override
...
Instead, replace repo's class object with a subclass.
2006-07-28 13:08:21 -07:00
Christian Ebert
341a9cc179
patchbomb: fix generation of message-id when sending attachments
...
node was set to bin(node) before message-id was created
2006-07-28 22:17:32 +02:00
Vadim Gelfer
9f04cf77e6
mq: add qclone command
2006-07-28 10:46:41 -07:00
Vadim Gelfer
7505745e16
mq: fix queue.apply to not call os.chdir()
...
call to os.chdir broke "hg -R dirname qpush".
instead pass -d (change directory) option to patch command.
2006-07-27 18:24:59 -07:00
Vadim Gelfer
c75d013f82
mq: move many error messages to util.Abort
2006-07-27 16:41:59 -07:00
Vadim Gelfer
95c056a904
mq: do not allow to qnew a patch twice
2006-07-27 16:08:56 -07:00
Vadim Gelfer
2fec671b08
patchbomb: add content-disposition to make display inline and add filename
...
if rev being emailed has tag that ends in .patch or .diff then use that as
filename. else make up filename from name of repo.
2006-07-27 15:19:58 -07:00
Christian Ebert
64ba2370e6
patchbomb: optionally send patches as inline attachments
2006-07-27 22:28:03 +02:00
Vadim Gelfer
be51fbc3c0
merge with crew.
2006-07-27 12:36:17 -07:00
Christian Ebert
40b4014496
make introductory message of patch series text/plain
2006-07-27 21:25:39 +02:00
Chris Mason
5a55931f23
mq: strip should not blow away local changes
...
This changes the mq strip command to abort if there are any changes in
the working directory.
2006-07-27 09:27:45 -07:00
Chris Mason
efeb029828
mq: fix qnew and qimport to deal with series file comments
...
qnew and qimport did not take comments into account when deciding where
to place new patches in the series file.
2006-07-27 09:27:42 -07:00
Chris Mason
d6e27326d7
mq: qpop should act like quilt pop
...
qpop patchname would pop the named patch off the stack. This is slightly
different from how quilt pop works. quilt pop pops everything up to the
named patch.
2006-07-27 09:27:39 -07:00
Chris Mason
0567a3c508
mq: patch naming shortcuts
...
This adds some more options to the mq lookup routine. It allows
you to use shortcuts in naming patches to push or pop. You
can now use:
1) a full patch name
2) a number to indicate an offset in the series file
3) a unique substring of the patch name
4) patchname[-+]num to indicate an offset from a given patch.
For case #3 substrings are allowed. qtip and qbase are aliases for
the top and bottom of the applied patch queue, unless they are already
in the series file as patch names.
2006-07-27 09:27:35 -07:00
Mathieu Clabaut ext:(%22)
f056efd753
MQ: uniformise message and logfile option.
...
Possibility to change message in qrefresh option
2006-07-26 20:11:54 +02:00
Brendan Cully
e5bea098db
Add mq patch names to tagscache instead of overriding lookup.
...
This makes mq patch names visible in hg log and hg tags. It also
resolves the names only once, rather than on every lookup.
2006-07-26 12:22:04 -07:00
Christian Ebert
6dda35f7a7
optionally send blind carbon copies
...
Bcc recipients may be set via long `--bcc' or hgrc only, no prompt.
2006-07-26 14:39:33 +02:00
Mathieu Clabaut ext:(%22)
0bf956044f
mq: uniform verbose display of patche[s].
...
In verbose mode, display:
"index patchname" for unapplied patches
"index cset:patchnames" for applied patches
"index status patchname" in the serie listing.
2006-07-26 01:03:33 +02:00
Mathieu Clabaut ext:(%22)
5754e8f808
extdiff : add comment on how to use vim for doing directoy diff
2006-07-25 23:10:11 +02:00
Brendan Cully
7a70e197ba
Add qtip and qbase to mq qlookup.
2006-07-20 11:52:28 -07:00
Brendan Cully
e73d6c3e4d
Mq: modify repo.lookup to resolve applied patches too.
2006-07-20 11:52:28 -07:00
Vadim Gelfer
eef60e2c8d
help: add help to mq extension
2006-07-03 14:30:38 -07:00
Thomas Arendsen Hein
703b773cf0
Merge with crew.
2006-06-30 22:09:43 +02:00
Thomas Arendsen Hein
d17f2a589b
Merge with crew.
2006-06-30 21:35:28 +02:00
Brendan Cully
e07fd10605
hgk: Don't choke on empty changelogs
2006-06-30 21:35:22 +02:00
Chris Mason
f6facbf17c
mq: fix qparents to return the correct parent when no patches are applied
2006-06-27 10:49:46 -04:00
Chris Mason
26fe10a876
mq: hg qnew -f should refresh the new patch
...
qnew -f was originally meant to just skip the localchanges check.
But, it currently discards the local changes, which is not at all what
people expect.
This patch changes qnew -f to create the new patch and then
run hg qrefresh on it. The local changes will be in the new
patch.
2006-06-27 11:23:06 -04:00
Thomas Arendsen Hein
d7742cf972
mq: Added help for qcommit, consistently talk about queue repository.
2006-06-28 08:56:01 +02:00
Vadim Gelfer
d49fb207db
mq: add qimported patches if patch dir is a repo
2006-06-23 12:52:42 -07:00
Volker Kleinfeld
76de44d843
patchbomb does not handle email time stamp plattform independent
2006-06-16 07:07:11 -07:00
Vadim Gelfer
844d833844
move hgk.py into hgext. now to enable "hg view" is one less step.
...
edit ~/.hgrc:
[extensions]
hgext.hgk =
cp contrib/hgk ~/bin
2006-06-14 15:41:06 -07:00
Vadim Gelfer
bd8276a666
move purge extension out of hgext.
...
it is not as clean as other modules in hgext.
can move back after rewrite.
2006-06-04 17:08:02 -07:00
Thomas Arendsen Hein
48565af0dc
Make indentation of purge's cmdtable match to mercurial/commands.py
2006-06-02 00:33:42 +02:00
Thomas Arendsen Hein
dbe2eb1f66
Rewritten install instructions for hg-purge to match new situation, fixed typos.
2006-06-02 00:28:28 +02:00
Thomas Arendsen Hein
bb2919687f
Merged hg-purge
2006-06-01 23:58:43 +02:00
