Ben Thomas
f9ee0d749e
Modify qpush/qpop idempotent operations to return success
...
Modify qpush/qpop such that idempotent instances of the operations
return success. That is, repeated qpush -a, qpop -a, qpush patch-name
or qpop patch-name will return success. The end goal of each of these
operations is to reach a particular state. Whether or not the patches
were already applied does not affect that state or operation status.
Likewise, be careful to retain the error status on a qpush/qpop
without arguments when the end/beginning of the series has been
reached.
2007-02-13 08:54:48 -05:00
Alexis S. L. Carvalho
daf68bc81b
mq: propagate the return error of pop
2007-02-17 04:50:03 -02:00
Alexis S. L. Carvalho
d4de823a64
merge with crew-stable
2007-02-16 05:27:37 -02:00
Alexis S. L. Carvalho
f03ddd16f8
notify: don't try to fix addresses if notify.domain is not set
2007-02-16 04:54:49 -02:00
Alexis S. L. Carvalho
86353c5094
qclone: don't call reposetup manually
2007-02-15 08:44:08 -02:00
Alexis S. L. Carvalho
de6a03262c
extdiff: open files in binary mode
...
Problem noticed by Darrell Gallion.
2007-02-15 08:14:03 -02:00
Andrei Vermel
6c380c2c30
Make extdiff work at root directory
2007-02-15 12:51:43 +03:00
Alexis S. L. Carvalho
744364abd4
merge with crew-stable
2007-02-13 10:25:45 -02:00
Sean Dague
3f956d46a5
Prevent type exception on concatenation if diffstat returns None.
...
This will most often occur if diffstat is not installed in the
target platform, though may also happen in other cases where
diffstat fails to execute.
Signed-off-by: Sean Dague <sean@dague.net>
2007-01-30 10:35:25 -05:00
Alexis S. L. Carvalho
5357b68523
fix strip'ping the second parent of a merge
2007-02-06 15:54:58 -02:00
Christian Ebert
f1ac1bb856
patchbomb: fix timezone offset in message date header
...
Use mercurial.util instead of time to set and format dates.
2007-01-13 02:15:49 +01:00
Patrick Mezard
3863442bfc
transplant: remote bundle source was not closed before deleting the fetched bundle.
...
It fails under win32 because "normal" opened files cannot be removed.
2007-02-11 18:37:23 +01:00
Alexis S. L. Carvalho
d8dc29a091
mq: qinit -c creates a repo even after a regular qinit
2007-02-09 03:48:30 -02:00
Matt Mackall
28f682beac
Merge with stable
2007-02-06 16:12:22 -06:00
Brendan Cully
03ca1d2aec
transplant: update to current writebundle API
2007-01-30 11:39:47 -08:00
Thomas Arendsen Hein
6994b7a44c
mq: Mention usage of hg add/remove/copy/rename in qrefresh help text.
2007-01-29 17:33:09 +01:00
Thomas Arendsen Hein
154a4bfab2
merge with upstream
2007-01-24 23:06:45 +01:00
Matt Mackall
40ad41301e
hgk: remove embedded nulls in descriptions
2007-01-23 17:41:53 -06:00
Brendan Cully
50376bc7f9
mq: allow push if -r is given explicitly
2007-01-22 20:22:25 -08:00
Patrick Mezard
3c75788cdb
Enforce unixish style for all generated patch names.
...
User supplied names are left unchanged (including those loaded from series).
2007-01-17 22:19:36 +01:00
Brendan Cully
cc266c1a0a
Update transplant's merge.update call
2007-01-16 12:51:02 -08:00
Benoit Boissinot
4af82ec145
merge with -stable
2007-01-15 18:23:21 +01:00
Thomas Arendsen Hein
46055c07ca
sync with -stable
2007-01-02 22:40:52 +01:00
Matt Mackall
8ed93098b6
replace filehandle version of wwrite with wwritedata
2006-12-29 20:04:31 -06:00
Benoit Boissinot
ac64b63257
mq: fix strip failing to unlink a bundle
...
os.unlink doesn't know how to deal with urls
2006-12-26 21:57:20 +01:00
Thomas Arendsen Hein
b3b0303cec
Corrected synopsis for transplant.
2006-12-26 15:42:40 +01:00
Benoit Boissinot
4ac2d21a86
mq: remove unecessary code, duplicate with util.opener
2006-12-26 03:29:45 +01:00
Benoit Boissinot
e78320fa9c
hgk: (re)optimize reading of changelog and manifest
2006-12-26 03:42:17 +01:00
Benoit Boissinot
2de51d26e4
mq: use contexts
2006-12-26 03:29:00 +01:00
Benoit Boissinot
764aee51ba
hgk: use contexts
2006-12-26 03:27:24 +01:00
Benoit Boissinot
4df0c56a7a
hgk: remove unused code, node2 is always set
2006-12-26 03:26:23 +01:00
Benoit Boissinot
0c3a966f5f
extdiff: use contexts
2006-12-26 03:25:44 +01:00
Benoit Boissinot
dfdfde18a2
bugzilla: use contexts, simplify
2006-12-26 03:25:13 +01:00
Benoit Boissinot
c12c4a144e
acl: use contexts
2006-12-26 03:24:51 +01:00
Benoit Boissinot
cd66ae056f
remove various unused import
2006-12-25 13:37:00 +01:00
Thomas Arendsen Hein
f2c2df1ab1
merge with crew-stable
2006-12-16 23:36:06 +01:00
Thomas Arendsen Hein
6857107023
Make 'hg sign' behave like other commands: Default to current parent.
2006-12-16 23:11:16 +01:00
Brendan Cully
8c26621151
Merge with crew-stable
2006-12-15 18:38:09 -08:00
Benoit Boissinot
877ef87ad8
fix strip on windows
...
c: was interpreted as a protocol, prepend file: to the bundle file name
2006-12-15 23:19:12 +01:00
Matt Mackall
296d6a7cb8
Simplify i18n imports
2006-12-14 20:25:19 -06:00
Matt Mackall
d38d83ce6b
Merge with crew
2006-12-14 15:55:46 -06:00
Brendan Cully
03d8b3d838
patchbomb: use ui.edit to compose summary mail
2006-12-13 22:53:41 -08:00
Matt Mackall
f17a4e1934
Replace demandload with new demandimport
2006-12-13 13:27:09 -06:00
Matt Mackall
2623870448
Remove deprecated old-style branch support
2006-12-12 18:16:23 -06:00
Brendan Cully
ca8a1c87d4
mq: fix qheader without args when guards are applied after qtop
2006-12-12 12:40:51 -08:00
Brendan Cully
149bcf7d29
mq: auto-ignore guards in qinit -c
2006-12-11 16:40:42 -08:00
Brendan Cully
eefc767043
mq: fix explain_pushable for negative guards
2006-12-11 16:32:45 -08:00
Mathieu Clabaut
6913b00ffd
Uniformisation of commit help for -m and -l.
...
Addition of the -m and -l options for hg import.
'hg tag' still lacks the --logfile option which short form conflicts with
its --local option.
2006-11-20 23:37:21 +01:00
Brendan Cully
844c4a922b
transplant: don't add extra newlines to changelog entry in filter
2006-12-08 12:52:17 -08:00
Alexis S. L. Carvalho
3b575d7b19
fix encoding conversion of branch names when mq is loaded
2006-12-07 14:35:43 -02:00
