facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 09:17:30 +03:00
Code Issues Projects Releases Wiki Activity
5,523 Commits 25 Branches 62 Tags 327 MiB
a9e1f119ec
Commit Graph

692 Commits

Author SHA1 Message Date
Brendan Cully
76de3f4dbc Split convert extension into common and repository type modules 2007-06-10 20:08:47 -07:00
Thomas Arendsen Hein
c8b452e9cd Some small cleanups for convert extension: 
- repo doesn't need to be imported
- util.Abort doesn't need \n
- space after comma
- long lines
- spacing
 2007-06-09 13:17:58 +02:00
Edouard Gomez
a78099c06d Add some more smart when initializing destination repository 2007-06-07 23:16:10 +02:00
Edouard Gomez
3da6e22a8d Fix hgext/convert/__init__.py rights 2007-06-07 23:06:17 +02:00
Thomas Arendsen Hein
f6cab1195a convert: map CVS HEAD to default branch 2007-06-07 12:41:12 +02:00
Thomas Arendsen Hein
49220695bc Removed trailing whitespace and tabs from python files 2007-06-06 20:22:52 +02:00
Thomas Arendsen Hein
c25e5246ac Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension 2007-06-06 20:17:03 +02:00
Edouard Gomez
1c1f8ffe29 Turns convert.py into a real extension 2007-05-25 00:56:48 +02:00
Thomas Arendsen Hein
ae50302e53 Move convert-repo to hgext/convert/__init__.py 2007-06-06 19:49:47 +02:00
Thomas Arendsen Hein
df8762ba4d graphlog: Print . instead of @ for working directory parents 
"." is accepted as an alias for the first working directory parent by -r/--rev
 2007-06-06 18:28:48 +02:00
Thomas Arendsen Hein
d5b47506f2 merge with stable 2007-06-04 22:08:42 +02:00
Alexis S. L. Carvalho
ae21f631dc merge with crew-stable 2007-06-04 00:26:53 -03:00
Patrick Mezard
ed018bae98 Merge with crew-stable 2007-06-03 17:18:48 +02:00
Bryan O'Sullivan
747ba13e75 Merge with crew. 2007-06-02 09:04:23 -07:00
Matt Mackall
8a16e5c578 mq: pass a URL to clone 2007-06-02 09:21:56 -05:00
Bryan O'Sullivan
68cbf40ee6 patchbomb: Fail early if no revs given to email 2007-05-27 14:58:59 -07:00
Bryan O'Sullivan
4cba8e678d patchbomb: Fix typo. 2007-05-27 14:54:00 -07:00
Bryan O'Sullivan
55c504cd18 patchbomb: Hoist sender config higher. 2007-05-27 14:53:46 -07:00
Bryan O'Sullivan
37507376a2 patchbomb: Validate email config before we start prompting for info. 2007-05-27 14:40:14 -07:00
Bryan O'Sullivan
ebb57c99be ui: Rename has_config to has_section. 2007-05-27 13:50:59 -07:00
Bryan O'Sullivan
89f87c2599 patchbomb: Defer the import of readline. 
If imported at the top of the module, the import appears to succeed,
but raw_input doesn't acquire magic editing fu.  I suspect this has
something to do with the newish demandimport code, because the prior
code worked with demandload.
 2007-05-27 13:41:35 -07:00
Bryan O'Sullivan
7274da938c patchbomb: Don't prompt for headers until sure we have revs to export. 
The prior behaviour was to always prompt for headers, and only then
bomb out if there were actually no revs to send.
 2007-05-27 13:29:04 -07:00
Brendan Cully
32c5d5cbaa Make mergepatch save queue now that qpush isn't. 2007-05-13 19:15:54 -07:00
Emanuele Aina
92444d96b1 purge: add --include and --exclude options 2007-05-11 17:05:44 +02:00
Bryan O'Sullivan
fd12095b02 mq: add qgoto command. 2007-05-08 13:10:27 -07:00
Bryan O'Sullivan
dedbe183d4 Fix typo in bugzilla extension. 2007-05-08 11:51:16 -07:00
Brendan Cully
6fae8c6b65 Fix test-patchbomb for crew 2007-05-08 13:08:20 -07:00
Bryan O'Sullivan
b4c9f788df MQ: tidy up if a qpush is interrupted. 
This aborts the transaction, makes sure the dirtied dirstate isn't
written out, and cleans up the working directory.
 2007-05-08 12:16:02 -07:00
Patrick Mezard
d8d1fafaa1 mq: fix qtop failure when the series ends with guarded patches. 2007-05-06 23:44:18 +02:00
Patrick Mezard
2aa0553705 Merge with crew-stable. 
HG: changed hgext/mq.py
 2007-05-07 00:12:35 +02:00
Brendan Cully
00185c3bf1 mq: account for readheaders munging in qrefresh 2007-05-01 13:23:32 -07:00
Brendan Cully
400bdcdd02 Flesh out bisect help text 2007-04-29 17:35:03 -07:00
TK Soh
6f62ce81c5 hbisect: fix a typo in error message 2007-04-20 16:17:42 -05:00
Joel Rosdahl
cd9e37bddc Add graphlog extension 2007-04-09 10:39:28 +02:00
Brendan Cully
ef31abfcc7 Merge with crew-stable 2007-04-12 15:07:05 -07:00
Brendan Cully
a7d01d6295 mq: fix qtop when some patches beneath are guarded 2007-04-12 14:45:53 -07:00
Alexis S. L. Carvalho
ea51c7fac2 Merge with crew-stable. 2007-04-09 04:57:25 -03:00
Alexis S. L. Carvalho
5907b48b37 mq: don't abort when merging a patch that removes files 2007-04-09 04:24:17 -03:00
Emanuele Aina
c4577db686 Move back the purge extension in hgext 2007-02-27 09:05:36 +01:00
John Goerzen
6c358f6844 Add a filename for the bundle 2007-03-26 20:49:57 -05:00
John Goerzen
174fda7e23 Slight refining to help text in patchbomb.py 2007-03-26 20:46:49 -05:00
John Goerzen
78c2249368 Improve documentation for patchbomb and email 2007-03-22 14:02:39 -05:00
John Goerzen
62f41606fb Add common bundle/outgoing options to hg email 2007-03-26 13:57:49 -05:00
John Goerzen
0f8beca425 Add ability to send bundles to patchbomb extension 2007-03-26 13:37:48 -05:00
Brendan Cully
d96eb0b31a Add --outgoing option to patchbomb 2007-03-22 10:40:28 -07:00
Brendan Cully
98f6a14efd transplant: fix ignoring empty changesets (eg after filter) 2007-03-20 13:13:39 -07:00
Thomas Arendsen Hein
be73c0d3f9 merge with crew-stable 2007-03-18 20:44:58 +01:00
Thomas Arendsen Hein
a6c18d39af Fixed synopsis for some mq commands 2007-03-18 20:39:25 +01:00
Thomas Arendsen Hein
1bd533bfe0 hg qseries -m: guards file was not ignored 2007-03-18 20:37:47 +01:00
Thomas Arendsen Hein
3c65cfc2d4 Simplified qseries and hg qapplied to fix some bugs caused by optimization: 
- hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing
  guarded (or unapplied because they were guarded during hg qpush) patches.
- hg qapplied <patchname> now works again
 2007-03-18 12:20:15 +01:00
Thomas Arendsen Hein
6e23ab4e60 Fix issue443: inconsistent output of "hg qunapplied -v" 
1. Don't skip over unpushable (guarded) unapplied patches.
2. Don't display unpushable patches, unless -v is given, otherwise
   guarded and unguarded patches can't be distinguished.
 2007-03-17 18:46:52 +01:00
Brendan Cully
c7cf8a52b7 mq: add qparent tag (first parent of qbase) 2007-03-14 10:45:18 -07:00
Matt Mackall
e896adead6 Merge with -stable, fix small test failure 2007-03-14 01:26:09 -05:00
Brendan Cully
a5971231f4 Remove undo log after mq operations that rollback would break 2007-03-13 21:50:42 -07:00
Brendan Cully
55ebb47049 Refresh file size after partial qrefresh. 
This makes a subsequent hg revert; hg status work.
 2007-03-13 16:27:34 -07:00
Brendan Cully
5641becd5a Merge with crew-stable 2007-03-10 17:45:32 -08:00
Alexis S. L. Carvalho
d3e0262e32 fix qrefresh'ing an empty patch 
This is not superefficient (the commit will have to walk the whole tree),
but it works.
 2007-03-10 22:03:23 -03:00
Alexis S. L. Carvalho
264f45926a fix qclone to a remote repo 
This fixes issue467.  -stable still needs something like revision
cb494d252290 - mq: allow push if -r is given explicitly.

In the meantime, hg qpop -a; hg qclone . ssh://...  is a workaround.
 2007-03-10 22:03:21 -03:00
Thomas Arendsen Hein
5836375323 patchbomb: Strip more than one trailing dot (and spaces between them) 2007-03-04 18:42:31 +01:00
Thomas Arendsen Hein
fdbad87b57 patchbomb: Allow to specify subject of single-patch-series (issue475) 2007-03-04 18:40:08 +01:00
Christian Ebert
cf8f1b83bb mq: abort cleanly when invalid patch name is given to qguard 2007-03-03 17:54:13 +01:00
Thomas Arendsen Hein
92f5af0b0d merge with crew-stable 2007-03-05 19:54:21 +01: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
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
Alexis S. L. Carvalho
93eb041452 Merge with crew-stable 2007-03-04 09:03:21 -03:00
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
744364abd4 merge with crew-stable 2007-02-13 10:25:45 -02: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
Mathieu Clabaut
35ae1218d2 Add sending date to notify message. 
When using SMTP, no date field was set into the message, which causes it to be
displayed as being send on 1st january 1970 on most MUA.
 2007-05-24 16:32:38 +02: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
Matt Mackall
eea72a34c4 hgk: show view in short command list 2006-12-05 16:39:54 -06:00
Alexis S. L. Carvalho
1f3671ab6b fix qseries -v and guards interaction 
- rename "status" variable to avoid shadowing an argument
- use a better test to determine whether a patch is applied
 2006-12-02 18:41:07 -02:00
Brendan Cully
8ca3b72e7e transplant: split filter args into changelog entry and patch 2006-12-01 15:43:48 -08:00
Brendan Cully
77c7691d79 transplant: log source node when recovering too. 2006-12-01 15:00:33 -08:00
Brendan Cully
e29958754d transplant: clobber old series when transplant fails 2006-12-01 14:30:17 -08:00
Brendan Cully
20dae997d6 transplant: "filtering %s\n" 2006-12-01 13:50:09 -08:00
Matt Mackall
a3525dd4cb update bugzilla extension to use ui buffers 2006-12-01 01:29:14 -06:00
Matt Mackall
bbfb5e4171 fix notify with new ui buffering 2006-12-01 01:28:20 -06:00
Brendan Cully
deae5133ad transplant: recover added/removed files after failed application 2006-11-30 13:51:58 -08:00
Brendan Cully
d88675f9d4 transplant: preserve filter changes in --continue log 2006-11-30 11:32:40 -08:00
Brendan Cully
e5abdcc7fc transplant: fix --continue; add --continue test 2006-11-30 11:09:25 -08:00
Brendan Cully
0dcb9f5388 transplant: show_changeset moved to cmdutil 2006-11-29 22:34:22 -08:00
Brendan Cully
dc483d8d44 Add transplant extension 2006-11-27 15:13:01 -08:00
Thomas Arendsen Hein
678567f5fc Make mq use changegroup.writebundle for writing strip backups. 2006-11-22 23:07:15 +01:00
Thomas Arendsen Hein
ea20cdf3f7 Removed unused ui parameter from revpair/revrange and fix its users. 2006-11-22 23:02:28 +01:00
Alexis S. L. Carvalho
f6e774dd91 qrefresh: fix handling of copies in the fast path 2006-11-20 19:32:43 -02:00
Alexis S. L. Carvalho
63b6839f96 qrefresh: fix handling of added files (including copies) in the slow path 2006-11-20 19:32:42 -02:00
Alexis S. L. Carvalho
eb62b3a806 qrefresh: respect --git even in the slow path 2006-11-20 19:32:41 -02:00
Alexis S. L. Carvalho
b298d93260 add --git option to qdiff 2006-11-20 19:32:40 -02:00
Brendan Cully
185cd7ed4a Merge with crew 2006-11-20 13:06:04 -08:00
Brendan Cully
83afafe362 mq: add --git option to qimport -r 2006-11-20 13:03:52 -08:00
Mathieu Clabaut
6971cd5b8c Issue424: mq patch loses guard when qrenamed 2006-11-19 23:47:19 +01:00
Mathieu Clabaut
86f4680be6 Make qrefresh help more explanatory for options -m, -l and -s 2006-11-19 22:02:00 +01:00
Alexis S. L. Carvalho
3a2243d8f7 fix qseries -v when there are unapplied patches 2006-11-19 17:01:59 -02:00
Marcos Chaves
794888ecba fix warnings generated by pygettext.py. 2006-11-18 17:20:38 -02:00
Matt Mackall
c50c09da0a templates: move changeset templating bits to cmdutils 2006-11-13 13:26:57 -06:00
Brendan Cully
5658cffdec mq: handle qpush -a with empty series 2006-10-31 17:24:42 -08:00
Thomas Arendsen Hein
687e4a7111 Define and use nullrev (revision of nullid) instead of -1. 2006-10-29 10:53:51 +01:00
Thomas Arendsen Hein
11cdc6b21b Merge with upstream 2006-10-27 23:09:46 +02:00
Matt Mackall
e803b50ef2 Make util.unique return a list 2006-10-27 14:06:32 -05:00
Matt Mackall
6ff42f7ea8 Make revrange return a list of ints so that callers don't have to convert 2006-10-26 17:27:07 -05:00
Brendan Cully
b632ccfd90 mq: support qimport - 2006-10-26 09:40:20 -07:00
Alexis S. L. Carvalho
aa3a52a4cd make mq play nicely with the branch cache 
- if no patches are applied, don't do anything different

- if the cache includes valid data from one of the patch revisions,
  use the cache, but don't save anything new

- if the cache has data from before the patch revisions only,
  save what the list of branches would be without the patch revisions
 2006-10-23 23:32:56 -03:00
Benoit Boissinot
3f09dfef56 use xrange instead of range 2006-10-19 14:16:51 +02:00
Brendan Cully
c3df18d34b patch: return list of modified files even when an exception is raised 
The file list is passed in as an argument and updated in place.
This fixes issue399.
 2006-10-18 10:37:34 -07:00
Alexis S. L. Carvalho
1c418d136e use ui.readsections in the acl extension 2006-10-17 17:04:26 -03:00
Alexis S. L. Carvalho
753a94bc88 use ui.readsections in the bugzilla extension 2006-10-17 17:04:26 -03:00
Alexis S. L. Carvalho
2a7cf18720 use ui.readsections in the notify extension 2006-10-17 17:04:25 -03:00
Aurelien Jacobs
de3b8c9c6a document the diffstat option of the notify extension 2006-10-15 16:35:47 +02:00
Brendan Cully
5bda764afc mq: make qdelete without -k or a subrepository delete all patches 2006-10-12 14:02:41 -07:00
Brendan Cully
dbfd263f15 mq: change qdel --forget to --rev; accept any revision symbol 2006-10-12 13:24:09 -07:00
Benoit Boissinot
cec92b2bd7 fix traceback of extdiff after a merge 
- files that comes from a different branch are marked as modified
  but aren't present in the original manifest
- add a testcase for extdiff and for regular diff
 2006-10-11 16:35:09 +02:00
Josef "Jeff" Sipek
8ecf30a8c5 [patchbomb] prepend leading zeros in the "[PATCH N of M]" string 
Without this patch, if one tries to send a patch bomb with more than 9
patches, the resulting subjects are not easily alphabetically sortable.

For example:

...
[PATCH 9 of 10]
[PATCH 10 of 10]

This patch prepends as many leading zeros as necessary. E.g.,

[PATCH 09 of 10]

or

[PATCH 009 of 100]
 2006-10-07 15:16:47 -04:00
Brendan Cully
22ee164176 patchbomb: update --attach to use cmdutil.make_filename 2006-10-04 12:39:51 -07:00
Brendan Cully
1bdb991336 mq: update qfold to call delete correctly 2006-10-03 16:36:40 -07:00
Thomas Arendsen Hein
0a7b982aa6 Whitespace/Tab cleanup 2006-10-01 19:26:33 +02:00
Brendan Cully
9e8bccc466 mq: raise util.Abort instead of using sys.exit(1) 2006-09-28 11:41:33 -07:00
Brendan Cully
e754f202f1 mq: don't write applied patches into series twice in restore 2006-09-27 14:50:20 -07:00
Brendan Cully
bb7a414550 mq: bail out if a patch appears more than once in the series file. 
Closes: #379.
 2006-09-27 14:32:53 -07:00
Brendan Cully
589f502f37 mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev 
This moves most of the queue display code into qseries.
 2006-09-27 13:34:20 -07:00
TK Soh
f95e986302 hgk: fix mixup of --limit and REVRANGE in hgk call 2006-09-27 08:27:16 -05:00
Brendan Cully
7c9528ede7 mq: Add --rev argument to qimport, to adopt existing changesets. 2006-09-19 10:22:30 -07:00
Brendan Cully
2e045795a2 qimport: rename patch to patchname to avoid shadowing module 2006-09-19 08:45:39 -07:00
TK Soh
a1ddb8da93 extdiff: use the default option only if the default program is used 2006-09-18 12:01:32 +02:00
Mathieu Clabaut
3107fb4b9f Update [extdiff] configuration sample for vimdiff, 
taking acount cmd.xxx and opts.xxx configurations item.
 2006-09-15 22:55:17 +02:00
Matt Doar
223e5f58eb Add support for diffstat in commit emails, and move diffstat from 
patchbomb to patch
 2006-09-13 13:14:08 -07:00
Benoit Boissinot
3b788ed358 merge with brendan 2006-09-15 00:51:27 +02:00
Brendan Cully
d8b28f01d1 mq: handle patch names containing ":" 2006-09-14 22:52:47 +02:00
Brendan Cully
24756bd157 Move revision parsing into cmdutil. 2006-09-14 11:19:35 -07:00
Brendan Cully
7bcd472f27 hgk: add --limit, and revranges 2006-09-13 18:24:58 -07:00
Brendan Cully
8be3ac699a hgk: add revision numbers 2006-09-13 13:50:28 -07:00
Brendan Cully
6222780283 mq: add qdelete --forget option 
This removes an applied patch from the series and status files without
popping it. It is useful when an mq patch has been applied upstream.
 2006-09-14 15:35:55 +02:00
Brendan Cully
4ee037e2c4 mq: do not update an empty working directory after strip. 
Closes #296.
 2006-09-13 16:41:03 -07:00
Brendan Cully
50d115c936 mq: Add --git option to qrefresh 2006-09-12 11:11:19 -07:00
john.levon@sun.com
7605f2282e Add the -s option to hg help qseries. 2006-09-13 21:46:36 +02:00
Brendan Cully
5ee5b4abae Make qrename handle directory targets; closes #333. 2006-09-13 08:57:08 -07:00
Thomas Arendsen Hein
86029c616c Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. 2006-09-12 17:27:41 +02:00
Benoit Boissinot
2067941fd0 merge with brendan 2006-09-09 12:51:05 +02:00
Brendan Cully
6cac22e075 strip: strip changelog before manifest 2006-08-30 15:13:45 -07:00
Benoit Boissinot
2d86b2d7e4 hgk.py: fix warnings from pychecker 
- unused variables
- usage of undefined variables (opts and filterfiles)
 2006-09-06 02:15:33 +02:00
Benoit Boissinot
8621fb4642 hgk.py: add an optional file list to debug-diff-tree 
this solves a problem when hgk was trying to display merges diff
 2006-09-06 02:13:08 +02:00
TK Soh
0658d7ce38 extdiff: do not shell-quote options to new commands 
revert a change introduced by c64ec6e8ffa2
 2006-08-28 16:30:48 -05:00
Thomas Arendsen Hein
d2082f10fc Never apply string formatting to generated errors with util.Abort. 
Otherwise error messages containing % chars yield errors or worse.
Fixed (hopefully) all users of util.Abort.
 2006-09-08 09:36:18 +02:00
Benoit Boissinot
3d175cdcb6 hgk.py: fix for a bug introduced in 9ac9fb0b5ce2 2006-09-08 00:56:37 +02:00
Benoit Boissinot
1023f810da hgk.py: use mercurial.patch functions when possible 2006-09-07 14:13:01 +02:00
Benoit Boissinot
9a1b066989 hgk.py: use nullid instead of a constant 2006-09-07 14:01:00 +02:00
Mikhail Sobolev
e7d241fbe1 really treat the right side of acl.{allow,deny} as a list of users 
the current implementation seems to expect only user per pattern, which
contradicts the documentation available at the file beginning.
 2006-06-27 01:41:07 +03:00
TK Soh
653bca13b7 hgk: use short changeset hashes 
this fixes the missing tags on hgk window
 2006-08-24 16:12:23 -05:00
Brendan Cully
ea35700afd Detect git patches in patchbomb makepatch function 2006-08-30 12:55:10 -07:00
Brendan Cully
bdc3f820b0 Merge with crew 2006-08-30 10:21:02 -07:00
Brendan Cully
af80a5f6e8 Add --git support to hg email 2006-08-30 10:17:35 -07:00
Brendan Cully
b733859249 Call patch.diff directly instead of printdiff - this also saves an 
extra walk of the working directory.
 2006-08-29 17:08:55 -07:00
Alexis S. L. Carvalho
7831cbb9a7 Fixed an exception in notify extension (b2a_hex argument incorrect) 
Detailed messages was - incoming.notify hook raised an exception: b2a_hex() argument 1 must be string or read-only character buffer, not stringio
 2006-08-24 15:19:56 -07:00
Edouard Gomez
8d7e46a614 Fix hgk extension due to ce444c810fcf refactoring 2006-08-23 00:19:24 +02:00
Bryan O'Sullivan
c48ecf0092 qheader: exit withh meaningful error code. 2006-08-22 16:59:09 -07:00
Bryan O'Sullivan
5a2ca1b7f7 MQ: Make more commands return meaningful errors. 2006-08-22 16:03:55 -07:00
Bryan O'Sullivan
c679ba9347 qrefresh: exit with status 1 if no patches applied. 2006-08-22 15:14:35 -07:00
Vadim Gelfer
f7e52c304c mq: fix bad interaction between demandload and update of commands.norepo 
problem was that commands.norepo was not updated properly.
 2006-08-21 13:59:17 -07:00
TK Soh
3f6491c428 extdiff: make new diff commands pick up their options correctly 2006-08-17 15:30:45 -05:00
Vadim Gelfer
a7a2bb9df7 merge with brendan. 2006-08-18 13:01:40 -07:00
Brendan Cully
2af338f22f mq: fix appliedname 2006-08-16 19:55:42 -07:00
Brendan Cully
b85f7240b1 mq help text updates and speling fixes 2006-08-16 19:53:42 -07:00
Brendan Cully
3c579c8031 Add qnew -e option. 2006-08-16 19:53:01 -07:00
Brendan Cully
6fb5a7ec26 allow qrefresh to take a list of files; closes #96. 2006-08-16 19:52:21 -07:00
Brendan Cully
af32b3788b Fix test-mq-qdiff; add -I and -X options to qdiff 2006-08-16 19:51:39 -07:00
Brendan Cully
e5d7aafaf2 Fix qfold after recent changes 2006-08-16 19:50:50 -07:00
Brendan Cully
16fb95a415 Teach mq about git patches 2006-08-16 19:49:45 -07:00
Brendan Cully
d2c9866d08 patchbomb: import new mail module 2006-08-16 11:03:45 -07:00
Giorgos Keramidas
e8a0d4b9fc hgext: more patchbomb documentation 
+ Add a description of how to enable this extension

+ Note which command it provides (it's not very easy to guess
  that "hgext.patchbomb" enables the "email" command, unless one
  can read Python sources)

+ Expand the descriptions of the -n and -m options of "hg email".

+ Mention that formail is (commonly) part of the procmail package.
 2006-08-15 23:37:37 +03:00
Vadim Gelfer
9614f4bd5b redo merge with mpm. 
previous merge at 8c0343e3f2b7 was bad.
 2006-08-16 10:52:19 -07:00
Matt Mackall
f849bdf704 Move ui.sendmail to mail.connect/sendmail 2006-08-15 14:06:50 -05:00
Brendan Cully
2709262462 Unify mq and hg patch invocation. 
This makes patch a little less verbose by default, so the tests
had to be updated.
 2006-08-15 11:28:50 -07:00
Matt Mackall
6ecbc46d1a Move ui.diffopts to patch.diffopts where it belongs 2006-08-15 11:34:08 -05:00
Giorgos Keramidas
b558cdc911 Tune a bit the extdiff toplevel comments/samples. 
* Capitalize the first letter of all sentences

* Add an example for GNU diff(1) 'context diff' mode.

* Explain the requirement for separate cmd.xxx and opts.xxx
  options in .hgrc, which hopefully will guard against users
  trying to add:

      [extdiff]
      # Add a new Mercurial command called `cdiff', which calls
      # GNU diff(1) in 'context diff' mode.
      cmd.cdiff = diff -Nprc5

  which fails for recent crew builds with:

      $ hg cdiff .
      making snapshot of 1 files from rev 07dc4a569f4e
      making snapshot of 1 files from working dir
      diff -Nprc5: not found

  The correct way to do this is by separating the cmd.cdiff and
  opts.cdiff parts like this:

      [extdiff]
      # Add a new Mercurial command called `cdiff', which calls
      # GNU diff(1) in 'context diff' mode.
      cmd.cdiff = diff
      opts.cdiff = -Nprc5

  so add it as a new example and explicitly describe it in the
  extdiff comments.
 2006-08-15 18:14:58 +03:00
Thomas Arendsen Hein
6c61118d58 merge with jeffpc 2006-08-15 11:22:29 +02:00
Josef "Jeff" Sipek
c724746ef3 Use demandload in hgk 2006-08-15 05:12:27 -04:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00
Brendan Cully
bc3e797936 Allow qdel to delete multiple patches. 2006-08-14 11:41:08 -07:00
Brendan Cully
4b6f1503bf Replace qdel/qfold -f option with -k/--keep. 2006-08-14 11:24:19 -07:00
Brendan Cully
a8ca75d10f Properly shell-quote arguments in extdiff 2006-08-14 11:10:21 -07:00
Brendan Cully
82df5e8de9 Update extdiff for recent refactoring 2006-08-14 11:07:15 -07:00
Vadim Gelfer
92dd5b8dc0 move commands.addremove_lock to cmdutil.addremove 2006-08-13 16:57:45 -07:00
Vadim Gelfer
80d6f2f7c7 remove localrepository.changes. 
use localrepository.status instead.
 2006-08-12 16:40:12 -07:00
Vadim Gelfer
13d751feaf refactor text diff/patch code. 
rename commands.dodiff to patch.diff.
rename commands.doexport to patch.export.
move some functions from commands to new mercurial.cmdutil module.
turn list of diff options into mdiff.diffopts class.

patch.diff and patch.export now has clean api for call from 3rd party
python code.
 2006-08-12 16:13:27 -07:00
Vadim Gelfer
12c9f17ffe merge. 2006-08-12 16:05:09 -07:00
Vadim Gelfer
7670c341e7 manifest.execf is now a function. 2006-08-12 16:04:49 -07:00
Vadim Gelfer
94b6c7e074 mq: demandload more 2006-08-12 14:15:23 -07:00
Vadim Gelfer
dc377b58c1 update copyrights. 2006-08-12 12:30:02 -07:00
Alexis S. L. Carvalho
27e6e90b97 Fix "hg qnew -f foo" without -m 
The refresh method assumes it has a string.
 2006-08-12 09:24:04 -03:00
Vadim Gelfer
ea424c45c0 merge with mpm. 2006-08-12 11:53:12 -07:00
Matt Mackall
44b96c96eb Change remaining users of manifest flags 2006-08-11 10:57:42 -05:00
Vadim Gelfer
a1eb2e0ec1 mq: only add mq attribute to local repo 2006-08-10 17:33:08 -07:00
Vadim Gelfer
cefae5007c mq: apply patch is any posative guard matches 
this is like guards command from quilt package.
 2006-08-10 17:18:55 -07:00
Vadim Gelfer
bfa688e22b fetch: fix test fail 2006-08-10 17:02:11 -07:00
Vadim Gelfer
375ed90afa mq: do not allow to push from repo with patches applied 2006-08-10 16:10:59 -07:00
Brendan Cully
00705b2507 Disallow commit over an applied mq patch. 2006-08-10 11:18:48 -07:00
Vadim Gelfer
65c989bccf qselect: add --pop, --reapply options 2006-08-10 14:58:10 -07:00
Matt Mackall
76c5adea2f Merge with crew, fix most tests 2006-08-09 13:55:18 -05:00
Vadim Gelfer
626fbfdeed mq: make guards more strict, add tests 2006-08-09 09:38:11 -07:00
Vadim Gelfer
594d062505 mq: drop qversion command 2006-08-08 17:11:36 -07:00
Vadim Gelfer
b365694c04 fetch: hold lock and wlock across all operations 2006-08-08 17:08:59 -07:00
Vadim Gelfer
fa92533acd fetch: lock repo across pull and commit 2006-08-08 16:40:08 -07:00
Vadim Gelfer
03412632fc fetch: drop commands.doupdate 2006-08-08 16:37:41 -07:00
Vadim Gelfer
9b3aa8dfc1 fetch: fix breakage from mpm. 
add test so will not break again.
 2006-08-08 16:09:26 -07:00
Vadim Gelfer
3ea890331f mq: new commands qselect, qguard 
implement quilt-style guards for mq.

guards allow to control whether patch can be pushed.

if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed.  if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.

use qguard to set/list guards on patches.  use qselect to set/list
active guards.

also "qseries -v" prints guarded patches with "G" now.
 2006-08-08 21:42:50 -07:00
Vadim Gelfer
07b40a89d5 mq: add join method 2006-08-08 18:12:48 -07:00
Matt Mackall
de047b03ce Introduce update helper functions: update, merge, clean, and revert 2006-08-07 22:54:33 -05:00
Matt Mackall
5d20f724f3 Fix extensions for merge change 2006-08-07 17:26:09 -05:00
Brendan Cully
4d9ff1b476 Make mq camelcase consistent with the rest of hg. 2006-08-07 14:59:32 -07:00
Brendan Cully
17df733f51 Update qsave to use StatusEntry; don't throw exception on bad status lines. 2006-08-07 14:48:18 -07:00
Brendan Cully
8601c3c0fc Update mq to use new logmessage arglist from 2794:7eff50864c5c 2006-08-07 14:12:03 -07:00
Matt Mackall
3dcc28a29a Merge with crew 2006-08-07 16:47:06 -05:00
Vadim Gelfer
f653b6c12f fetch: add missing import. 2006-08-07 19:08:55 -07:00
Vadim Gelfer
4068ec9129 fetch: do not fetch if working dir modified 2006-08-07 17:33:14 -07:00
Vadim Gelfer
d90021dfb5 new extension: fetch -> combine pull and merge/update 
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.

this makes useful command like git 'pull' command.
 2006-08-07 17:27:38 -07:00
Benoit Boissinot
1c4f02dea9 mq: unused variables, improper usage of 'is [not]', undefined variable 2006-08-06 17:27:05 +02:00
Benoit Boissinot
6f5cfdaee1 mq: codingstyle 2006-08-06 17:24:13 +02:00
Benoit Boissinot
c62e480a61 mq: remove unecessary test 2006-08-06 17:20:51 +02:00
Benoit Boissinot
541cff5e76 mq: fix variables shadowing builtin 2006-08-06 17:18:53 +02:00
Brendan Cully
879b9bce42 mq: use more portable util.parse_patch_output instead of handrolled version. 2006-08-05 14:59:47 -07:00
Brendan Cully
5d7f00c97d Add portable shell-quoting function; teach mq to use it. 2006-08-05 15:23:26 -07:00
Benoit Boissinot
69b70a588e mailbomb: add a comment and remove the bcc in a more pythonic way 2006-08-06 16:03:02 +02:00
Vadim Gelfer
c5053e3bb6 make error better. 2006-08-05 02:00:09 -07:00
Matt Mackall
65b6faa1aa Move merge code to its own module 
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
 2006-08-03 15:24:41 -05:00
Vadim Gelfer
e7a19cd577 merge with brendan. 2006-08-03 11:12:02 -07:00
Brendan Cully
03cc700164 Use StatusEntry class instead of repeated status line parsing. 
This small cleanup abstracts out repeated instances of
(rev, name) = applied[x].split(':'), making it easier to use
applied or change the status file format.
 2006-08-03 11:09:12 -07:00
Vadim Gelfer
25f77c8e58 mq: make queue.unapplied useful as api 2006-08-02 21:06:12 -07:00
Vadim Gelfer
9f3dbcd014 mq: print matches if patch name not unique 2006-08-02 06:36:27 -07:00
Vadim Gelfer
7369cfc5b9 mq: simplify save_dirty 2006-08-02 20:33:57 -07:00
Brendan Cully
cd3bd9b901 Add -f option to qfold; improve qfold documentation. 2006-08-02 15:07:37 -07:00
Brendan Cully
a7db3381e3 Clean up qnew help text. 2006-08-02 14:48:59 -07:00
Vadim Gelfer
821fc85964 mq: rename read_series as parse_series, make simpler and faster 2006-08-02 10:48:34 -07:00
Bryan O'Sullivan
688915efdf fix call to commands.setremoteconfig 2006-08-02 09:18:56 -07:00
Vadim Gelfer
dc26ae9fe1 merge patches from brendan cully that did not apply clean against tip. 2006-08-01 15:40:28 -07:00
Brendan Cully
fecf9b2ed3 Add -s option to qseries: display first line of patch header. 2006-08-01 15:24:18 -07:00
Brendan Cully
b29cf92839 Add more verbose help text to mq commands. 2006-08-01 15:24:12 -07:00
Brendan Cully
00c221cfbb Add -m, -l, -e options to qfold. 2006-08-01 15:24:11 -07:00
Brendan Cully
68e0fb5d2a Add -f option to qdelete, to remove patch file. 2006-08-01 12:21:55 -07:00
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
Thomas Arendsen Hein
927486279d Reorganized files in hg-purge repo to push them into Mercurial. 
README -> hgext/purge/README
purge.py -> hgext/purge/__init__.py
removed COPYING.GPL and .hgignore (already in the Mercurial repo)
 2006-06-01 23:58:06 +02:00
Benoit Boissinot
4d70fafe0d better ui for the bisect extension 
(and update to i18n)
 2006-05-26 22:17:43 +02:00
Vadim Gelfer
e684399d7c add acl extension, to limit who can push to subdirs of central repo. 2006-05-23 14:58:30 -07:00
Daniel Santa Cruz ext:(%22)
3232a6998e Minor typo change to reflect actual values used. 2006-05-22 12:17:44 -04:00
Vadim Gelfer
34b7a0d83b merge with crew. 2006-05-21 23:39:25 -07:00
Vadim Gelfer
38e7119eca new extension: extdiff. allows to use external diff program. 2006-05-21 23:39:07 -07:00
Vadim Gelfer
10c73bbd93 notify: add debug output. do not fail if no config file. 
use --debug to see debug output.
 2006-05-20 12:52:02 -07:00
Vadim Gelfer
be9056ad56 notify: fix off by one error. 2006-05-19 14:57:45 -07:00
Vadim Gelfer
25b53cf653 bugzilla: allow to map between committer email and bugzilla user name. 2006-05-18 09:23:43 -07:00
Thomas Arendsen Hein
914957ee60 Removed extra space in bisect output. 2006-05-18 08:03:51 +02:00
Thomas Arendsen Hein
be0ce7238f Strip empty lines and trailing spaces around commit messages. 
Fixes issue213 and part of issue249 (trying to keep node id on import)
 2006-05-17 19:38:41 +02:00
Thomas Arendsen Hein
be2a7bb68c Use "# Date" instead of "# Timestamp" for dated export/import of patches. 
And don't break up list for % formatting.
 2006-05-17 19:00:16 +02:00
Danek Duvall
2a19fd683a Add timestamp field to export format. Make import and mq use it. 2006-05-17 18:54:30 +02:00
Aurelien Jacobs ext:(%22)
b68ea13e18 notify changeset diff should be against current node instead of tip 2006-05-16 14:17:45 -07:00
Vadim Gelfer
de0a3b422b allow to send email using sendmail. 
default is still smtp.
update hgrc doc with sendmail info.
 2006-05-15 10:25:17 -07:00
Danek Duvall
9b6197b107 Fix issue240: mq: qpush fails on Solaris 2006-05-11 18:24:58 -07:00
Vadim Gelfer
42391c45d8 bugzilla hook: skip empty groups. 2006-05-09 14:39:56 -07:00
Thomas Arendsen Hein
ce9a04e13f gpg extension: Always remove temporary files created by 'hg sigcheck'. 2006-05-09 13:26:16 +02:00