Brendan Cully
7750dbbb50
New self-explanatory command qrename.
2006-08-01 10:55:06 -07:00
Sébastien Pierre
ed658dff2d
[darcs2hg] Windows compatibilty patct
...
Originally submitted by Daiju Kito
1. single quote didn't work in several cases
2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.
2006-08-01 09:51:36 -04: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
Vadim Gelfer
6569e6bb76
import: switch from application/x-patch to text/x-diff
...
christian ebert says his mailer was broken.
2006-07-31 12:02:13 -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
fed53854c7
log: add -f/--follow option, to follow rename/copy
2006-07-31 07:31:31 -07:00
Vadim Gelfer
b7a96d1742
clean up hg.py: move repo constructor code into each repo module
2006-07-31 07:11:12 -07: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
fc31092ae7
pull: allow to pull from bundle file without need for bundle: syntax
2006-07-30 21:46:38 -07:00
Vadim Gelfer
ab373bc140
merge with crew.
2006-07-30 13:29:19 -07:00
Giorgos Keramidas
1f91b78691
avoid calling (cd ...) with `nil' as a directory name
...
When (hg-root) cannot determine the current Mercurial root, print an
error message instead of trying to evaluate (cd nil).
2006-07-30 09:37:08 +03:00
Vadim Gelfer
8bbf3c06db
mq: add basic tests
2006-07-29 11:14:32 -07: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
Christian Ebert
8692e17b6e
fix output file format %r
2006-07-29 18:15:08 +02:00
Thomas Arendsen Hein
fe2792b770
merge with tah
2006-07-29 08:11:41 +02: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
5ab6440f56
hgcommand.vim: cleanup of doc self-install code
2006-07-29 01:58:12 +02:00
Vadim Gelfer
0aa0ec43d9
import: allow application/x-patch for funny patch from christian ebert
2006-07-30 21:24:06 -07: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
96182c9dcc
merge with crew.
2006-07-28 10:47:02 -07:00
Vadim Gelfer
9f04cf77e6
mq: add qclone command
2006-07-28 10:46:41 -07:00
Vadim Gelfer
9139c6368e
hg.py: add islocal() and defaultdest() functions, refactor
...
islocal tells if a repo or url is local.
defaultdest returns default path for clone if explicit path not given.
clone can now take repo or url as source
2006-07-28 10:46:25 -07:00
Benoit Boissinot
4aab4129ad
makes 'hg diff' diff the file in sorted order
2006-07-28 18:46:02 +02:00
Thomas Arendsen Hein
afdc004040
merge with tonfa
2006-07-28 09:01:13 +02:00
Thomas Arendsen Hein
ee3549fd9c
merge with upstream
2006-07-28 09:00:59 +02:00
Thomas Arendsen Hein
174db77808
Fix test-mq-qnew-twice exit code and output.
2006-07-28 09:00:30 +02:00
Thomas Arendsen Hein
39f376c06d
Add test mq keeping a reference to localrepo which can't remove journal on exit.
2006-07-28 08:59:06 +02: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
ee86bed69f
run-tests.py: skip tests that should not run.
...
print message when any test is skipped.
count skipped tests.
2006-07-27 15:53:08 -07:00
Vadim Gelfer
30eef33028
make mq test more portable.
2006-07-27 15:31:04 -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
Matt Mackall
f6abe4704e
Fix test permission
2006-07-27 15:20:35 -05: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
Benoit Boissinot
b66071be94
reupdate the options after loading the repo
...
local .hgrc could possibly override them, command line take priority
2006-07-27 19:26:01 +02:00
Thomas Arendsen Hein
bf89e75281
Merged backout head.
2006-07-27 18:53:31 +02:00
Thomas Arendsen Hein
60f1f8da20
Backed out changeset cec70ece11095d46f137b8447968d1a9af40766f
...
- it always runs chmod
- uses chmod in an unsafe way
- if somebody does a clone of a repo, runs 'make tests', everything is fine,
so he can assume the original repo is fine, too, but it is not.
2006-07-27 18:53:10 +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
